dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37424
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19153: DV EV plugin fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 19153 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-05-13 18:26:34 +0200
message:
DV EV plugin fixes.
modified:
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/chart.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/eventchart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-05-13 02:27:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-05-13 16:25:38 +0000
@@ -4080,10 +4080,10 @@
};
getDefaultChartSizeHandler = function() {
- var width = ns.app.centerRegion.getWidth(),
- height = ns.app.centerRegion.getHeight();
-
return function() {
+ var width = ns.app.centerRegion.getWidth(),
+ height = ns.app.centerRegion.getHeight();
+
this.animate = false;
this.setWidth(ns.dashboard ? width : width - 15);
this.setHeight(ns.dashboard ? height : height - 40);
=== 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-13 02:27:31 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-05-13 16:25:38 +0000
@@ -3334,10 +3334,10 @@
};
getDefaultChartSizeHandler = function() {
- var width = ns.app.centerRegion.getWidth(),
- height = ns.app.centerRegion.getHeight();
-
return function() {
+ var width = ns.app.centerRegion.getWidth(),
+ height = ns.app.centerRegion.getHeight();
+
this.animate = false;
this.setWidth(ns.dashboard ? width : width - 15);
this.setHeight(ns.dashboard ? height : height - 40);
=== 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-13 02:28:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js 2015-05-13 16:25:38 +0000
@@ -3334,10 +3334,10 @@
};
getDefaultChartSizeHandler = function() {
- var width = ns.app.centerRegion.getWidth(),
- height = ns.app.centerRegion.getHeight();
-
return function() {
+ var width = ns.app.centerRegion.getWidth(),
+ height = ns.app.centerRegion.getHeight();
+
this.animate = false;
this.setWidth(ns.dashboard ? width : width - 15);
this.setHeight(ns.dashboard ? height : height - 40);
@@ -4306,7 +4306,7 @@
chart;
success = function() {
-
+
ns.app.layout = layout;
ns.app.xLayout = xLayout;
ns.app.response = response;
=== 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-13 02:28:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js 2015-05-13 16:25:38 +0000
@@ -3672,7 +3672,7 @@
return getFormatedSeriesTitle(a);
};
-
+
getPieSeriesTitle = function(store) {
var a = [],
md = xResponse.metaData,
@@ -4080,10 +4080,10 @@
};
getDefaultChartSizeHandler = function() {
- var width = ns.app.centerRegion.getWidth(),
- height = ns.app.centerRegion.getHeight();
-
return function() {
+ var width = ns.app.centerRegion.getWidth(),
+ height = ns.app.centerRegion.getHeight();
+
this.animate = false;
this.setWidth(ns.dashboard ? width : width - 15);
this.setHeight(ns.dashboard ? height : height - 40);
@@ -5156,7 +5156,7 @@
console.log("app", ns.app);
}
};
-
+
getReport = function() {
if (!xLayout && !ns.skipMask) {
web.mask.hide(ns.app.centerRegion);
=== 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-13 02:27:31 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-05-13 16:25:38 +0000
@@ -3334,10 +3334,10 @@
};
getDefaultChartSizeHandler = function() {
- var width = ns.app.centerRegion.getWidth(),
- height = ns.app.centerRegion.getHeight();
-
return function() {
+ var width = ns.app.centerRegion.getWidth(),
+ height = ns.app.centerRegion.getHeight();
+
this.animate = false;
this.setWidth(ns.dashboard ? width : width - 15);
this.setHeight(ns.dashboard ? height : height - 40);
@@ -4306,7 +4306,7 @@
chart;
success = function() {
-
+
ns.app.layout = layout;
ns.app.xLayout = xLayout;
ns.app.response = response;
=== 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-13 02:27:31 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-05-13 16:25:38 +0000
@@ -3672,7 +3672,7 @@
return getFormatedSeriesTitle(a);
};
-
+
getPieSeriesTitle = function(store) {
var a = [],
md = xResponse.metaData,
@@ -4080,10 +4080,10 @@
};
getDefaultChartSizeHandler = function() {
- var width = ns.app.centerRegion.getWidth(),
- height = ns.app.centerRegion.getHeight();
-
return function() {
+ var width = ns.app.centerRegion.getWidth(),
+ height = ns.app.centerRegion.getHeight();
+
this.animate = false;
this.setWidth(ns.dashboard ? width : width - 15);
this.setHeight(ns.dashboard ? height : height - 40);
@@ -5156,7 +5156,7 @@
console.log("app", ns.app);
}
};
-
+
getReport = function() {
if (!xLayout && !ns.skipMask) {
web.mask.hide(ns.app.centerRegion);
