=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2014-04-02 12:33:53 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2014-04-02 15:49:34 +0000
@@ -194,7 +194,7 @@
/main.vm
/dhis-web-reporting/dataApprovalForm.vm
/dhis-web-reporting/menu.vm
- ../dhis-web-commons/oust/oust.js,javascript/dataApproval.js
+ ../dhis-web-commons/oust/oust.js,javascript/dataSetReport.js,javascript/dataApproval.js
style/dhis-web-reporting.css
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm 2014-04-02 15:07:20 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm 2014-04-02 15:49:34 +0000
@@ -42,7 +42,7 @@
}
-
+
+
+
+
+
+
#parse( "dhis-web-commons/loader/loader.vm" )
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js 2014-04-02 12:33:53 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js 2014-04-02 15:49:34 +0000
@@ -0,0 +1,30 @@
+
+dhis2.util.namespace( 'dhis2.appr' );
+
+dhis2.appr.currentPeriodOffset = 0;
+
+dhis2.appr.dataSetSelected = function()
+{
+ dhis2.appr.displayPeriods();
+}
+
+dhis2.appr.displayPeriods = function()
+{
+ var pt = $( '#dataSetId :selected' ).data( "pt" );
+ dhis2.dsr.displayPeriodsInternal( pt, dhis2.appr.currentPeriodOffset );
+}
+
+dhis2.appr.displayNextPeriods = function()
+{
+ if ( dhis2.appr.currentPeriodOffset < 0 ) // Cannot display future periods
+ {
+ dhis2.appr.currentPeriodOffset++;
+ dhis2.appr.displayPeriods();
+ }
+}
+
+dhis2.appr.displayPreviousPeriods = function()
+{
+ dhis2.appr.currentPeriodOffset--;
+ dhis2.appr.displayPeriods();
+}
=== 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 2014-04-02 15:07:20 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js 2014-04-02 15:49:34 +0000
@@ -183,7 +183,12 @@
dhis2.dsr.displayPeriods = function()
{
var periodType = $( "#periodType" ).val();
- var periods = dhis2.dsr.periodTypeFactory.get( periodType ).generatePeriods( dhis2.dsr.currentPeriodOffset );
+ dhis2.dsr.displayPeriodsInternal( periodType, dhis2.dsr.currentPeriodOffset );
+}
+
+dhis2.dsr.displayPeriodsInternal = function( periodType, offset )
+{
+ var periods = dhis2.dsr.periodTypeFactory.get( periodType ).generatePeriods( offset );
periods = dhis2.dsr.periodTypeFactory.reverse( periods );
periods = dhis2.dsr.periodTypeFactory.filterFuturePeriodsExceptCurrent( periods );