fix graph and maps in indicator visual report

toladata · Aug 5, 2016 · a4bb271 · a4bb271
1 parent f9454e6
commit a4bb271
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/indicators/views.py b/indicators/views.py
@@ -432,7 +432,7 @@ def indicator_data_report(request, id=0, program=0, type=0):
     RequestConfig(request).configure(table)
 
     # send the keys and vars from the json data to the template along with submitted feed info and silos for new form
-    return render(request, "indicators/data_report.html", {'countries':countries,'getSiteProfile': getSiteProfile,
+    return render(request, "indicators/data_report.html", {'getQuantitativeData': queryset, 'countries':countries,'getSiteProfile': getSiteProfile,
                                                            'getPrograms':getPrograms, 'getIndicators': getIndicators,
                                                            'getTypes': getTypes, 'form': FilterForm(), 'helper': FilterForm.helper,
                                                            'id': id,'program': program,'type': type,'indicator_name':indicator_name,

diff --git a/templates/indicators/data_report.html b/templates/indicators/data_report.html
@@ -44,9 +44,9 @@
 </div>
 
 <div class="btn-group" role="group">
-  <button class="btn btn-default {% if 'table' in request.get_full_path %} active{%endif%}" onClick="location.href='/indicators/data/{{ id }}/{{ program }}/table/'" name="table">Table</button>&nbsp;
-  <button class="btn btn-default {% if 'map' in request.get_full_path %} active{%endif%}" onClick="location.href='/indicators/data/{{ id }}/{{ program }}/map/'" name="map">Map</button>&nbsp;
-  <button class="btn btn-default {% if 'graph' in request.get_full_path %} active{%endif%}" onClick="location.href='/indicators/data/{{ id }}/{{ program }}/graph/'" name="graph">Graph</button>
+  <button class="btn btn-default {% if 'table' in request.get_full_path %} active{%endif%}" onClick="location.href='/indicators/data/{{ id }}/{{ program }}/{{ type }}/table/'" name="table">Table</button>&nbsp;
+  <button class="btn btn-default {% if 'map' in request.get_full_path %} active{%endif%}" onClick="location.href='/indicators/data/{{ id }}/{{ program }}/{{ type }}/map/'" name="map">Map</button>&nbsp;
+  <button class="btn btn-default {% if 'graph' in request.get_full_path %} active{%endif%}" onClick="location.href='/indicators/data/{{ id }}/{{ program }}/{{ type }}/graph/'" name="graph">Graph</button>
 </div>
 <br/>