dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10849
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-15 21:19:00 +0700
message:
  Fix bug - Error when to generate tabular report with boolean data elements.
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-05-15 02:13:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-05-15 14:19:00 +0000
@@ -319,7 +319,7 @@
 						array.push({id: item, uid:a.store.getAt(data).data.uid, name:name, compulsory: a.store.getAt(data).data.compulsory, valueType:valueType});
 						if(f!=undefined)
 						{
-							TR.util.multiselect.addFilterField( f, selected[data], name, valueType );
+							TR.util.multiselect.addFilterField( f, item, name, valueType );
 						}
 					});
 					s.store.add(array);
@@ -1892,10 +1892,12 @@
 						var filterValue = Ext.getCmp('filter_' + id).rawValue;
 						var filter = deId + '_' + hidden + '_';
 						
-						if( filterValue!='' ){
+						if( Ext.getCmp('filter_' + id).getValue()!=null 
+							&& Ext.getCmp('filter_' + id).getValue()!=''){
 							filterValue = filterValue.toLowerCase();
 							filter += filterOpt + ' ';
-							if( filterOpt == 'IN' )
+							if( filtif( Ext.getCmp('filter_' + id).getValue()!=null 
+							&& Ext.getCmp('filter_' + id).getValue()!=''){erOpt == 'IN' )
 							{
 								var filterValues = filterValue.split(";");
 								filter +="(";
@@ -1907,7 +1909,7 @@
 							}
 							else
 							{
-								filter += "'" + filterValue + "'";
+								filter += "'" + Ext.getCmp('filter_' + id).getValue() + "'";
 							}
 						}
 						p.searchingValues.push( filter );
@@ -1989,7 +1991,9 @@
 						var filterValue = Ext.getCmp('filter_' + id).rawValue;
 						
 						var filter = deId + '_' + hidden + '_';
-						if( filterValue!=''){
+						if( Ext.getCmp('filter_' + id).getValue()!=null 
+							&& Ext.getCmp('filter_' + id).getValue()!=''){
+							
 							filterValue = filterValue.toLowerCase();
 							var filterOpt = Ext.getCmp('filter_opt_' + id).rawValue;
 							filter += filterOpt + ' ';
@@ -2006,7 +2010,7 @@
 							}
 							else
 							{
-								filter += "'" + filterValue + "'";
+								filter += "'" + Ext.getCmp('filter_' + id).getValue() + "'";
 							}
 						}
 						TR.util.list.addOptionToList(searchingValues, filter, '');