dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7580
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-07-12 09:49:28 +0700
message:
  Remove the first empty row in the result in 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/jsonTabularReportResult.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties


--
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	2012-07-11 04:13:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-07-12 02:49:28 +0000
@@ -753,11 +753,14 @@
 						// Get fields
 						var fields = [];
 						fields[0] = 'id';
+						var record = new Array();
 						for( var index=1; index < TR.value.columns.length; index++ )
 						{
 							fields[index] = 'col' + index;
+							record.push('');
 						}
 						TR.value.fields = fields;
+						TR.value.values.unshift(record);
 						
 						// Set data for grid
 						TR.store.getDataTableStore();
@@ -1249,7 +1252,7 @@
 			// Data element columns
 			
 			TR.cmp.params.dataelement.selected.store.each( function(r) {
-				cols[++index] = TR.datatable.createColumn( r.data.valueType, r.data.id, r.data.compulsory, cols, index );
+				cols[++index] = TR.datatable.createColumn( r.data.valueType, r.data.id, r.data.compulsory, r.data.name, index );
 			});
 			
 			cols[++index]={
@@ -1443,13 +1446,13 @@
 			});
 			
 		},
-		createColumn: function( type, id, compulsory, cols, index )
+		createColumn: function( type, id, compulsory, colname, index )
 		{
 			var objectType = id.split('_')[0];
 			var objectId = id.split('_')[1];
 			
 			var params = {};
-			params.header = TR.value.columns[index].name;
+			params.header = colname;
 			params.dataIndex = 'col' + index;
 			params.name = id;
 			params.hidden = eval(TR.value.columns[index].hidden );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm	2012-07-11 04:13:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm	2012-07-12 02:49:28 +0000
@@ -22,9 +22,6 @@
   #end
 ],
 "items":[
-  [
-  #foreach( $col in $grid.getHeaders() )"",#end
-  ],
   #foreach( $row in $grid.getRows() )
   [
   #foreach( $col in $row )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-07-10 11:18:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2012-07-12 02:49:28 +0000
@@ -251,4 +251,3 @@
 number_of_patients = Number of patients
 number_of_visits = Number of visits
 insert = Insert
-displayed_as_textarea = Displayed as textarea