diff --git a/apps/cgs/models.py b/apps/cgs/models.py index b3647cb..61b2463 100644 --- a/apps/cgs/models.py +++ b/apps/cgs/models.py @@ -12,10 +12,10 @@ class CGSConfiguration(Configuration): #device = models.ForeignKey(Device) #exp = models.ForeignKey(Experiment, default = None) - freq0 = models.FloatField(verbose_name='Frequency 0',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) - freq1 = models.FloatField(verbose_name='Frequency 1',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) - freq2 = models.FloatField(verbose_name='Frequency 2',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) - freq3 = models.PositiveIntegerField(verbose_name='Frequency 3',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) + freq0 = models.FloatField(verbose_name='Frequency 0',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)], blank=True, null=True) + freq1 = models.FloatField(verbose_name='Frequency 1',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)], blank=True, null=True) + freq2 = models.FloatField(verbose_name='Frequency 2',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)], blank=True, null=True) + freq3 = models.FloatField(verbose_name='Frequency 3',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)], blank=True, null=True) #jfreqs = JSONField(default={"frequencies":[{"f0":freq0,"f1":freq1,"f2":freq2,"f3":freq3}]}, blank=True) #clk_in = models.PositiveIntegerField(default=10e6) #mult = models.PositiveIntegerField(default=40) diff --git a/apps/cgs/templates/index_cgs.html b/apps/cgs/templates/index_cgs.html index 36f0a92..7266a45 100644 --- a/apps/cgs/templates/index_cgs.html +++ b/apps/cgs/templates/index_cgs.html @@ -9,6 +9,32 @@

Ingresar Frecuencias

+ + + + + {% if form.is_multipart %} + + + +
+ {% else %} + + {% endif %} + + {% if step_field %} + + {% endif %} + + {% if submit_method != 'GET' and submit_method != 'get' %} + {% csrf_token %} + {% endif %} + + + +
{% bootstrap_form form size='medium' %} diff --git a/apps/cgs/views.py b/apps/cgs/views.py index e5ec051..baee485 100644 --- a/apps/cgs/views.py +++ b/apps/cgs/views.py @@ -24,6 +24,21 @@ def configurate_frequencies(request, id=0): 'devices':devices, 'title': ('YAP'), } + + if request.method == 'POST': + form = CGSConfigurationForm(request.POST) #, initial={'purchase_request':purchase_request}) + if form.is_valid(): + instance = form.save(commit=False) + #if 'quote' in request.FILES: + # instance.quoe = request.FILES['quote'] + instance.save() + form.save_m2m() + msg = _(u'The frequencies have been activated successfully.') + messages.success(request, msg, fail_silently=True) + #return redirect(purchase_request.get_absolute_url()) + else: + form = CGSConfigurationForm() + return render_to_response('index_cgs.html', data, context_instance=RequestContext(request)) #return render_to_response("index.html", kwargs, context_instance=RequestContext(request))