From ef93cf215be81429e1b8fdfe569c5fb0d3ef57e3 2017-09-07 20:30:54
From: Fiorella Quino <fiorella.quino@jro.igp.gob.pe>
Date: 2017-09-07 20:30:54
Subject: [PATCH] Task #1119: save and cancel  button

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

---

diff --git a/apps/jars/templates/jars_conf.html b/apps/jars/templates/jars_conf.html
index 233a273..b59fc77 100644
--- a/apps/jars/templates/jars_conf.html
+++ b/apps/jars/templates/jars_conf.html
@@ -7,7 +7,7 @@
 {% block extra-content %}
 
 <div class="clearfix"></div>
-<h2>JARS filter: {{resolution}} (MHz)</h2>
+<h2>JARS filter: {{resolution}}</h2>
 <hr>
 <div class="panel-group" id="div_lines" role="tablist" aria-multiselectable="true">
 {% include "jars_filter.html" %}
diff --git a/apps/jars/views.py b/apps/jars/views.py
index 3fee39a..112b763 100644
--- a/apps/jars/views.py
+++ b/apps/jars/views.py
@@ -24,9 +24,12 @@ def jars_conf(request, id_conf):
     kwargs['filter'] = filter_parms
     kwargs['filter_keys']  = ['clock', 'mult', 'fch', 'fch_decimal',
                                 'filter_fir', 'filter_2', 'filter_5']
+    
     filter_resolution=conf.filter_resolution()
-    kwargs['resolution'] = filter_resolution
-
+    kwargs['resolution'] = '{} (MHz)'.format(filter_resolution)
+    if filter_resolution < 1:
+        kwargs['resolution'] = '{} (kHz)'.format(filter_resolution*1000)
+    
     kwargs['status'] = conf.device.get_status_display()
 
 
@@ -284,10 +287,25 @@ def change_filter(request, conf_id, filter_id=None):
         else:
             form = JARSfilterForm(initial={'jars_configuration':conf_id, 'filter_id': filter_id})
 
+    if request.method=='POST':
+        form = JARSfilterForm(request.POST)
+        if form.is_valid():
+            jars_filter = form.cleaned_data
+            try:
+                jars_filter.pop('name')
+            except:
+                pass
+            conf.filter_parms = json.dumps(jars_filter)
+            conf.save()
+            return redirect('url_edit_jars_conf', id_conf=conf.id)
+
+        print jars_filter
+
     kwargs = {}
     kwargs['title'] = 'JARS Configuration'
     kwargs['suptitle'] = 'Change Filter'
     kwargs['form'] = form
+    kwargs['button'] = 'Change'
     kwargs['conf_id'] = conf.id
     kwargs['filter_id'] = filter_id
     return render(request, 'change_jars_filter.html', kwargs)