From ebcde1925a60902a73f0060ad6397597afc8c2e3 2016-12-15 21:23:24
From: Fiorella Quino <fiorella.quino@jro.igp.gob.pe>
Date: 2016-12-15 21:23:24
Subject: [PATCH] Task #566: Verify Parameters

git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@252 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71

---

diff --git a/apps/main/templates/experiment_verify.html b/apps/main/templates/experiment_verify.html
index 5c1f7af..b293a4c 100644
--- a/apps/main/templates/experiment_verify.html
+++ b/apps/main/templates/experiment_verify.html
@@ -17,7 +17,7 @@
 
 {% endblock %}
 
-
+	<form action="" method="post" class="form login">{% csrf_token %}
 
 <table class="table table-bordered" style="text-align:center;">
 			<!--<h4 class="panel-title">  </h4>-->
@@ -26,44 +26,44 @@
 				<th style="text-align:center;">DDS</th>
 				<th style="text-align:center;">RC</th>
 				<th style="text-align:center;">JARS</th>
-				<th style="text-align:center;">=P</th>
+				<th style="text-align:center;">Insert New Value</th>
 			</tr>
-			
+
 			<tr>
 				<th>Clock In</th>
 				<td id="dds_clock">{{ dds.clock }}</td>
 				<td id="rc_clock">{{ rc.clock_in }}</td>
 				<td id="filter_clock">{{ filter_parms.clock }}</td>
-				<td><input id="suggest_clock"></input></td>
+				<td><input id="suggest_clock" name="suggest_clock"></input></td>
 			</tr>
-			
+
 			<tr>
 				<th>Frequency A (Mhz)</th>
-				<td>{{ dds.frequencyA_Mhz }}</td>
+				<td id="dds_frequencyA">{{ dds.frequencyA_Mhz }}</td>
 				<td>x</td>
-				<td>{{ filter_parms.fch }}</td>
-				<td><input></input></td>
+				<td id="filter_frequencyA">{{ filter_parms.fch }}</td>
+				<td><input id="suggest_frequencyA" name="suggest_frequencyA"></input></td>
 			</tr>
-			
-			<tr>
+
+			<!--<tr>
 				<th>Frequency A (Decimal)</th>
 				<td>{{ dds.frequencyA }}</td>
 				<td>x</td>
 				<td>{{ filter_parms.fch_decimal }}</td>
-				<td><input></input></td>
-			</tr>
-			
-			<tr>
+				<td><input id="suggest_frequencyAdec"></input></td>
+			</tr>-->
+
+			<!--<tr>
 				<th>Sampling Frequency (MHz)</th>
 				<td id="dds_sampfreq">{{ dds.frequencyA }}</td>
 				<td id="rc_sampfreq">{{ samp_freq_rc }}</td>
 				<td id="jars_sampfreq">{{ samp_freq_jars }}</td>
-				<td><input id="suggest_sampfreq"></input></td>
-			</tr>
+				<td><input id="suggest_sampfreq" name="suggest_sampfreq"></input></td>
+			</tr>-->
 </table>
 
 
-
+<!--
 <div class="">
 <h4 class="panel-title"><b> Extra Parameters </b></h4>
 <br>
@@ -76,13 +76,15 @@
 	{% endif %}
 {% endfor %}
 </table>
-
+-->
 
 <div class="pull-right">
-<button type="button" class="btn btn-primary" id="bt_back">Back</button>
-<button type="button" class="btn btn-primary" id="bt_update">{{ button }}</button>
-</div>
 
+			<button type="button" class="btn btn-primary" id="bt_back">Back</button>
+			<button type="submit" class="btn btn-primary" id="bt_update">{{ button }}</button>
+
+</div>
+</form>
 {% endblock %}
 
 {% block sidebar%}
@@ -90,56 +92,70 @@
 {% endblock %}
 
 {% block extra-js%}
+<script src="{% static 'js/dds_conversion.js' %}"></script>
 <script type="text/javascript">
 
 {% if dds_conf %}
 	$(document).ready(function() {
+		$("#suggest_frequencyA").on('change', function() {
+			updateBinaryFrequencies();
+		});
+
 	  $('#dds_clock').click(function(event) {
 		  clock = $("#dds_clock").text();
 		  $("#suggest_clock").val(clock);
 	  });
-	  $('#dds_sampfreq').click(function(event) {
-		  sampfreq = $("#dds_sampfreq").text();
-		  $("#suggest_sampfreq").val(sampfreq);
+	  $('#dds_frequencyA').click(function(event) {
+		  sampfreq = $("#dds_frequencyA").text();
+		  $("#suggest_frequencyA").val(sampfreq);
 	  });
 	});
 {% endif %}
+
 {% if rc_conf %}
 	$(document).ready(function() {
 	  $('#rc_clock').click(function(event) {
 		  clock = $("#rc_clock").text();
 		  $("#suggest_clock").val(clock);
 	  });
-	  $('#rc_sampfreq').click(function(event) {
-		  sampfreq = $("#rc_sampfreq").text();
-		  $("#suggest_sampfreq").val(sampfreq);
-	  });
-    });
+	  //$('#rc_sampfreq').click(function(event) {
+		//  sampfreq = $("#rc_sampfreq").text();
+		//  $("#suggest_sampfreq").val(sampfreq);
+	  //});
+  });
 {% endif %}
