dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37379
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19131: ER EV sorting issue fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 19131 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-05-11 15:45:01 +0200
message:
ER EV sorting issue fixed.
modified:
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/eventchart.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/chart.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.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/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-05-08 01:43:17 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-05-11 13:04:51 +0000
@@ -1307,6 +1307,16 @@
return array;
};
+ support.prototype.array.deleteObjectKey = function(array, key) {
+ if (!(Ext.isArray(array) && Ext.isDefined(key))) {
+ return;
+ }
+
+ for (var i = 0; i < array.length; i++) {
+ delete array[i][key];
+ }
+ };
+
support.prototype.array.sortArrayByArray = function(array, reference, isNotDistinct) {
var tmp = [];
@@ -3132,9 +3142,19 @@
// sort order
if (xLayout.sortOrder) {
- var sortingKey = isStacked ? dataTotalKey : failSafeColumnIds[0];
-
- support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortingKey);
+ var valueKey = isStacked ? dataTotalKey : failSafeColumnIds[0],
+ sortKey = 'sorting_' + "sdklfjlsdkfjsdflk";
+
+ // create sort key
+ for (var ii = 0, rec; ii < data.length; ii++) {
+ rec = data[ii];
+ rec[sortKey] = rec[valueKey] === '0.0' ? null : rec[valueKey];
+ }
+
+ support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortKey, (xLayout.sortOrder === -1));
+
+ // remove sort key
+ support.prototype.array.deleteObjectKey(data, sortKey);
}
// trend lines
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-05-08 01:43:17 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-05-11 13:04:51 +0000
@@ -1390,6 +1390,16 @@
return array;
};
+ support.prototype.array.deleteObjectKey = function(array, key) {
+ if (!(Ext.isArray(array) && Ext.isDefined(key))) {
+ return;
+ }
+
+ for (var i = 0; i < array.length; i++) {
+ delete array[i][key];
+ }
+ };
+
support.prototype.array.sortArrayByArray = function(array, reference, isNotDistinct) {
var tmp = [];
@@ -3215,9 +3225,19 @@
// sort order
if (xLayout.sortOrder) {
- var sortingKey = isStacked ? dataTotalKey : failSafeColumnIds[0];
-
- support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortingKey);
+ var valueKey = isStacked ? dataTotalKey : failSafeColumnIds[0],
+ sortKey = 'sorting_' + "sdklfjlsdkfjsdflk";
+
+ // create sort key
+ for (var ii = 0, rec; ii < data.length; ii++) {
+ rec = data[ii];
+ rec[sortKey] = rec[valueKey] === '0.0' ? null : rec[valueKey];
+ }
+
+ support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortKey, (xLayout.sortOrder === -1));
+
+ // remove sort key
+ support.prototype.array.deleteObjectKey(data, sortKey);
}
// trend lines
=== 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-05-06 12:52:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-05-11 13:01:12 +0000
@@ -2500,7 +2500,7 @@
var xResponse,
html,
response = api.response.Response(Ext.decode(r.responseText));
-
+
if (!response) {
onFailure();
return;
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-05-07 11:43:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-05-11 13:01:12 +0000
@@ -1392,6 +1392,16 @@
return array;
};
+ support.prototype.array.deleteObjectKey = function(array, key) {
+ if (!(Ext.isArray(array) && Ext.isDefined(key))) {
+ return;
+ }
+
+ for (var i = 0; i < array.length; i++) {
+ delete array[i][key];
+ }
+ };
+
// object
support.prototype.object = {};
@@ -2557,9 +2567,19 @@
// sort order
if (xLayout.sortOrder) {
- var sortingKey = isStacked ? dataTotalKey : failSafeColumnIds[0];
-
- support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortingKey);
+ var valueKey = isStacked ? dataTotalKey : failSafeColumnIds[0],
+ sortKey = 'sorting_' + "sdklfjlsdkfjsdflk";
+
+ // create sort key
+ for (var ii = 0, rec; ii < data.length; ii++) {
+ rec = data[ii];
+ rec[sortKey] = rec[valueKey] === '0.0' ? null : rec[valueKey];
+ }
+
+ support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortKey, (xLayout.sortOrder === -1));
+
+ // remove sort key
+ support.prototype.array.deleteObjectKey(data, sortKey);
}
// trend lines
=== 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-05-07 11:43:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-05-11 13:01:12 +0000
@@ -1335,6 +1335,16 @@
return array;
};
+ support.prototype.array.deleteObjectKey = function(array, key) {
+ if (!(Ext.isArray(array) && Ext.isDefined(key))) {
+ return;
+ }
+
+ for (var i = 0; i < array.length; i++) {
+ delete array[i][key];
+ }
+ };
+
// object
support.prototype.object = {};
@@ -2500,9 +2510,19 @@
// sort order
if (xLayout.sortOrder) {
- var sortingKey = isStacked ? dataTotalKey : failSafeColumnIds[0];
-
- support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortingKey);
+ var valueKey = isStacked ? dataTotalKey : failSafeColumnIds[0],
+ sortKey = 'sorting_' + "sdklfjlsdkfjsdflk";
+
+ // create sort key
+ for (var ii = 0, rec; ii < data.length; ii++) {
+ rec = data[ii];
+ rec[sortKey] = rec[valueKey] === '0.0' ? null : rec[valueKey];
+ }
+
+ support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortKey, (xLayout.sortOrder === -1));
+
+ // remove sort key
+ support.prototype.array.deleteObjectKey(data, sortKey);
}
// trend lines
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js 2015-05-04 15:06:10 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js 2015-05-11 13:01:12 +0000
@@ -1392,6 +1392,16 @@
return array;
};
+ support.prototype.array.deleteObjectKey = function(array, key) {
+ if (!(Ext.isArray(array) && Ext.isDefined(key))) {
+ return;
+ }
+
+ for (var i = 0; i < array.length; i++) {
+ delete array[i][key];
+ }
+ };
+
// object
support.prototype.object = {};
@@ -2557,9 +2567,19 @@
// sort order
if (xLayout.sortOrder) {
- var sortingKey = isStacked ? dataTotalKey : failSafeColumnIds[0];
-
- support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortingKey);
+ var valueKey = isStacked ? dataTotalKey : failSafeColumnIds[0],
+ sortKey = 'sorting_' + "sdklfjlsdkfjsdflk";
+
+ // create sort key
+ for (var ii = 0, rec; ii < data.length; ii++) {
+ rec = data[ii];
+ rec[sortKey] = rec[valueKey] === '0.0' ? null : rec[valueKey];
+ }
+
+ support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortKey, (xLayout.sortOrder === -1));
+
+ // remove sort key
+ support.prototype.array.deleteObjectKey(data, sortKey);
}
// trend lines
@@ -4161,11 +4181,9 @@
web.message = web.message || {};
web.message.alert = function(text) {
- var div = Ext.get(init.el);
-
- if (div) {
- div.setStyle('opacity', 1);
- div.update('<div class="ns-plugin-alert">' + text + '</div>');
+ if (el) {
+ el.setStyle('opacity', 1);
+ el.update('<div class="ns-plugin-alert">' + text + '</div>');
}
};
@@ -4355,10 +4373,6 @@
ns.alert = web.message.alert;
init.el = config.el;
-
- //if (!ns.skipFade && el) {
- //el.setStyle('opacity', 0);
- //}
};
createViewport = function() {
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js 2015-05-08 01:43:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js 2015-05-11 13:44:29 +0000
@@ -1390,6 +1390,16 @@
return array;
};
+ support.prototype.array.deleteObjectKey = function(array, key) {
+ if (!(Ext.isArray(array) && Ext.isDefined(key))) {
+ return;
+ }
+
+ for (var i = 0; i < array.length; i++) {
+ delete array[i][key];
+ }
+ };
+
support.prototype.array.sortArrayByArray = function(array, reference, isNotDistinct) {
var tmp = [];
@@ -3215,9 +3225,19 @@
// sort order
if (xLayout.sortOrder) {
- var sortingKey = isStacked ? dataTotalKey : failSafeColumnIds[0];
-
- support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortingKey);
+ var valueKey = isStacked ? dataTotalKey : failSafeColumnIds[0],
+ sortKey = 'sorting_' + "sdklfjlsdkfjsdflk";
+
+ // create sort key
+ for (var ii = 0, rec; ii < data.length; ii++) {
+ rec = data[ii];
+ rec[sortKey] = rec[valueKey] === '0.0' ? null : rec[valueKey];
+ }
+
+ support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortKey, (xLayout.sortOrder === -1));
+
+ // remove sort key
+ support.prototype.array.deleteObjectKey(data, sortKey);
}
// trend lines
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-05-04 15:06:10 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-05-11 13:01:12 +0000
@@ -1392,6 +1392,16 @@
return array;
};
+ support.prototype.array.deleteObjectKey = function(array, key) {
+ if (!(Ext.isArray(array) && Ext.isDefined(key))) {
+ return;
+ }
+
+ for (var i = 0; i < array.length; i++) {
+ delete array[i][key];
+ }
+ };
+
// object
support.prototype.object = {};
@@ -2557,9 +2567,19 @@
// sort order
if (xLayout.sortOrder) {
- var sortingKey = isStacked ? dataTotalKey : failSafeColumnIds[0];
-
- support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortingKey);
+ var valueKey = isStacked ? dataTotalKey : failSafeColumnIds[0],
+ sortKey = 'sorting_' + "sdklfjlsdkfjsdflk";
+
+ // create sort key
+ for (var ii = 0, rec; ii < data.length; ii++) {
+ rec = data[ii];
+ rec[sortKey] = rec[valueKey] === '0.0' ? null : rec[valueKey];
+ }
+
+ support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortKey, (xLayout.sortOrder === -1));
+
+ // remove sort key
+ support.prototype.array.deleteObjectKey(data, sortKey);
}
// trend lines
@@ -4161,11 +4181,9 @@
web.message = web.message || {};
web.message.alert = function(text) {
- var div = Ext.get(init.el);
-
- if (div) {
- div.setStyle('opacity', 1);
- div.update('<div class="ns-plugin-alert">' + text + '</div>');
+ if (el) {
+ el.setStyle('opacity', 1);
+ el.update('<div class="ns-plugin-alert">' + text + '</div>');
}
};
@@ -4355,10 +4373,6 @@
ns.alert = web.message.alert;
init.el = config.el;
-
- //if (!ns.skipFade && el) {
- //el.setStyle('opacity', 0);
- //}
};
createViewport = function() {
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-05-08 01:40:43 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-05-11 13:44:29 +0000
@@ -1390,6 +1390,16 @@
return array;
};
+ support.prototype.array.deleteObjectKey = function(array, key) {
+ if (!(Ext.isArray(array) && Ext.isDefined(key))) {
+ return;
+ }
+
+ for (var i = 0; i < array.length; i++) {
+ delete array[i][key];
+ }
+ };
+
support.prototype.array.sortArrayByArray = function(array, reference, isNotDistinct) {
var tmp = [];
@@ -3215,9 +3225,19 @@
// sort order
if (xLayout.sortOrder) {
- var sortingKey = isStacked ? dataTotalKey : failSafeColumnIds[0];
-
- support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortingKey);
+ var valueKey = isStacked ? dataTotalKey : failSafeColumnIds[0],
+ sortKey = 'sorting_' + "sdklfjlsdkfjsdflk";
+
+ // create sort key
+ for (var ii = 0, rec; ii < data.length; ii++) {
+ rec = data[ii];
+ rec[sortKey] = rec[valueKey] === '0.0' ? null : rec[valueKey];
+ }
+
+ support.prototype.array.sort(data, xLayout.sortOrder === -1 ? 'ASC' : 'DESC', sortKey, (xLayout.sortOrder === -1));
+
+ // remove sort key
+ support.prototype.array.deleteObjectKey(data, sortKey);
}
// trend lines
