------------------------------------------------------------
revno: 19965
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Thu 2015-09-03 13:03:34 +0200
message:
EV, upgraded to valueType enum
modified:
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/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-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-09-03 10:15:10 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-09-03 11:03:34 +0000
@@ -3795,7 +3795,7 @@
var layoutWindow = ns.app.aggregateLayoutWindow;
this.each( function(record) {
- if (Ext.Array.contains(['int', 'number'], record.data.valueType)) {
+ if (Ext.Array.contains(ns.core.conf.valueType.numericTypes, record.data.valueType)) {
layoutWindow.valueStore.add(record.data);
}
});
@@ -4364,19 +4364,19 @@
return 'Ext.ux.panel.OrganisationUnitGroupSetContainer';
}
- if (element.valueType === 'int' || element.valueType === 'number') {
+ if (Ext.Array.contains(ns.core.conf.valueType.numericTypes, element.valueType)) {
return 'Ext.ux.panel.DataElementIntegerContainer';
}
- if (element.valueType === 'string') {
+ if (Ext.Array.contains(ns.core.conf.valueType.textTypes, element.valueType)) {
return 'Ext.ux.panel.DataElementStringContainer';
}
- if (element.valueType === 'date') {
+ if (Ext.Array.contains(ns.core.conf.valueType.dateTypes, element.valueType)) {
return 'Ext.ux.panel.DataElementDateContainer';
}
- if (element.valueType === 'bool' || element.valueType === 'trueOnly') {
+ if (Ext.Array.contains(ns.core.conf.valueType.booleanTypes, element.valueType)) {
return 'Ext.ux.panel.DataElementBooleanContainer';
}
@@ -4417,7 +4417,7 @@
allElements = [],
aggWindow = ns.app.aggregateLayoutWindow,
//queryWindow = ns.app.queryLayoutWindow,
- includeKeys = ['int', 'number', 'bool', 'boolean', 'trueOnly'],
+ includeKeys = ns.core.conf.valueType.aggregateTypes,
ignoreKeys = ['pe', 'ou'],
recordMap = {
'pe': {id: 'pe', name: 'Periods'},
@@ -4455,7 +4455,7 @@
element = dataElements[i];
allElements.push(element);
- if (element.valueType === 'int' && element.filter) {
+ if (Ext.Array.contains(ns.core.conf.valueType.numericTypes, element.valueType) && element.filter) {
a = element.filter.split(':');
numberOfElements = a.length / 2;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-09-02 18:25:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-09-03 11:03:34 +0000
@@ -677,6 +677,14 @@
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;
_______________________________________________
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
