dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12643
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-10-14 22:20:00 +0700
message:
  Fixed bugs in tabular report and in Advanced-search function.
modified:
  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/javascript/commons.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-11 15:37:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-10-14 15:20:00 +0000
@@ -433,7 +433,7 @@
 						autoScroll: true,
 						overflowX: 'hidden',
 						overflowY: 'auto',
-						width: TR.conf.layout.west_fieldset_width - 40
+						width: TR.conf.layout.west_fieldset_width - 10
 					};
 					Ext.getCmp(p).add(panel);
 					subPanel = Ext.getCmp(panelid);
@@ -553,7 +553,7 @@
 				params.id = 'filter_' + id;
 				params.cls = 'tr-textfield-alt1';
 				params.emptyText = TR.i18n.filter_value;
-				params.width = (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 80;
+				params.width = (TR.conf.layout.west_fieldset_width - TR.conf.layout.west_width_subtractor) / 2 - 50;
 				xtype = xtype.toLowerCase();
 				if( valueType=='GENDER'){
 					params.xtype = 'combobox';
@@ -2269,14 +2269,16 @@
 						{
 							var id = deId + '_' + idx;
 							var filterValue = Ext.getCmp('filter_' + id).rawValue;
-							if(filterValue==null || filterValue==TR.i18n.please_select)
+							if(Ext.getCmp('filter_' + id)==undefined)
 							{
-								filterValue = Ext.getCmp('filter_' + id).getValue();
-							}
-							if( filterValue == null 
-								|| filterValue == ''
-								|| filterValue==TR.i18n.please_select ){
-								isValid = false;
+								if(filterValue==null || filterValue==TR.i18n.please_select){
+									filterValue = Ext.getCmp('filter_' + id).getValue();
+								}
+								if( filterValue == null 
+									|| filterValue == ''
+									|| filterValue==TR.i18n.please_select ){
+									isValid = false;
+								}
 							}
 						}
 					});
@@ -4396,7 +4398,7 @@
 													Ext.getCmp('deSumCbx').setVisible(false);
 													Ext.getCmp('caseBasedFavoriteBtn').setVisible(true);
 													Ext.getCmp('relativePeriodsDiv').setVisible(false);
-													Ext.getCmp('filterPanel').setHeight(155);
+													Ext.getCmp('filterPanel').setHeight(253);
 													
 												}
 											}
@@ -4420,7 +4422,7 @@
 													Ext.getCmp('caseBasedFavoriteBtn').setVisible(false);
 													
 													Ext.getCmp('relativePeriodsDiv').setVisible(true);
-													Ext.getCmp('filterPanel').setHeight(105);
+													Ext.getCmp('filterPanel').setHeight(223);
 													Ext.getCmp('dateRangeDiv').expand();
 												}
 											}
@@ -5268,7 +5270,7 @@
 											{
 												xtype: 'panel',
 												layout: 'column',
-												bodyStyle: 'border-style:none;magrin-left:2px;height:7005px;',
+												bodyStyle: 'border-style:none;magrin-left:2px;height:700px;',
 												items: [
 													{
 														xtype: 'toolbar',

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-10-12 14:19:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2013-10-14 15:20:00 +0000
@@ -2329,7 +2329,7 @@
 
 function searchByIdsOnclick()
 {
-	var params = "searchTexts=iden_" + getFieldValue("searchPatientByIds") + "_" + getFieldValue("orgunitId");
+	var params = "searchTexts=iden_" + getFieldValue("searchPatientByIds").toLowerCase() + "_" + getFieldValue("orgunitId");
 	params += "&listAll=false";
 	params += "&facilityLB=";