dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11167
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-06-07 09:58:05 +0700
message:
  Error when to move between Case-based to Aggregate option in tabular report.
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js


--
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-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2013-06-06 08:12:06 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java	2013-06-07 02:58:05 +0000
@@ -511,7 +511,6 @@
 
         // Filter is only one orgunit
         
-       
         if ( position == PatientAggregateReport.POSITION_ROW_PERIOD_COLUMN_DATA )
         {
             String orgunitName = organisationUnitService.getOrganisationUnit( orgunitIds.iterator().next() )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-06-06 03:06:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-06-07 02:58:05 +0000
@@ -2644,8 +2644,9 @@
 							{
 								filterValue = Ext.getCmp('filter_' + id).getValue();
 							}
-							if( filterValue == null || ( filterValue == '' && filterValue != 0 )
-							|| filterValue==TR.i18n.please_select ){
+							if( filterValue == null 
+								|| filterValue == '' || filterValue != 0
+								|| filterValue==TR.i18n.please_select ){
 								isValid = false;
 							}
 						}
@@ -4769,6 +4770,15 @@
 													Ext.getCmp('displayTotalsOpt').setVisible(true);
 													Ext.getCmp('datePeriodRangeDiv').expand();
 													Ext.getCmp('filterPanel').setHeight(105);
+													
+													TR.store.dateRange.loadData([],false);
+													TR.store.dateRange.add(
+														{
+															'startDate': Ext.getCmp('startDate').rawValue,
+															'endDate': Ext.getCmp('endDate').rawValue
+														}
+													);
+													
 												}
 											}
 										}