=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/statisticalReport.js' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/statisticalReport.js 2013-03-08 08:47:35 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/statisticalReport.js 2013-03-08 09:22:54 +0000 @@ -15,8 +15,8 @@ jQuery( "#statisticalReportDiv" ).load( "generateStatisticalProgramReport.action", { programId: getFieldValue('programId'), - startDate: getFieldValue('startDate') + ' 00:00', - endDate: getFieldValue( 'endDate' ) + ' 23:59', + startDate: getFieldValue('startDateField') + ' 00:00', + endDate: getFieldValue( 'endDateField' ) + ' 23:59', facilityLB: $('input[name=facilityLB]:checked').val(), }, function() { @@ -29,6 +29,8 @@ } else { + setFieldValue('startDate', getFieldValue('startDateField') + ' 00:00'); + setFieldValue('endDate', getFieldValue( 'endDateField' ) + ' 23:59'); byId('reportForm').submit(); } === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm 2013-03-08 08:47:35 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm 2013-03-08 09:22:54 +0000 @@ -3,7 +3,7 @@ validation( 'reportForm', function(form){ generatedStatisticalProgramReport(); }); - datePickerInRange( 'startDate' , 'endDate' ); + datePickerInRange( 'startDateField' , 'endDateField' ); }); @@ -13,6 +13,8 @@ + +
@@ -34,13 +36,13 @@
- +
- +