[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15130: PT ER, pivot performance improvement.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 15130 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-05-01 12:46:34 +0200
message:
PT ER, pivot performance improvement.
modified:
dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js
dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/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-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-04-22 14:48:02 +
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-05-01 10:44:27 +
@@ -5816,6 +5816,9 @@
web.mask.hide(ns.app.centerRegion);
if (NS.isDebug) {
+var res = response || xResponse;
+
+console.log(Number of records, res.rows.length);
console.log(Number of cells, table.tdCount);
console.log(DATA, (ns.app.dateCreate - ns.app.dateData) / 1000);
console.log(CREATE, (ns.app.dateRender - ns.app.dateCreate) / 1000);
=== modified file 'dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js 2014-04-22 14:48:02 +
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js 2014-05-01 10:44:27 +
@@ -1349,12 +1349,12 @@
// add parents if more than 1 floor
if (nAxisHeight 1) {
- for (var i = 1, allFloor; i nAxisHeight; i++) {
- allFloor = aaAllFloorObjects[i];
+ for (var i = 1, aAllFloor; i nAxisHeight; i++) {
+ aAllFloor = aaAllFloorObjects[i];
- //for (var j = 0, obj, doorCount = 0, span = aFloorSpan[i - 1], parentObj = aaAllFloorObjects[i - 1][0]; j allFloor.length; j++) {
- for (var j = 0, doorCount = 0, span = aFloorSpan[i - 1]; j allFloor.length; j++) {
- allFloor[j].parent = aaAllFloorObjects[i - 1][j];
+ //for (var j = 0, obj, doorCount = 0, span = aFloorSpan[i - 1], parentObj = aaAllFloorObjects[i - 1][0]; j aAllFloor.length; j++) {
+ for (var j = 0, doorCount = 0, span = aFloorSpan[i - 1]; j aAllFloor.length; j++) {
+ aAllFloor[j].parent = aaAllFloorObjects[i - 1][j];
//doorCount++;
@@ -1370,11 +1370,11 @@
if (aaAllFloorObjects.length) {
// set span to second lowest span number: if aFloorSpan == [15,3,15,1], set span to 3
- var span = nAxisHeight 1 ? support.prototype.array.sort(Ext.clone(aFloorSpan))[1] : nAxisWidth,
- allFloorObjectsLast = aaAllFloorObjects[aaAllFloorObjects.length - 1];
+ var nSpan = nAxisHeight 1 ? support.prototype.array.sort(Ext.clone(aFloorSpan))[1] : nAxisWidth,
+ aAllFloorObjectsLast = aaAllFloorObjects[aaAllFloorObjects.length - 1];
- for (var i = 0, leaf, parentUuids, obj, leafUuids = []; i allFloorObjectsLast.length; i++) {
- leaf = allFloorObjectsLast[i];
+ for (var i = 0, leaf, parentUuids, obj, leafUuids = []; i aAllFloorObjectsLast.length; i++) {
+ leaf = aAllFloorObjectsLast[i];
leafUuids.push(leaf.uuid);
parentUuids = [];
obj = leaf;
@@ -1389,9 +1389,9 @@
leaf.uuids = Ext.clone(parentUuids);
// add uuid for all leaves
- if (leafUuids.length === span) {
- for (var j = (i - span) + 1, leaf; j = i; j++) {
-leaf = allFloorObjectsLast[j];
+ if (leafUuids.length === nSpan) {
+ for (var j = (i - nSpan) + 1, leaf; j = i; j++) {
+leaf = aAllFloorObjectsLast[j];
leaf.uuids = leaf.uuids.concat(Ext.clone(leafUuids));
}
@@ -2072,23 +2072,6 @@
doSubTotals = function(xAxis) {
return !!xLayout.showSubTotals xAxis xAxis.dims 1;
-
- //var multiItemDimension = 0,
- //unique;
-
- //if (!(xLayout.showSubTotals xAxis xAxis.dims 1)) {
- //return false;
- //}
-
- //unique = xAxis.xItems.unique;
-
- //for (var i = 0; i unique.length; i++) {
- //if (unique[i].length 1) {
- //multiItemDimension++;
- //}
- //}
-
- //return (multiItemDimension 1);
};
doTotals = function() {
@@ -2245,7 +2228,7 @@
// [ dim, dim ] ];
// value
- for
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 15131: Minor fix.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 15131 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-05-01 13:04:12 +0200
message:
Minor fix.
modified:
dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/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-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js 2014-05-01 10:44:27 +
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js 2014-05-01 11:03:40 +
@@ -2656,7 +2656,7 @@
// get html
return function() {
- var htmlArray = Ext.Array.clean([].concat(getColAxisHtmlArray() || [], getRowHtmlArray() || [], getTotalHtmlArray() || []));
+ htmlArray = Ext.Array.clean([].concat(getColAxisHtmlArray() || [], getRowHtmlArray() || [], getTotalHtmlArray() || []));
return {
html: getHtml(htmlArray),
___
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
[Dhis2-devs] [Bug 1315023] [NEW] manual aggregate query preview error
Public bug reported: This is an update on the manual aggregation error using version 2.15 build 14986. When I run Manual Aggregation using the Preview Option. Saving all values returns Data value is not valid (below). This results in $Value written to my aggregate data fields. INFO 2014-05-01 15:29:07,531 Data value is not valid: value_not_zero_or_positive_integer (DefaultDataValueService.java [http- apr-8080-exec-9] I tried with the same parameters without the preview and used Aggregate and Save directly. This works fine. Thinking their might be something wrong with Preview module. Just in case anyone else is facing a similar problem, a quick workaround is to ditch the preview (although you can use this to view data values to be saved) and use the Aggregate and Save route instead until it's fixed. Best regards, Busoye ** Affects: dhis2 Importance: Undecided Status: New ** Description changed: This is an update on the manual aggregation error using version 2.15 build 14986. When I run Manual Aggregation using the Preview Option. Saving all - values returns Data value is not valid (below) + values returns Data value is not valid (below). This results in $Value + written to my aggregate data fields. + INFO 2014-05-01 15:29:07,531 Data value is not valid: + value_not_zero_or_positive_integer (DefaultDataValueService.java [http- + apr-8080-exec-9] - INFO 2014-05-01 15:29:07,531 Data value is not valid: value_not_zero_or_positive_integer (DefaultDataValueService.java [http-apr-8080-exec-9] - - - I tried with the same parameters without the preview and used Aggregate and Save directly. This works fine. Thinking their might be something wrong with Preview module. Just in case anyone else is facing a similar problem, a quick workaround is to ditch the preview (although you can use this to view data values to be saved) and use the Aggregate and Save route instead until it's fixed. + I tried with the same parameters without the preview and used Aggregate + and Save directly. This works fine. Thinking their might be something + wrong with Preview module. Just in case anyone else is facing a similar + problem, a quick workaround is to ditch the preview (although you can + use this to view data values to be saved) and use the Aggregate and Save + route instead until it's fixed. Best regards, Busoye -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1315023 Title: manual aggregate query preview error Status in DHIS 2: New Bug description: This is an update on the manual aggregation error using version 2.15 build 14986. When I run Manual Aggregation using the Preview Option. Saving all values returns Data value is not valid (below). This results in $Value written to my aggregate data fields. INFO 2014-05-01 15:29:07,531 Data value is not valid: value_not_zero_or_positive_integer (DefaultDataValueService.java [http-apr-8080-exec-9] I tried with the same parameters without the preview and used Aggregate and Save directly. This works fine. Thinking their might be something wrong with Preview module. Just in case anyone else is facing a similar problem, a quick workaround is to ditch the preview (although you can use this to view data values to be saved) and use the Aggregate and Save route instead until it's fixed. Best regards, Busoye To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1315023/+subscriptions ___ 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
[Dhis2-devs] [DHIS2 Indicators] TRUNC function for Converting Numbers with Decimals to Integers.
Hi, Can anyone advise on how to get the equivalent of the TRUNC function in Excel in DHIS2 indicators? We have defined indicators for estimating population but have to contend decimals which is not ideal. This function to convert numbers to integers would be quite neat. Thanks Busoye Version 2.15 Build: 14986 ___ 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
