radarsys Commit - r194:1bba8179301f · Jicamarca Repository

operation mode field added...

Fiorella Quino -

r194:1bba8179301f

parent child

Context file:

r194:1bba8179301f

apps/abs/static/js/abs.js created 644 +19 0

@@ -0,0 +1,19
	1	$(document).ready(function() {
	2	updateOperationMode()
	3	});
	4
	5	$("#id_operation_mode").on('change', function() {
	6	updateOperationMode()
	7	});
	8
	9	function updateOperationMode(){
	10	var operation_mode = $("#id_operation_mode").val();
	11	if (operation_mode==0){
	12	document.getElementById("id_operation_value").disabled=true;
	13	$("#id_operation_value").hide();
	14	}
	15	else {
	16	document.getElementById("id_operation_value").disabled=false;
	17	$("#id_operation_value").show();
	18	}
	19	}

apps/abs/models.py +3 -3

             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_mode  = models.PositiveSmallIntegerField(verbose_name='Operation Mode', choices=OPERATION_MODES, default = 0)
-                operation_value = models.CharField(verbose_name='Periodic (seconds)', max_length=20000, default="10", null=True, blank=True)
+                operation_value = models.FloatField(verbose_name='Periodic (seconds)', default="10", null=True, blank=True)
                 class Meta:
                     db_table = 'abs_configurations'
                     #-------------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

apps/abs/templates/abs_conf_edit.html +1 0

             {% block extra-js%}
+              <script src="{% static 'js/abs.js' %}"></script>
               <script type="text/javascript">
                 $("#bt_toggle").click(function() {

apps/abs/views.py +1 -1

                 beam = get_object_or_404(ABSBeam, pk=id_beam)
                 beams_list    = ABSBeam.objects.filter(abs_conf=conf)
                 #To set this beam as an Active Beam
-                beam.set_activebeam()
+                beam.set_as_activebeam()
                 #To send beam position to abs-modules
                 i = 0
                 for b in beams_list:

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages