update report filters

toladata · Dec 2, 2016 · 37496af · 37496af
1 parent e387b4d
commit 37496af
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/indicators/views.py b/indicators/views.py
@@ -623,7 +623,7 @@ def get(self, request, *args, **kwargs):
         # if we have an indicator type active
         if int(type) != 0:
             r = {
-                'indicator_type__id': type,
+                'indicator__indicator_type__id': type,
             }
             q.update(r)
             # redress the indicator list based on type
@@ -660,6 +660,7 @@ def get(self, request, *args, **kwargs):
 
         return render(request, self.template_name, {'indicators': indicators, 'getPrograms': getPrograms,
                                                     'getIndicatorTypes': getIndicatorTypes, 'getIndicators':getIndicators,
+                                                    'program':program, 'indicator': indicator, 'type': type,
                                                     'filter_program':program_name,'filter_indicator': indicator_name,
                                                     'indicator': indicator,'program': program,'type': type,'indicator_name':indicator_name,
                                                     'program_name': program_name, 'type_name': type_name})

diff --git a/templates/indicators/collecteddata_list.html b/templates/indicators/collecteddata_list.html
@@ -193,12 +193,12 @@
       window.location.href = '/indicators/collecteddata/'+program_id+'/0/0/';      
       }
 
-    function indicator_filter(indicator) {
-      window.location.href = '/indicators/collecteddata/0/'+indicator+'/0';  
+    function indicator_filter(program,indicator,type) {
+      window.location.href = '/indicators/collecteddata/'+program+'/'+indicator+'/'+type;
         }
 
-    function indicator_type_filter(type) {
-      window.location.href = '/indicators/collecteddata/0/0/'+type;      
+    function indicator_type_filter(program,indicator,type) {
+      window.location.href = '/indicators/collecteddata/'+program+'/'+indicator+'/'+type;
       }
  </script>
 

diff --git a/templates/indicators/filter.html b/templates/indicators/filter.html
@@ -16,9 +16,9 @@
         <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href=" "> -- All -- </a></li>
+        <li role="presentation"><a role="menuitem" tabindex="-1" onclick="indicator_filter({{ program }},0,{{ type }} )"> -- All -- </a></li>
         {% for item in getIndicators %}
-            <li role="presentation"><a role="menuitem" tabindex="-1" onclick="indicator_filter({{item.id}})">{{ item.number}} - {{ item.name }}</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" onclick="indicator_filter({{ program }},{{ item.id }},{{ type }} )">{{ item.number}} - {{ item.name }}</a></li>
         {% endfor %}
         </ul>
     </div>
@@ -28,9 +28,9 @@
         <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
-        <li role="presentation"><a role="menuitem" tabindex="1" href=""> -- All -- </a></li>
+        <li role="presentation"><a role="menuitem" tabindex="1" onclick="indicator_type_filter({{program}},0,{{ indicator}})"> -- All -- </a></li>
         {% for item in getIndicatorTypes %}
-            <li role="presentation"><a role="menuitem" tabindex="-1" onclick="indicator_type_filter({{item.id}})">{{ item.indicator_type}}</a></li>
+            <li role="presentation"><a role="menuitem" tabindex="-1" onclick="indicator_type_filter({{program}},{{indicator}},{{ item.id}})">{{ item.indicator_type}}</a></li>
         {% endfor %}
         </ul>
     </div>