diff --git a/apps/jars/models.py b/apps/jars/models.py index 85727ee..e46b97b 100644 --- a/apps/jars/models.py +++ b/apps/jars/models.py @@ -18,9 +18,13 @@ DATA_TYPE = ( class JARSfilter(models.Model): name = models.CharField(max_length=60, unique=True, default='') - filter_fir = models.PositiveIntegerField(verbose_name='FIR Filter',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 1) - filter_2 = models.PositiveIntegerField(verbose_name='Filter 2',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 1) + clock = models.FloatField(verbose_name='Clock Input (MHz)',validators=[MinValueValidator(5), MaxValueValidator(75)], null=True, default=60) + mult = models.PositiveIntegerField(verbose_name='Multiplier',validators=[MinValueValidator(1), MaxValueValidator(20)], default=5) + fch = models.DecimalField(verbose_name='Frequency (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=19, decimal_places=16, null=True, default=49.9200) + filter_fir = models.PositiveIntegerField(verbose_name='FIR Filter',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 6) + filter_2 = models.PositiveIntegerField(verbose_name='Filter 2',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 10) filter_5 = models.PositiveIntegerField(verbose_name='Filter 5',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 1) + speed = models.PositiveIntegerField(verbose_name='Speed',validators=[MinValueValidator(0), MaxValueValidator(100000)], default = 0) class Meta: db_table = 'jars_filters' diff --git a/apps/jars/templates/jars_conf_edit.html b/apps/jars/templates/jars_conf_edit.html index 738b54c..8c2f907 100644 --- a/apps/jars/templates/jars_conf_edit.html +++ b/apps/jars/templates/jars_conf_edit.html @@ -3,6 +3,20 @@ {% load static %} {% load main_tags %} +{% block content %} +
+ {% csrf_token %} + {% bootstrap_form form layout='horizontal' size='medium' %} +
+
+
+ + + +
+
+{% endblock %} + {% block extra-js%} {% endblock %} \ No newline at end of file diff --git a/apps/jars/views.py b/apps/jars/views.py index 539b689..09dad79 100644 --- a/apps/jars/views.py +++ b/apps/jars/views.py @@ -26,7 +26,7 @@ def jars_conf(request, id_conf): 'cards_number', 'channels_number', 'rd_directory', 'create_directory', 'include_expname', 'raw_data_blocks', - 'acq_profiles', 'profiles_block'] + 'acq_profiles', 'profiles_block', 'filter'] kwargs['title'] = 'JARS Configuration' kwargs['suptitle'] = 'Details'