dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12703
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-10-16 14:51:29 +0700
message:
  Fixed bug - Aggregate tabular report not work
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-10-15 11:07:20 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-10-16 07:51:29 +0000
@@ -1689,9 +1689,9 @@
 				
 				for(var idx=0;idx<length;idx++)
 				{
+					var id = deId + '_' + idx;
 					if(Ext.getCmp('filter_' + id)!=undefined)
 					{
-						var id = deId + '_' + idx;
 						if( idx==0 )
 						{
 							dimensionOption = Ext.getCmp('filter_dimension_' + deId ).getValue();
@@ -2071,7 +2071,7 @@
 							var fields = [];
 							for( var index=0; index < TR.value.columns.length; index++ )
 							{
-								fields[index] = TR.value.columns[index].column;
+								fields[index] = TR.value.columns[index].name;
 							}
 							TR.value.fields = fields;
 							
@@ -2277,9 +2277,9 @@
 						for(var idx=0;idx<length;idx++)
 						{
 							var id = deId + '_' + idx;
-							var filterValue = Ext.getCmp('filter_' + id).rawValue;
-							if(Ext.getCmp('filter_' + id)==undefined)
+							if(Ext.getCmp('filter_' + id)!=undefined)
 							{
+								var filterValue = Ext.getCmp('filter_' + id).rawValue;
 								if(filterValue==null || filterValue==TR.i18n.please_select){
 									filterValue = Ext.getCmp('filter_' + id).getValue();
 								}
@@ -2525,8 +2525,10 @@
 							added: function() {
 								TR.cmp.settings.currentPage = this;
 							},
-							change: function(textfield,newValue,oldValue){
-								TR.exe.paging( eval(newValue));
+							specialkey: function(f,e){
+								 if(e.getKey() == e.ENTER){
+									TR.exe.paging( Ext.getCmp('currentPage').getValue() );
+								}
 							}
 						},
 					},