← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11722: Fixed bug - Error when to generate aggregate tabular report.

 

------------------------------------------------------------
revno: 11722
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-08-21 10:03:52 +0700
message:
  Fixed bug - Error when to generate aggregate tabular report.
modified:
  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-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-08-20 09:41:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-08-21 03:03:52 +0000
@@ -2779,7 +2779,7 @@
 								filterValue = Ext.getCmp('filter_' + id).getValue();
 							}
 							if( filterValue == null 
-								|| filterValue == '' || filterValue != 0
+								|| filterValue == ''
 								|| filterValue==TR.i18n.please_select ){
 								isValid = false;
 							}
@@ -2843,10 +2843,8 @@
 				
 					// Check filter by period
 					if( p == 3 )
-					if( p == 3 )
 					{
 						var noPeriod = TR.store.dateRange.data.length + TR.cmp.params.fixedperiod.selected.store.data.length;
-						
 						var relativePeriodList = TR.cmp.params.relativeperiod.checkbox;
 						Ext.Array.each(relativePeriodList, function(item) {
 							if(item.getValue() && !item.hidden