dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33065
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16835: ER EV respecting user defined order of options.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16835 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-09-26 18:55:28 +0200
message:
ER EV respecting user defined order of options.
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/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css
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
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css
--
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 2014-09-26 08:27:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-26 16:51:29 +0000
@@ -6263,7 +6263,7 @@
xLayout = getXLayout(layout);
xResponse = service.response.aggregate.getExtendedResponse(xLayout, response);
- xLayout = getSXLayout(xLayout, xResponse);
+ xLayout = getSXLayout(layout, xLayout, xResponse);
table = getHtml(xLayout, xResponse);
@@ -6275,7 +6275,7 @@
if (layout.sorting) {
xResponse = web.report.aggregate.sort(xLayout, xResponse, xColAxis);
- xLayout = getSXLayout(xLayout, xResponse);
+ xLayout = getSXLayout(layout, xLayout, xResponse);
table = getHtml(xLayout, xResponse);
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2014-09-24 11:56:28 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2014-09-26 16:51:29 +0000
@@ -1115,10 +1115,11 @@
return xLayout;
};
- service.layout.getSyncronizedXLayout = function(xLayout, xResponse) {
+ service.layout.getSyncronizedXLayout = function(layout, xLayout, xResponse) {
var removeDimensionFromXLayout,
getHeaderNames,
- dimensions = Ext.Array.clean([].concat(xLayout.columns || [], xLayout.rows || [], xLayout.filters || []));
+ dimensions = Ext.Array.clean([].concat(xLayout.columns || [], xLayout.rows || [], xLayout.filters || [])),
+ originalDimensions = Ext.Array.clean([].concat(layout.columns || [], layout.rows || [], layout.filters || []));
removeDimensionFromXLayout = function(objectName) {
var getUpdatedAxis;
@@ -1162,7 +1163,7 @@
};
return function() {
-
+
// items
for (var i = 0, dim, header; i < dimensions.length; i++) {
dim = dimensions[i];
@@ -1181,6 +1182,47 @@
}
}
+ // restore order for options
+ for (var i = 0, orgDim; i < originalDimensions.length; i++) {
+ orgDim = originalDimensions[i];
+
+ // if sorting and row dim, dont restore order
+ if (layout.sorting && Ext.Array.contains(xLayout.rowDimensionNames, orgDim.dimension)) {
+ continue;
+ }
+
+ if (Ext.isString(orgDim.filter)) {
+ var a = orgDim.filter.split(':');
+
+ if (a[0] === 'IN' && a.length > 1 && Ext.isString(a[1])) {
+ var options = a[1].split(';'),
+ items = [];
+
+ for (var j = 0, dim; j < dimensions.length; j++) {
+ dim = dimensions[j];
+
+ if (dim.dimension === orgDim.dimension && dim.items && dim.items.length) {
+ var items = [];
+
+ for (var k = 0, option; k < options.length; k++) {
+ option = options[k];
+
+ for (var l = 0, item; l < dim.items.length; l++) {
+ item = dim.items[l];
+
+ if (item.name === option) {
+ items.push(item);
+ }
+ }
+ }
+
+ dim.items = items;
+ }
+ }
+ }
+ }
+ }
+
// Re-layout
layout = api.layout.Layout(xLayout);
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2014-09-09 11:36:58 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css 2014-09-26 16:14:03 +0000
@@ -247,7 +247,7 @@
}
.pivot-dim-label {
- background-color: #f7f9fD;
+ background-color: #f2f6fc;
white-space: nowrap;
text-align: center;
}
=== 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 2014-09-26 08:17:21 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-26 16:14:03 +0000
@@ -5839,7 +5839,7 @@
xLayout = getXLayout(layout);
xResponse = service.response.aggregate.getExtendedResponse(xLayout, response);
- xLayout = getSXLayout(xLayout, xResponse);
+ xLayout = getSXLayout(layout, xLayout, xResponse);
if (!xLayout) {
web.mask.hide(ns.app.centerRegion);
=== 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 2014-09-01 13:00:53 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2014-09-26 16:14:03 +0000
@@ -1193,10 +1193,11 @@
return xLayout;
};
- service.layout.getSyncronizedXLayout = function(xLayout, xResponse) {
+ service.layout.getSyncronizedXLayout = function(layout, xLayout, xResponse) {
var removeDimensionFromXLayout,
getHeaderNames,
dimensions = Ext.Array.clean([].concat(xLayout.columns || [], xLayout.rows || [], xLayout.filters || [])),
+ originalDimensions = Ext.Array.clean([].concat(layout.columns || [], layout.rows || [], layout.filters || [])),
getSeriesValidatedLayout,
layout;
@@ -1274,6 +1275,42 @@
}
}
+ // restore order for options
+ for (var i = 0, orgDim; i < originalDimensions.length; i++) {
+ orgDim = originalDimensions[i];
+
+ if (Ext.isString(orgDim.filter)) {
+ var a = orgDim.filter.split(':');
+
+ if (a[0] === 'IN' && a.length > 1 && Ext.isString(a[1])) {
+ var options = a[1].split(';'),
+ items = [];
+
+ for (var j = 0, dim; j < dimensions.length; j++) {
+ dim = dimensions[j];
+
+ if (dim.dimension === orgDim.dimension && dim.items && dim.items.length) {
+ var items = [];
+
+ for (var k = 0, option; k < options.length; k++) {
+ option = options[k];
+
+ for (var l = 0, item; l < dim.items.length; l++) {
+ item = dim.items[l];
+
+ if (item.name === option) {
+ items.push(item);
+ }
+ }
+ }
+
+ dim.items = items;
+ }
+ }
+ }
+ }
+ }
+
// Re-layout
layout = api.layout.Layout(xLayout);
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css 2014-09-09 12:01:30 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css 2014-09-26 16:14:03 +0000
@@ -218,7 +218,7 @@
}
.pivot-dim-label {
- background-color: #f7f9fD;
+ background-color: #f2f6fc;
white-space: nowrap;
text-align: center;
}
