dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10136
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-03-11 20:18:17 +0700
message:
  Reset default position when to select a group-by data element in Aggregate Tabular report.
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-03-11 06:23:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-03-11 13:18:17 +0000
@@ -4438,7 +4438,7 @@
 																	['2', TR.i18n.columns], 
 																	['3', TR.i18n.filters] ]
 														}),
-														value: '3',
+														value: '1',
 														listeners: {
 															added: function() {
 																TR.cmp.settings.positionOrgunit = this;
@@ -4463,7 +4463,7 @@
 																	['2', TR.i18n.columns], 
 																	['3', TR.i18n.filters] ]
 														}),
-														value: '3',
+														value: '2',
 														listeners: {
 															added: function() {
 																TR.cmp.settings.positionPeriod = this;
@@ -4488,7 +4488,7 @@
 																	['2', TR.i18n.columns], 
 																	['3', TR.i18n.filters] ]
 														}),
-														value: '1',
+														value: '3',
 														listeners: {
 															added: function() {
 																TR.cmp.settings.positionData = this;
@@ -4642,6 +4642,20 @@
 													listeners: {
 														added: function() {
 															TR.cmp.settings.dataElementGroupBy = this;
+														},
+														select: function(cb) {
+															if( cb.getValue()!=null && cb.getValue()!='' 
+																&& Ext.getCmp('positionDataCbx').getValue() !='1'){
+																if( Ext.getCmp('positionOrgunitCbx').getValue() == '1' ){
+																	Ext.getCmp('positionOrgunitCbx').setValue('3');
+																	Ext.getCmp('positionPeriodCbx').setValue('2');
+																}
+																else {
+																	Ext.getCmp('positionOrgunitCbx').setValue('2');
+																	Ext.getCmp('positionPeriodCbx').setValue('3');
+																}
+																Ext.getCmp('positionDataCbx').setValue('1');
+															}
 														}
 													}
 												},