=== modified file 'dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-04-08 13:17:49 +0000 +++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-04-08 15:07:02 +0000 @@ -2842,6 +2842,9 @@ startDate.setValue(layout.startDate); endDate.setValue(layout.endDate); } + else { + onPeriodModeSelect('periods'); + } for (var i = 0, periodRecord, checkbox; i < periodRecords.length; i++) { periodRecord = periodRecords[i]; @@ -3335,7 +3338,7 @@ ] }, reset: function() { - this.setValue('periods'); + onPeriodModeSelect('periods'); }, listeners: { select: function(cmp) { @@ -3345,6 +3348,8 @@ }); onPeriodModeSelect = function(mode) { + periodMode.setValue(mode); + if (mode === 'dates') { startEndDate.show(); periods.hide(); @@ -5191,6 +5196,14 @@ config.showSubTotals = config.subtotals; delete config.subtotals; + if (config.startDate) { + config.startDate = config.startDate.substr(0,10); + } + + if (config.endDate) { + config.endDate = config.endDate.substr(0,10); + } + web.report.getData(config, true); } });