dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12653
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-15 07:46:54 +0700
message:
  Fix bug in 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-10-14 15:20:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-10-15 00:46:54 +0000
@@ -1683,38 +1683,41 @@
 				
 				for(var idx=0;idx<length;idx++)
 				{
-					var id = deId + '_' + idx;
-					if( idx==0 )
+					if(Ext.getCmp('filter_' + id)!=undefined)
 					{
-						dimensionOption = Ext.getCmp('filter_dimension_' + deId ).getValue();
-					}
-					
-					var filterOpt = Ext.getCmp('filter_opt_' + id).getValue();
-					var filterValue = Ext.getCmp('filter_' + id).rawValue.toLowerCase();;
-					if(deId=='GENDER'){	
-						filterValue = Ext.getCmp('filter_' + id).getValue();
-					}					
-					var filter = deId;
-					if( Ext.getCmp('filter_' + id).getValue()!=null 
-						&& Ext.getCmp('filter_' + id).getValue()!=''){
-						
-						filterValue = filterValue
-						filter += ':' + filterOpt + ':';
-						if( filterOpt == 'IN' )
-						{
-							filter += filterValue.replace(/:/g,";"); 
-						}
-						else
-						{
-							filter += filterValue;
-						}
-					}
-					
-					if( dimensionOption=='dimension' ){
-						p.dimension.push( filter );
-					}
-					else{
-						p.filter.push( filter );
+						var id = deId + '_' + idx;
+						if( idx==0 )
+						{
+							dimensionOption = Ext.getCmp('filter_dimension_' + deId ).getValue();
+						}
+						
+						var filterOpt = Ext.getCmp('filter_opt_' + id).getValue();
+						var filterValue = Ext.getCmp('filter_' + id).rawValue.toLowerCase();;
+						if(deId=='GENDER'){	
+							filterValue = Ext.getCmp('filter_' + id).getValue();
+						}					
+						var filter = deId;
+						if( Ext.getCmp('filter_' + id).getValue()!=null 
+							&& Ext.getCmp('filter_' + id).getValue()!=''){
+							
+							filterValue = filterValue
+							filter += ':' + filterOpt + ':';
+							if( filterOpt == 'IN' )
+							{
+								filter += filterValue.replace(/:/g,";"); 
+							}
+							else
+							{
+								filter += filterValue;
+							}
+						}
+						
+						if( dimensionOption=='dimension' ){
+							p.dimension.push( filter );
+						}
+						else{
+							p.filter.push( filter );
+						}
 					}
 				}
 			});