-{% if jars_conf %}  
+{% if jars_conf %}
     $(document).ready(function() {
   	  $('#filter_clock').click(function(event) {
   		  clock = $("#filter_clock").text();
 	      $("#suggest_clock").val(clock);
   	  });
-  	  $('#jars_sampfreq').click(function(event) {
-  		  sampfreq = $("#jars_sampfreq").text();
-		  $("#suggest_sampfreq").val(sampfreq);
+  	  $('#filter_frequencyA').click(function(event) {
+  		  sampfreq = $("#filter_frequencyA").text();
+		  $("#suggest_frequencyA").val(sampfreq);
+			updateBinaryFrequencies()
 	  });
-  	});
+  });
 {% endif %}
 
+	function updateBinaryFrequencies() {
+		var clock = {{dds.clock}};
+		var multiplier = {{dds.multiplier}};
+		var freq = $("#suggest_frequencyA").val();
+		var mclock = clock*multiplier;
+		var freq_bin = freq2Binary(mclock, freq);
+		freq = binary2Freq(mclock, freq_bin);
+		$("#suggest_frequencyA").val(freq);
+	}
 
-  
-  
   $(".clickable-row").click(function() {
     document.location = $(this).data("href");
   });
-  
+
   $("#bt_back").click(function() {
 	    document.location = "{% url 'url_experiment' experiment.id%}";
   });
-  
-  
+
+
 </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/apps/main/views.py b/apps/main/views.py
index 7c70381..ec22e00 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -1009,6 +1009,7 @@ def experiment_verify(request, id_exp):
         #-------------------- JARS -----------------------:
         if configuration.device.device_type.name == 'jars':
             jars_conf = True
+            jars = configuration
             kwargs['jars_conf']    = jars_conf
             filter_parms           = configuration.filter_parms
             filter_parms           = ast.literal_eval(filter_parms)
@@ -1026,6 +1027,7 @@ def experiment_verify(request, id_exp):
         #--------------------- RC ----------------------:
         if configuration.device.device_type.name == 'rc':
             rc_conf = True
+            rc = configuration
             rc_parms = configuration.parms_to_dict()
             if rc_parms['mix'] == 'True':
                 pass
@@ -1042,6 +1044,7 @@ def experiment_verify(request, id_exp):
         #-------------------- DDS ----------------------:
         if configuration.device.device_type.name == 'dds':
             dds_conf = True
+            dds = configuration
             dds_parms = configuration.parms_to_dict()
 
             kwargs['dds_conf'] = dds_conf
@@ -1051,18 +1054,62 @@ def experiment_verify(request, id_exp):
     #------------Validation------------:
     #Clock
     if dds_conf and rc_conf and jars_conf:
-        if filter_parms['clock'] != rc_parms['clock_in'] and rc_parms['clock_in'] != dds_parms['clock']:
+        if float(filter_parms['clock']) != float(rc_parms['clock_in']) and float(rc_parms['clock_in']) != float(dds_parms['clock']):
             messages.warning(request, "Devices don't have the same clock.")
     elif rc_conf and jars_conf:
-        if filter_parms['clock'] != rc_parms['clock_in']:
+        if float(filter_parms['clock']) != float(rc_parms['clock_in']):
             messages.warning(request, "Devices don't have the same clock.")
     elif rc_conf and dds_conf:
-        if rc_parms['clock_in'] != dds_parms['clock']:
+        if float(rc_parms['clock_in']) != float(dds_parms['clock']):
             messages.warning(request, "Devices don't have the same clock.")
         if float(samp_freq_rc) != float(dds_parms['frequencyA']):
             messages.warning(request, "Devices don't have the same Frequency A.")
 
 
+    #------------POST METHOD------------:
+    if request.method == 'POST':
+        if request.POST['suggest_clock']:
+            try:
+                suggest_clock = float(request.POST['suggest_clock'])
+            except:
+                messages.warning(request, "Invalid value in CLOCK IN.")
+                return redirect('url_verify_experiment', id_exp=experiment.id)
+        else:
+            suggest_clock = ""
+        if suggest_clock:
+            if rc_conf:
+                rc.clock_in = suggest_clock
+                rc.save()
+            if jars_conf:
+                filter_parms           = jars.filter_parms
+                filter_parms           = ast.literal_eval(filter_parms)
+                filter_parms['clock'] = suggest_clock
+                jars.filter_parms = json.dumps(filter_parms)
+                jars.save()
+                kwargs['filter_parms'] = filter_parms
+            if dds_conf:
+                dds.clock = suggest_clock
+                dds.save()
+
+        if request.POST['suggest_frequencyA']:
+            try:
+                suggest_frequencyA = float(request.POST['suggest_frequencyA'])
+            except:
+                messages.warning(request, "Invalid value in FREQUENCY A.")
+                return redirect('url_verify_experiment', id_exp=experiment.id)
+        else:
+            suggest_frequencyA = ""
+        if suggest_frequencyA:
+            if jars_conf:
+                filter_parms           = jars.filter_parms
+                filter_parms           = ast.literal_eval(filter_parms)
+                filter_parms['fch'] = suggest_frequencyA
+                jars.filter_parms = json.dumps(filter_parms)
+                jars.save()
+                kwargs['filter_parms'] = filter_parms
+            if dds_conf:
+                dds.frequencyA_Mhz = request.POST['suggest_frequencyA']
+                dds.save()
 
     ###### SIDEBAR ######
     kwargs.update(sidebar(experiment=experiment))