dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6964
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-05-16 19:17:26 +0200
message:
  Fixed bug with data set report download as excel and pdf
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderCustomDataSetReportForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js	2012-05-01 13:14:33 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js	2012-05-16 17:17:26 +0000
@@ -46,9 +46,9 @@
 function exportDataSetReport( type )
 {
 	var url = "generateDataSetReport.action?useLast=true" + 
-		"&dataSetId=" + $( "#dataSetId" ).val() +
-	    "&periodId=" + $( "#periodId" ).val() +
-	    "&selectedUnitOnly=" + $( "#selectedUnitOnly" ).val() +
+		"&dataSetId=" + $( "#currentDataSetId" ).val() +
+	    "&periodId=" + $( "#currentPeriodId" ).val() +
+	    "&selectedUnitOnly=" + $( "#currentSelectedUnitOnly" ).val() +
 	    "&orgUnitId=" + selectionTreeSelection.getSelected() +
 	    "&type=" + type;
 	    

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderCustomDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderCustomDataSetReportForm.vm	2012-04-05 13:13:13 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderCustomDataSetReportForm.vm	2012-05-16 17:17:26 +0000
@@ -1,7 +1,7 @@
 
-<input type="hidden" id="dataSetId" value="${selectedDataSet.id}">
-<input type="hidden" id="periodId" value="${selectedPeriod.externalId}">
-<input type="hidden" id="selectedUnitOnly" value="${selectedUnitOnly}">
+<input type="hidden" id="currentDataSetId" value="${selectedDataSet.id}">
+<input type="hidden" id="currentPeriodId" value="${selectedPeriod.externalId}">
+<input type="hidden" id="currentSelectedUnitOnly" value="${selectedUnitOnly}">
 <div id="userInfo" class="page"></div>
 
 <h3>$i18n.getString('reporting_unit'): $encoder.htmlEncode( $selectedOrgunit.name ) &nbsp; $i18n.getString('reporting_period'): $format.formatPeriod( $selectedPeriod )</h3>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm	2012-04-05 13:13:13 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm	2012-05-16 17:17:26 +0000
@@ -1,7 +1,7 @@
 
-<input type="hidden" id="dataSetId" value="${selectedDataSet.id}">
-<input type="hidden" id="periodId" value="${selectedPeriod.externalId}">
-<input type="hidden" id="selectedUnitOnly" value="${selectedUnitOnly}">
+<input type="hidden" id="currentDataSetId" value="${selectedDataSet.id}">
+<input type="hidden" id="currentPeriodId" value="${selectedPeriod.externalId}">
+<input type="hidden" id="currentSelectedUnitOnly" value="${selectedUnitOnly}">
 <div id="userInfo" class="page"></div>
 
 <h3>$encoder.htmlEncode( $selectedOrgunit.name ) - $format.formatPeriod( $selectedPeriod )</h3>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm	2012-04-05 13:13:13 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm	2012-05-16 17:17:26 +0000
@@ -7,9 +7,9 @@
 }
 </style>
 
-<input type="hidden" id="dataSetId" value="${selectedDataSet.id}">
-<input type="hidden" id="periodId" value="${selectedPeriod.externalId}">
-<input type="hidden" id="selectedUnitOnly" value="${selectedUnitOnly}">
+<input type="hidden" id="currentDataSetId" value="${selectedDataSet.id}">
+<input type="hidden" id="currentPeriodId" value="${selectedPeriod.externalId}">
+<input type="hidden" id="currentSelectedUnitOnly" value="${selectedUnitOnly}">
 <div id="userInfo" class="page"></div>
 
 <h3>$encoder.htmlEncode( $selectedOrgunit.name ) - $format.formatPeriod( $selectedPeriod )</h3>