dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39000
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19800: PT operand fix + plugin updated.
------------------------------------------------------------
revno: 19800
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-08-19 23:26:45 +0200
message:
PT operand fix + plugin updated.
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-pivot/scripts/table.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.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-08-05 12:57:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-08-19 21:26:45 +0000
@@ -1081,15 +1081,6 @@
delete favorite.parentGraphMap;
delete favorite.id;
-
- // Replace operand id characters
- for (var i = 0; i < dimensions.length; i++) {
- if (dimensions[i].dimension === ns.core.conf.finals.dimension.operand.objectName) {
- for (var j = 0; j < dimensions[i].items.length; j++) {
- dimensions[i].items[j].id = dimensions[i].items[j].id.replace('#', '.');
- }
- }
- }
}
return favorite;
@@ -3124,10 +3115,6 @@
data = response.objects || response.dataElementOperands || [],
pager = response.pager;
- for (var i = 0; i < data.length; i++) {
- data[i].id = data[i].id.split('.').join('#');
- }
-
store.loadStore(data, pager, append, fn);
},
callback: function() {
=== 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-08-10 07:42:21 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js 2015-08-19 21:26:45 +0000
@@ -298,8 +298,6 @@
return;
}
- config.id = config.id.replace('.', '#');
-
return config;
}();
};
@@ -1758,18 +1756,6 @@
}
}());
- // extend metadata
- (function() {
- for (var i = 0, id, splitId ; i < ids.length; i++) {
- id = ids[i];
-
- if (id.indexOf('#') !== -1) {
- splitId = id.split('#');
- response.metaData.names[id] = response.metaData.names[splitId[0]] + ' ' + response.metaData.names[splitId[1]];
- }
- }
- }());
-
// create value id map
(function() {
var valueHeaderIndex = response.nameHeaderMap[conf.finals.dimension.value.value].index,
@@ -2050,16 +2036,6 @@
items = Ext.clone(dimensionNameIdsMap[dimName]);
if (dimName === dx) {
- //for (var j = 0, index; j < items.length; j++) {
- //index = items[j].indexOf('#');
-
- //if (index > 0) {
- //addCategoryDimension = true;
- //items[j] = items[j].substr(0, index);
- //items[j] = items[j].replace('#', '.');
- //}
- //}
-
items = Ext.Array.unique(items);
}
@@ -2145,8 +2121,6 @@
direction = xLayout.sorting ? xLayout.sorting.direction : 'DESC',
layout;
- id = Ext.isString(id) ? id.replace('#', '') : id;
-
dim.ids = [];
// relative id?
@@ -2565,7 +2539,7 @@
uuids = [];
// meta data uid
- id = ((xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : '')).replace('#', '');
+ id = ((xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : ''));
// value html element id
uuid = Ext.data.IdGenerator.get('uuid').generate();
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js 2015-08-05 12:57:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js 2015-08-19 21:26:45 +0000
@@ -186,7 +186,7 @@
west_fill_accordion_dataset: 56,
west_fill_accordion_eventdataitem: 81,
west_fill_accordion_programindicator: 81,
- west_fill_accordion_period: 303,
+ west_fill_accordion_period: 310,
west_fill_accordion_organisationunit: 58,
west_fill_accordion_group: 31,
west_maxheight_accordion_indicator: 400,
@@ -300,8 +300,6 @@
return;
}
- config.id = config.id.replace('.', '#');
-
return config;
}();
};
@@ -1760,18 +1758,6 @@
}
}());
- // extend metadata
- (function() {
- for (var i = 0, id, splitId ; i < ids.length; i++) {
- id = ids[i];
-
- if (id.indexOf('#') !== -1) {
- splitId = id.split('#');
- response.metaData.names[id] = response.metaData.names[splitId[0]] + ' ' + response.metaData.names[splitId[1]];
- }
- }
- }());
-
// create value id map
(function() {
var valueHeaderIndex = response.nameHeaderMap[conf.finals.dimension.value.value].index,
@@ -2052,16 +2038,6 @@
items = Ext.clone(dimensionNameIdsMap[dimName]);
if (dimName === dx) {
- //for (var j = 0, index; j < items.length; j++) {
- //index = items[j].indexOf('#');
-
- //if (index > 0) {
- //addCategoryDimension = true;
- //items[j] = items[j].substr(0, index);
- //items[j] = items[j].replace('#', '.');
- //}
- //}
-
items = Ext.Array.unique(items);
}
@@ -2147,8 +2123,6 @@
direction = xLayout.sorting ? xLayout.sorting.direction : 'DESC',
layout;
- id = Ext.isString(id) ? id.replace('#', '') : id;
-
dim.ids = [];
// relative id?
@@ -2567,7 +2541,7 @@
uuids = [];
// meta data uid
- id = ((xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : '')).replace('#', '');
+ id = ((xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : ''));
// value html element id
uuid = Ext.data.IdGenerator.get('uuid').generate();
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js 2015-08-05 12:57:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js 2015-08-19 21:26:45 +0000
@@ -186,7 +186,7 @@
west_fill_accordion_dataset: 56,
west_fill_accordion_eventdataitem: 81,
west_fill_accordion_programindicator: 81,
- west_fill_accordion_period: 303,
+ west_fill_accordion_period: 310,
west_fill_accordion_organisationunit: 58,
west_fill_accordion_group: 31,
west_maxheight_accordion_indicator: 400,
@@ -300,8 +300,6 @@
return;
}
- config.id = config.id.replace('.', '#');
-
return config;
}();
};
@@ -1760,18 +1758,6 @@
}
}());
- // extend metadata
- (function() {
- for (var i = 0, id, splitId ; i < ids.length; i++) {
- id = ids[i];
-
- if (id.indexOf('#') !== -1) {
- splitId = id.split('#');
- response.metaData.names[id] = response.metaData.names[splitId[0]] + ' ' + response.metaData.names[splitId[1]];
- }
- }
- }());
-
// create value id map
(function() {
var valueHeaderIndex = response.nameHeaderMap[conf.finals.dimension.value.value].index,
@@ -2052,16 +2038,6 @@
items = Ext.clone(dimensionNameIdsMap[dimName]);
if (dimName === dx) {
- //for (var j = 0, index; j < items.length; j++) {
- //index = items[j].indexOf('#');
-
- //if (index > 0) {
- //addCategoryDimension = true;
- //items[j] = items[j].substr(0, index);
- //items[j] = items[j].replace('#', '.');
- //}
- //}
-
items = Ext.Array.unique(items);
}
@@ -2147,8 +2123,6 @@
direction = xLayout.sorting ? xLayout.sorting.direction : 'DESC',
layout;
- id = Ext.isString(id) ? id.replace('#', '') : id;
-
dim.ids = [];
// relative id?
@@ -2567,7 +2541,7 @@
uuids = [];
// meta data uid
- id = ((xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : '')).replace('#', '');
+ id = ((xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : ''));
// value html element id
uuid = Ext.data.IdGenerator.get('uuid').generate();
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js 2015-08-05 12:57:59 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js 2015-08-19 21:26:45 +0000
@@ -186,7 +186,7 @@
west_fill_accordion_dataset: 56,
west_fill_accordion_eventdataitem: 81,
west_fill_accordion_programindicator: 81,
- west_fill_accordion_period: 303,
+ west_fill_accordion_period: 310,
west_fill_accordion_organisationunit: 58,
west_fill_accordion_group: 31,
west_maxheight_accordion_indicator: 400,
@@ -300,8 +300,6 @@
return;
}
- config.id = config.id.replace('.', '#');
-
return config;
}();
};
@@ -1760,18 +1758,6 @@
}
}());
- // extend metadata
- (function() {
- for (var i = 0, id, splitId ; i < ids.length; i++) {
- id = ids[i];
-
- if (id.indexOf('#') !== -1) {
- splitId = id.split('#');
- response.metaData.names[id] = response.metaData.names[splitId[0]] + ' ' + response.metaData.names[splitId[1]];
- }
- }
- }());
-
// create value id map
(function() {
var valueHeaderIndex = response.nameHeaderMap[conf.finals.dimension.value.value].index,
@@ -2052,16 +2038,6 @@
items = Ext.clone(dimensionNameIdsMap[dimName]);
if (dimName === dx) {
- //for (var j = 0, index; j < items.length; j++) {
- //index = items[j].indexOf('#');
-
- //if (index > 0) {
- //addCategoryDimension = true;
- //items[j] = items[j].substr(0, index);
- //items[j] = items[j].replace('#', '.');
- //}
- //}
-
items = Ext.Array.unique(items);
}
@@ -2147,8 +2123,6 @@
direction = xLayout.sorting ? xLayout.sorting.direction : 'DESC',
layout;
- id = Ext.isString(id) ? id.replace('#', '') : id;
-
dim.ids = [];
// relative id?
@@ -2567,7 +2541,7 @@
uuids = [];
// meta data uid
- id = ((xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : '')).replace('#', '');
+ id = ((xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : ''));
// value html element id
uuid = Ext.data.IdGenerator.get('uuid').generate();
