dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30864
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15697: PT DV GIS ER, startup request weakness fixed + ER, param bug fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 15697 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-06-16 13:39:36 +0200
message:
PT DV GIS ER, startup request weakness fixed + ER, param bug fixed.
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-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/plugin.js
dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js
dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/plugin.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.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/plugin.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin.html
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.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-06-07 14:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-06-12 11:37:11 +0000
@@ -6665,7 +6665,10 @@
org = organisationUnits[i];
ou.push(org.id);
- ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
}
init.user = {
=== 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-06-10 16:30:53 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/core.js 2014-06-16 11:35:09 +0000
@@ -1867,9 +1867,9 @@
if (dim.items) {
paramString += ':';
- for (var i = 0; i < dim.items.length; i++) {
- paramString += encodeURIComponent(dim.items[i].id);
- paramString += i < dim.items.length - 1 ? ';' : '';
+ for (var j = 0; j < dim.items.length; j++) {
+ paramString += encodeURIComponent(dim.items[j].id);
+ paramString += j < dim.items.length - 1 ? ';' : '';
}
}
else {
=== modified file 'dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/plugin.js 2014-03-31 17:44:03 +0000
+++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/plugin.js 2014-06-12 11:37:11 +0000
@@ -2634,12 +2634,33 @@
});
requests.push({
- url: url + '/api/organisationUnits.jsonp?userOnly=true&viewClass=detailed&links=false',
+ url: url + '/api/organisationUnits.jsonp?userOnly=true&viewClass=detailed&paging=false&links=false',
success: function(r) {
- var ou = r.organisationUnits[0];
- init.user.ou = ou.id;
- init.user.ouc = Ext.Array.pluck(ou.children, 'id');
- fn();
+ var organisationUnits = r.organisationUnits || [],
+ ou = [],
+ ouc = [];
+
+ if (organisationUnits.length) {
+ for (var i = 0, org; i < organisationUnits.length; i++) {
+ org = organisationUnits[i];
+
+ ou.push(org.id);
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
+ }
+
+ init.user = {
+ ou: ou,
+ ouc: ouc
+ }
+ }
+ else {
+ alert('User is not assigned to any organisation units');
+ }
+
+ fn();
}
});
=== modified file 'dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-06-10 16:30:53 +0000
+++ dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-06-12 11:37:11 +0000
@@ -6347,7 +6347,10 @@
org = organisationUnits[i];
ou.push(org.id);
- ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
}
init.user = {
=== modified file 'dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/plugin.js 2014-05-23 16:09:18 +0000
+++ dhis-2/dhis-web/dhis-web-event-visualizer/src/main/webapp/dhis-web-event-visualizer/app/scripts/plugin.js 2014-06-12 11:37:11 +0000
@@ -2634,12 +2634,33 @@
});
requests.push({
- url: url + '/api/organisationUnits.jsonp?userOnly=true&viewClass=detailed&links=false',
+ url: url + '/api/organisationUnits.jsonp?userOnly=true&viewClass=detailed&paging=false&links=false',
success: function(r) {
- var ou = r.organisationUnits[0];
- init.user.ou = ou.id;
- init.user.ouc = Ext.Array.pluck(ou.children, 'id');
- fn();
+ var organisationUnits = r.organisationUnits || [],
+ ou = [],
+ ouc = [];
+
+ if (organisationUnits.length) {
+ for (var i = 0, org; i < organisationUnits.length; i++) {
+ org = organisationUnits[i];
+
+ ou.push(org.id);
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
+ }
+
+ init.user = {
+ ou: ou,
+ ouc: ouc
+ }
+ }
+ else {
+ alert('User is not assigned to any organisation units');
+ }
+
+ fn();
}
});
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-06-07 14:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-06-12 11:37:11 +0000
@@ -8635,7 +8635,10 @@
org = organisationUnits[i];
ou.push(org.id);
- ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
}
init.user.ou = ou;
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js 2014-05-28 08:49:57 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js 2014-06-12 11:37:11 +0000
@@ -4663,12 +4663,33 @@
});
requests.push({
- url: url + '/api/organisationUnits.jsonp?userOnly=true&viewClass=detailed&links=false',
+ url: url + '/api/organisationUnits.jsonp?userOnly=true&viewClass=detailed&paging=false&links=false',
success: function(r) {
- var ou = r.organisationUnits[0];
- init.user.ou = ou.id;
- init.user.ouc = Ext.Array.pluck(ou.children, 'id');
- fn();
+ var organisationUnits = r.organisationUnits || [],
+ ou = [],
+ ouc = [];
+
+ if (organisationUnits.length) {
+ for (var i = 0, org; i < organisationUnits.length; i++) {
+ org = organisationUnits[i];
+
+ ou.push(org.id);
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
+ }
+
+ init.user = {
+ ou: ou,
+ ouc: ouc
+ }
+ }
+ else {
+ alert('User is not assigned to any organisation units');
+ }
+
+ fn();
}
});
=== modified file '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/app.js 2014-06-07 14:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-06-12 11:37:11 +0000
@@ -5880,7 +5880,10 @@
org = organisationUnits[i];
ou.push(org.id);
- ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
}
init.user = init.user || {};
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js 2014-05-28 08:49:57 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js 2014-06-12 11:37:11 +0000
@@ -2755,7 +2755,10 @@
org = organisationUnits[i];
ou.push(org.id);
- ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
}
init.user = {
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin.html'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin.html 2014-05-09 11:18:28 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/plugin.html 2014-06-16 11:35:09 +0000
@@ -20,30 +20,31 @@
DHIS.getChart({
url: url,
el: 'chart1',
- uid: 'R0DVGvXDUNP'
+ uid: 'BnEKy3SuouP'
});
- DHIS.getChart({
- url: url,
- el: 'chart2',
- type: 'column',
- columns: [
- {dimension: 'in', items: [{id: 'Uvn6LCg7dVU'}, {id: 'sB79w2hiLp8'}]}
- ],
- rows: [
- {dimension: 'pe', items: [{id: 'LAST_3_MONTHS'}]}
- ],
- filters: [
- {dimension: 'ou', items: [{id: 'USER_ORGUNIT'}]}
- ],
- //targetLineValue: 70
- //baseLineValue: 20,
- showTrendLine: true,
- hideLegend: true,
- //title: 'My chart title',
- domainAxisTitle: 'Periods',
- rangeAxisTitle: 'Percent'
- });
+ //DHIS.getChart({
+ //url: url,
+ //el: 'chart2',
+ //type: 'column',
+ //columns: [
+ //{dimension: 'in', items: [{id: 'Uvn6LCg7dVU'}, {id: 'sB79w2hiLp8'}]}
+ //],
+ //rows: [
+ //{dimension: 'pe', items: [{id: 'LAST_3_MONTHS'}]}
+ //],
+ //filters: [
+ //{dimension: 'ou', items: [{id: 'USER_ORGUNIT'}]}
+ //],
+ ////targetLineValue: 70
+ ////baseLineValue: 20,
+ //showTrendLine: true,
+ //hideLegend: true,
+ ////title: 'My chart title',
+ //domainAxisTitle: 'Periods',
+ //rangeAxisTitle: 'Percent',
+ //legendPosition: 'right'
+ //});
});
</script>
</head>
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-06-07 14:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-06-12 11:37:11 +0000
@@ -5535,7 +5535,10 @@
org = organisationUnits[i];
ou.push(org.id);
- ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
}
init.user = init.user || {};
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.js 2014-05-28 08:49:57 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.js 2014-06-12 11:37:11 +0000
@@ -396,6 +396,8 @@
// parentGraphMap: object
+ // legendPosition: string
+
getValidatedDimensionArray = function(dimensionArray) {
var dimensionArray = Ext.clone(dimensionArray);
@@ -631,6 +633,8 @@
layout.parentGraphMap = Ext.isObject(config.parentGraphMap) ? config.parentGraphMap : null;
+ layout.legendPosition = config.legendPosition && Ext.isString(config.legendPosition) ? config.legendPosition : null;
+
if (!validateSpecialCases()) {
return;
}
@@ -2177,7 +2181,8 @@
width,
isVertical = false,
position = 'top',
- padding = 0;
+ padding = 0,
+ positions = ['top', 'right', 'bottom', 'left'];
if (xLayout.type === conf.finals.chart.pie) {
numberOfItems = store.getCount();
@@ -2214,6 +2219,11 @@
padding = 5;
}
+ // position
+ if (Ext.Array.contains(positions, xLayout.legendPosition)) {
+ position = xLayout.legendPosition;
+ }
+
return Ext.create('Ext.chart.Legend', {
position: position,
isVertical: isVertical,
@@ -2794,7 +2804,10 @@
org = organisationUnits[i];
ou.push(org.id);
- ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+
+ if (org.children) {
+ ouc = Ext.Array.clean(ouc.concat(Ext.Array.pluck(org.children, 'id') || []));
+ }
}
init.user = {
