Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18789 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Tue 2015-03-31 18:05:23 +0200
message:
PT DV aggregation type fixes.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.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-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-03-10 11:32:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-03-31 16:03:57 +0000
@@ -576,17 +576,17 @@
queryMode: 'local',
valueField: 'id',
editable: false,
- value: 'default',
+ value: 'DEFAULT',
store: Ext.create('Ext.data.Store', {
fields: ['id', 'text'],
data: [
- {id: 'default', text: NS.i18n.by_data_element},
- {id: 'count', text: NS.i18n.count},
- {id: 'sum', text: NS.i18n.sum},
- {id: 'stddev', text: NS.i18n.stddev},
- {id: 'variance', text: NS.i18n.variance},
- {id: 'min', text: NS.i18n.min},
- {id: 'max', text: NS.i18n.max}
+ {id: 'DEFAULT', text: NS.i18n.by_data_element},
+ {id: 'COUNT', text: NS.i18n.count},
+ {id: 'SUM', text: NS.i18n.sum},
+ {id: 'STDDEV', text: NS.i18n.stddev},
+ {id: 'VARIANCE', text: NS.i18n.variance},
+ {id: 'MIN', text: NS.i18n.min},
+ {id: 'MAX', text: NS.i18n.max}
]
})
});
@@ -829,7 +829,7 @@
showRowSubTotals.setValue(Ext.isBoolean(layout.showRowSubTotals) ? layout.showRowSubTotals : true);
showDimensionLabels.setValue(Ext.isBoolean(layout.showDimensionLabels) ? layout.showDimensionLabels : true);
hideEmptyRows.setValue(Ext.isBoolean(layout.hideEmptyRows) ? layout.hideEmptyRows : false);
- aggregationType.setValue(Ext.isString(layout.aggregationType) ? layout.aggregationType : 'default');
+ aggregationType.setValue(Ext.isString(layout.aggregationType) ? layout.aggregationType : 'DEFAULT');
showHierarchy.setValue(Ext.isBoolean(layout.showHierarchy) ? layout.showHierarchy : false);
displayDensity.setValue(Ext.isString(layout.displayDensity) ? layout.displayDensity : 'normal');
fontSize.setValue(Ext.isString(layout.fontSize) ? layout.fontSize : 'normal');
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js 2015-03-31 14:29:54 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js 2015-03-31 16:03:57 +0000
@@ -326,7 +326,7 @@
// hideEmptyRows: boolean (false)
- // aggregationType: string ('default') - 'default', 'count', 'sum'
+ // aggregationType: string ('DEFAULT') - 'DEFAULT', 'COUNT', 'SUM', 'STDDEV', 'VARIANCE', 'MIN', 'MAX'
// showHierarchy: boolean (false)
@@ -493,7 +493,7 @@
layout.showRowSubTotals = Ext.isBoolean(config.rowSubTotals) ? config.rowSubTotals : (Ext.isBoolean(config.showRowSubTotals) ? config.showRowSubTotals : true);
layout.showDimensionLabels = Ext.isBoolean(config.showDimensionLabels) ? config.showDimensionLabels : (Ext.isBoolean(config.showDimensionLabels) ? config.showDimensionLabels : true);
layout.hideEmptyRows = Ext.isBoolean(config.hideEmptyRows) ? config.hideEmptyRows : false;
- layout.aggregationType = Ext.isString(config.aggregationType) ? config.aggregationType : 'default';
+ layout.aggregationType = Ext.isString(config.aggregationType) ? config.aggregationType : 'DEFAULT';
layout.showHierarchy = Ext.isBoolean(config.showHierarchy) ? config.showHierarchy : false;
@@ -1677,7 +1677,7 @@
delete layout.sorting;
}
- if (layout.aggregationType === 'default') {
+ if (layout.aggregationType === 'DEFAULT') {
delete layout.aggregationType;
}
@@ -1975,9 +1975,10 @@
paramString += '&hierarchyMeta=true';
}
- if (aggTypes.hasOwnProperty(xLayout.aggregationType)) {
- paramString += '&aggregationType=' + aggTypes[xLayout.aggregationType];
- }
+ // aggregation type
+ if (xLayout.aggregationType) {
+ paramString += '&aggregationType=' + xLayout.aggregationType;
+ }
// display property
paramString += '&displayProperty=' + init.userAccount.settings.keyAnalysisDisplayProperty.toUpperCase();
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-03-31 13:02:15 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-03-31 16:03:57 +0000
@@ -734,17 +734,17 @@
queryMode: 'local',
valueField: 'id',
editable: false,
- value: 'default',
+ value: 'DEFAULT',
store: Ext.create('Ext.data.Store', {
fields: ['id', 'text'],
data: [
- {id: 'default', text: NS.i18n.by_data_element},
- {id: 'count', text: NS.i18n.count},
- {id: 'sum', text: NS.i18n.sum},
- {id: 'stddev', text: NS.i18n.stddev},
- {id: 'variance', text: NS.i18n.variance},
- {id: 'min', text: NS.i18n.min},
- {id: 'max', text: NS.i18n.max}
+ {id: 'DEFAULT', text: NS.i18n.by_data_element},
+ {id: 'COUNT', text: NS.i18n.count},
+ {id: 'SUM', text: NS.i18n.sum},
+ {id: 'STDDEV', text: NS.i18n.stddev},
+ {id: 'VARIANCE', text: NS.i18n.variance},
+ {id: 'MIN', text: NS.i18n.min},
+ {id: 'MAX', text: NS.i18n.max}
]
})
});
@@ -972,7 +972,7 @@
}
sortOrder.setValue(Ext.isNumber(layout.sortOrder) ? layout.sortOrder : 0);
- aggregationType.setValue(Ext.isString(layout.aggregationType) ? layout.aggregationType : 'default');
+ aggregationType.setValue(Ext.isString(layout.aggregationType) ? layout.aggregationType : 'DEFAULT');
// rangeAxisMaxValue
if (Ext.isNumber(layout.rangeAxisMaxValue)) {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-03-31 13:02:15 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-03-31 16:03:57 +0000
@@ -855,7 +855,7 @@
// sortOrder: number
- // aggregationType: string ('default') - 'default', 'count', 'sum', 'stddev', 'variance', 'min', 'max'
+ // aggregationType: string ('DEFAULT') - 'DEFAULT', 'COUNT', 'SUM', 'STDDEV', 'VARIANCE', 'MIN', 'MAX'
// rangeAxisMaxValue: number
@@ -1103,7 +1103,7 @@
layout.baseLineTitle = Ext.isString(config.baseLineLabel) && !Ext.isEmpty(config.baseLineLabel) ? config.baseLineLabel :
(Ext.isString(config.baseLineTitle) && !Ext.isEmpty(config.baseLineTitle) ? config.baseLineTitle : null);
layout.sortOrder = Ext.isNumber(config.sortOrder) ? config.sortOrder : 0;
- layout.aggregationType = Ext.isString(config.aggregationType) ? config.aggregationType : 'default';
+ layout.aggregationType = Ext.isString(config.aggregationType) ? config.aggregationType : 'DEFAULT';
layout.rangeAxisMaxValue = Ext.isNumber(config.rangeAxisMaxValue) ? config.rangeAxisMaxValue : null;
layout.rangeAxisMinValue = Ext.isNumber(config.rangeAxisMinValue) ? config.rangeAxisMinValue : null;
@@ -1202,7 +1202,7 @@
}
if (!(Ext.isArray(config.rows) && config.rows.length > 0)) {
- init.alert('No values found');
+ alert('No values found');
return;
}
@@ -1920,6 +1920,10 @@
delete layout.legend;
}
+ if (layout.aggregationType === 'DEFAULT') {
+ delete layout.aggregationType;
+ }
+
// default true
if (layout.showValues) {
@@ -2225,10 +2229,10 @@
}
}
- // aggregation type
- if (aggTypes.hasOwnProperty(xLayout.aggregationType)) {
- paramString += '&aggregationType=' + aggTypes[xLayout.aggregationType];
- }
+ // aggregation type
+ if (xLayout.aggregationType) {
+ paramString += '&aggregationType=' + xLayout.aggregationType;
+ }
// display property
paramString += '&displayProperty=' + init.userAccount.settings.keyAnalysisDisplayProperty.toUpperCase();
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
