dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7536
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-07-09 11:46:02 +0700
message:
  Filter data 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/app/images/delete.png
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.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	2012-07-03 06:01:08 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-07-09 04:46:02 +0000
@@ -973,12 +973,12 @@
 			return colname + "_false_";
 		},
 		paramChanged: function() {
-			if( TR.store.datatable && TR.store.datatable.data.length)
+			if( TR.store.datatable && TR.store.datatable.data.length > 0 )
 			{
 				var orgUnitCols = TR.init.system.maxLevels + 1 - TR.cmp.settings.level.getValue();
-				var orgUnitColsInTable =  ( TR.datatable.datatable.columns 
-									- TR.cmp.params.patientProperty.selected.store.length
-									+ TR.cmp.params.dataelement.selected.store.length );
+				var orgUnitColsInTable =  ( TR.datatable.datatable.columns.length 
+									- TR.cmp.params.patientProperty.selected.store.data.length
+									- TR.cmp.params.dataelement.selected.store.data.length - 3 );
 				if( orgUnitCols!=orgUnitColsInTable )
 				{
 					return true;
@@ -1215,7 +1215,7 @@
 						
 			// Org unit level columns
 			
-			for( var i = 0; i < orgUnitCols; i++ )
+			for( var i = 0; i <orgUnitCols; i++ )
 			{
 				cols[++index] = {
 					header: TR.value.columns[index].name, 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/delete.png'
Binary files dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/delete.png	2012-06-08 05:10:54 +0000 and dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/images/delete.png	2012-07-09 04:46:02 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm	2012-06-20 08:18:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm	2012-07-09 04:46:02 +0000
@@ -84,4 +84,7 @@
 none:'[' + '$encoder.jsEscape($i18n.getString( 'none' ) , "'")' + ']',
 not_empty:'$encoder.jsEscape($i18n.getString( 'not_empty' ) , "'")',
 operations:'$encoder.jsEscape($i18n.getString( 'operations' ) , "'")',
+deleting:'$encoder.jsEscape($i18n.getString( 'deleting' ) , "'")',
+saving:'$encoder.jsEscape($i18n.getString( 'saving' ) , "'")',
+renaming:'$encoder.jsEscape($i18n.getString( 'renaming' ) , "'")'
 };
\ No newline at end of file