From 517881d35474317674794216bf3d349a30966cc1 2016-05-12 21:32:07
From: Fiorella Quino <fiorella.quino@jro.igp.gob.pe>
Date: 2016-05-12 21:32:07
Subject: [PATCH] Task #99: Filters (new filter)

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

---

diff --git a/apps/jars/templates/jars_conf_edit.html b/apps/jars/templates/jars_conf_edit.html
index e66be45..99085fe 100644
--- a/apps/jars/templates/jars_conf_edit.html
+++ b/apps/jars/templates/jars_conf_edit.html
@@ -11,7 +11,8 @@
   <br>
   <div class="pull-right">
   <button type="button" class="btn btn-primary" id="bt_view_filter">View Filter</button>
-  <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>
+  <!-- <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>  -->
+  <button type="button" class="btn btn-primary" id="bt_cancel">Cancel</button> 
   <button type="submit" class="btn btn-primary">{{button}}</button>
   </div>
 </form>
@@ -24,5 +25,9 @@
 $("#bt_view_filter").click(function() {
     document.location = "{% url 'url_jars_filter' id_dev filter_id%}";
   });
+  
+$("#bt_cancel").click(function() {
+    document.location = "{% url 'url_jars_conf' id_dev %}";
+  });
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/jars/templates/jars_filter.html b/apps/jars/templates/jars_filter.html
index c3a7462..4405559 100644
--- a/apps/jars/templates/jars_filter.html
+++ b/apps/jars/templates/jars_filter.html
@@ -27,7 +27,7 @@
   <div class="pull-right">
   <button type="button" class="btn btn-primary" id="back_button">{% if cancel %}{{cancel}}{% else %}Back{% endif %}</button>
   <button type="button" id="edit_button" class="btn btn-primary">{{edit_button}}</button>
-  <button type="button" id="add_button" class="btn btn-primary">{{add_button}}</button>
+  <button type="button" id="new_button" class="btn btn-primary">{{add_button}}</button>
   </div>
 {% endif %}
 
@@ -51,5 +51,9 @@
 	    document.location = "{% url 'url_edit_jars_conf' conf.id%}";
   });
   
+  $("#new_button").click(function() {
+	    document.location = "{% url 'url_new_jars_filter' conf.id%}";
+  });
+  
 </script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/jars/templates/jars_filter_edit.html b/apps/jars/templates/jars_filter_edit.html
index 59c14e8..18bde10 100644
--- a/apps/jars/templates/jars_filter_edit.html
+++ b/apps/jars/templates/jars_filter_edit.html
@@ -14,4 +14,8 @@
   <button type="submit" class="btn btn-primary">{{button}}</button>
   </div>
 </form>
+{% endblock %}
+
+{% block extra-js%}
+<script src="{% static 'js/filters.js' %}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/apps/jars/templates/jars_new_filter.html b/apps/jars/templates/jars_new_filter.html
new file mode 100644
index 0000000..f9fe15d
--- /dev/null
+++ b/apps/jars/templates/jars_new_filter.html
@@ -0,0 +1,8 @@
+{% extends "dev_conf_edit.html" %}
+{% load bootstrap3 %}
+{% load static %}
+{% load main_tags %}
+
+{% block extra-js%}
+<script src="{% static 'js/filters.js' %}"></script>
+{% endblock %}
\ No newline at end of file