------------------------------------------------------------
revno: 21717
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Thu 2016-01-14 11:03:58 +0100
message:
ER EV aggregate types bug fixed.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/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-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2016-01-11 16:29:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2016-01-14 10:03:58 +0000
@@ -4817,7 +4817,7 @@
allElements = [],
aggWindow = ns.app.aggregateLayoutWindow,
queryWindow = ns.app.queryLayoutWindow,
- includeKeys = ns.core.conf.valueType.aggregateTypes,
+ includeKeys = ns.core.conf.valueType.tAggregateTypes,
ignoreKeys = ['pe', 'ou'],
recordMap = {
'pe': {id: 'pe', name: 'Periods'},
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js 2015-12-04 14:38:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js 2016-01-14 10:03:58 +0000
@@ -224,6 +224,7 @@
]
};
+ // value type
conf.valueType = {
numericTypes: ['NUMBER','UNIT_INTERVAL','PERCENTAGE','INTEGER','INTEGER_POSITIVE','INTEGER_NEGATIVE','INTEGER_ZERO_OR_POSITIVE'],
textTypes: ['TEXT','LONG_TEXT','LETTER','PHONE_NUMBER','EMAIL'],
@@ -232,7 +233,7 @@
aggregateTypes: ['NUMBER','UNIT_INTERVAL','PERCENTAGE','INTEGER','INTEGER_POSITIVE','INTEGER_NEGATIVE','INTEGER_ZERO_OR_POSITIVE','BOOLEAN','TRUE_ONLY']
};
- // aggregation type
+ // aggregation type
conf.aggregationType = {
data: [
{id: 'COUNT', name: ER.i18n.count, text: ER.i18n.count},
@@ -246,14 +247,6 @@
idNameMap: {}
};
- conf.valueType = {
- numericTypes: ['NUMBER','UNIT_INTERVAL','PERCENTAGE','INTEGER','INTEGER_POSITIVE','INTEGER_NEGATIVE','INTEGER_ZERO_OR_POSITIVE'],
- textTypes: ['TEXT','LONG_TEXT','LETTER','PHONE_NUMBER','EMAIL'],
- booleanTypes: ['BOOLEAN','TRUE_ONLY'],
- dateTypes: ['DATE','DATETIME'],
- aggregateTypes: ['NUMBER','UNIT_INTERVAL','PERCENTAGE','INTEGER','INTEGER_POSITIVE','INTEGER_NEGATIVE','INTEGER_ZERO_OR_POSITIVE','BOOLEAN','TRUE_ONLY']
- };
-
for (var i = 0, obj; i < conf.aggregationType.data.length; i++) {
obj = conf.aggregationType.data[i];
conf.aggregationType.idNameMap[obj.id] = obj.text;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2016-01-11 16:29:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2016-01-14 10:03:58 +0000
@@ -4455,7 +4455,7 @@
allElements = [],
aggWindow = ns.app.aggregateLayoutWindow,
//queryWindow = ns.app.queryLayoutWindow,
- includeKeys = ns.core.conf.valueType.aggregateTypes,
+ includeKeys = ns.core.conf.valueType.tAggregateTypes,
ignoreKeys = ['pe', 'ou'],
recordMap = {
'pe': {id: 'pe', name: 'Periods'},
_______________________________________________
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
