diff --git a/apps/abs/models.py b/apps/abs/models.py index f960178..1d4566c 100644 --- a/apps/abs/models.py +++ b/apps/abs/models.py @@ -183,8 +183,8 @@ OPERATION_MODES = ( class ABSConfiguration(Configuration): active_beam = models.CharField(verbose_name='Active Beam', max_length=20000, default="{}") module_status = models.CharField(verbose_name='Module Status', max_length=10000, default=json.dumps(status_default)) - operation_mode = models.CharField(verbose_name='Operation Mode', max_length = 20, choices=OPERATION_MODES, default = 0) - operation_value = models.CharField(verbose_name='Periodic (seconds)', max_length=20000, default="10", null=True, blank=True) + operation_mode = models.PositiveSmallIntegerField(verbose_name='Operation Mode', choices=OPERATION_MODES, default = 0) + operation_value = models.FloatField(verbose_name='Periodic (seconds)', default="10", null=True, blank=True) class Meta: db_table = 'abs_configurations' @@ -413,7 +413,7 @@ class ABSConfiguration(Configuration): #-------------Write each abs module----------- if beams: beams_status = ast.literal_eval(self.module_status) - for i in range(62,65): #(62,65) + for i in range(61,64): #(62,65) try: answer = self.module_conf(i, beams) beams_status[str(i)] = 1 diff --git a/apps/abs/static/js/abs.js b/apps/abs/static/js/abs.js new file mode 100644 index 0000000..4fdc38d --- /dev/null +++ b/apps/abs/static/js/abs.js @@ -0,0 +1,19 @@ +$(document).ready(function() { + updateOperationMode() +}); + +$("#id_operation_mode").on('change', function() { + updateOperationMode() +}); + +function updateOperationMode(){ + var operation_mode = $("#id_operation_mode").val(); + if (operation_mode==0){ + document.getElementById("id_operation_value").disabled=true; + $("#id_operation_value").hide(); + } + else { + document.getElementById("id_operation_value").disabled=false; + $("#id_operation_value").show(); + } +} diff --git a/apps/abs/templates/abs_conf_edit.html b/apps/abs/templates/abs_conf_edit.html index ee6c688..674eb54 100644 --- a/apps/abs/templates/abs_conf_edit.html +++ b/apps/abs/templates/abs_conf_edit.html @@ -32,6 +32,7 @@ {% block extra-js%} +