From a4bb271436d98b04f6287a78e9fa0c9dd5319077 Mon Sep 17 00:00:00 2001
From: Greg Lind <gwlind@gmail.com>
Date: Fri, 5 Aug 2016 09:58:33 +0300
Subject: [PATCH] fix graph and maps in indicator visual report

---
 indicators/views.py                   | 2 +-
 templates/indicators/data_report.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indicators/views.py b/indicators/views.py
index 2e45a5248..c3f2c2fac 100755
--- 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
index 9e9eebfae..d7efff702 100755
--- 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/>