dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11711
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-08-20 15:40:55 +0700
message:
  Fixed bug - Error when to select operator of number dataelement field in Aggregate tabular report.
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/app/css/style.css
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm


--
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 06:18:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-08-20 08:40:55 +0000
@@ -185,7 +185,7 @@
 		window_record_width: 450,
 		window_record_height: 300,
 		west_dataelements_multiselect: 120,
-		west_dataelements_filter_panel: 135,
+		west_dataelements_filter_panel: 130,
 		west_dataelements_expand_filter_panel: 280,
 		west_dataelements_collapse_filter_panel: 130,
 		west_dataelements_expand_aggregate_filter_panel: 230,
@@ -570,13 +570,10 @@
 				params.listeners={};
 				params.listeners.select = function(cb)  {
 					var opt = cb.getValue();
-					if(opt == 'in')
-					{
+					if(opt == 'in'){
 						Ext.getCmp('filter_' + id).multiSelect = true;
 					}
-					else
-					{
-						Ext.getCmp('filter_' + id).clearValue();
+					else{
 						Ext.getCmp('filter_' + id).multiSelect = false;
 					}
 				}
@@ -682,7 +679,16 @@
 						params.multiSelect = true;
 						params.delimiter = ';';
 						var index = TR.store.dataelement.selected.findExact('id', 'de_' + deId);
-						var deUid = TR.store.dataelement.selected.getAt(index).data.uid;
+						var deUid = "";
+						if( index == -1 )
+						{
+							index = TR.store.dataelement.available.findExact('id', 'de_' + deId);
+							deUid = TR.store.dataelement.available.getAt(index).data.uid;
+						}
+						else
+						{
+							deUid = TR.store.dataelement.selected.getAt(index).data.uid;
+						}
 						params.store = Ext.create('Ext.data.Store', {
 							fields: ['o'],
 							data:[],
@@ -1199,7 +1205,8 @@
 										var name = TR.util.string.getEncodedString(f.dataElements[i].name);
 										var compulsory = f.dataElements[i].compulsory;
 										var valueType = f.dataElements[i].valueType;
-										TR.store.dataelement.selected.add({id: f.dataElements[i].id, name: name, compulsory: compulsory, valueType: valueType});
+										var uid = f.dataElements[i].uid;
+										TR.store.dataelement.selected.add({id: f.dataElements[i].id, name: name, compulsory: compulsory, valueType: valueType, uid:uid});
 										TR.util.multiselect.addFilterField( 'filterPanel', f.dataElements[i].id, name, valueType, f.dataElements[i].filter );
 									}
 									

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css	2013-04-02 04:51:30 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css	2013-08-20 08:40:55 +0000
@@ -674,6 +674,7 @@
 .tr-accordion .x-accordion-body { /* accordion item body */
 	padding: 8px 8px 2px 8px;
 	border-top: 1px solid #c5c5c5 !important;
+	border-bottom: 2px solid #C5C5C5 !important;
 }
 
 .tr-accordion .x-accordion-hd-sibling-expanded {

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm	2013-05-30 09:08:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm	2013-08-20 08:40:55 +0000
@@ -91,6 +91,7 @@
 			{
 				"id": "de_${dataElement.id}",
 				"name": "${dataElement.name}",
+				"uid": "${dataElement.uid}",
 				"compulsory": "",
 				"valueType": #if( $dataElement.optionSet )
 								"list"