dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37413
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19144: DV EV plugin fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 19144 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-05-13 04:01:28 +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/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/eventchart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-05-13 00:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-05-13 02:00:49 +0000
@@ -5166,19 +5166,19 @@
chart = web.report.aggregate.createChart(layout, xLayout, xResponse, ns.app.centerRegion);
// fade
- if (!ns.skipFade) {
- chart.on('afterrender', function() {
- Ext.defer( function() {
- var el = Ext.get(init.el);
+ //if (!ns.skipFade) {
+ //chart.on('afterrender', function() {
+ //Ext.defer( function() {
+ //var el = Ext.get(init.el);
- if (el) {
- el.fadeIn({
- duration: 400
- });
- }
- }, 300 );
- });
- }
+ //if (el) {
+ //el.fadeIn({
+ //duration: 400
+ //});
+ //}
+ //}, 300 );
+ //});
+ //}
ns.app.centerRegion.removeAll();
ns.app.centerRegion.add(chart);
=== 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-11 13:01:12 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-05-13 02:00:49 +0000
@@ -2532,7 +2532,7 @@
fn = function() {
// create chart
- ns.app.chart = ns.core.web.chart.createChart(ns, legendSet);
+ ns.app.chart = ns.core.web.chart.createChart(xLayout, xResponse, legendSet);
// update viewport
ns.app.centerRegion.update();
=== 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 00:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-05-13 02:00:49 +0000
@@ -2458,10 +2458,8 @@
// chart
web.chart = {};
- web.chart.createChart = function(ns, legendSet) {
- var xLayout = ns.app.xLayout,
- xResponse = ns.app.xResponse,
- columnIds = xLayout.columnDimensionNames[0] ? xLayout.dimensionNameIdsMap[xLayout.columnDimensionNames[0]] : [],
+ web.chart.createChart = function(xLayout, xResponse, legendSet) {
+ var columnIds = xLayout.columnDimensionNames[0] ? xLayout.dimensionNameIdsMap[xLayout.columnDimensionNames[0]] : [],
failSafeColumnIds = [],
failSafeColumnIdMap = {},
createFailSafeColumnIds = function() {
@@ -4322,7 +4320,7 @@
getReport = function() {
// create chart
- chart = ns.core.web.chart.createChart(ns, legendSet);
+ chart = ns.core.web.chart.createChart(xLayout, xResponse, legendSet);
// fade
//if (!ns.skipFade) {
@@ -4341,7 +4339,7 @@
// update viewport
ns.app.centerRegion.removeAll();
- ns.app.centerRegion.add(ns.app.chart);
+ ns.app.centerRegion.add(chart);
success();
};
@@ -4382,9 +4380,6 @@
getReport();
}
}
-
-
-
};
// ns
=== 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-12 12:01:58 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-05-13 02:00:49 +0000
@@ -2401,10 +2401,8 @@
// chart
web.chart = {};
- web.chart.createChart = function(ns, legendSet) {
- var xLayout = ns.app.xLayout,
- xResponse = ns.app.xResponse,
- columnIds = xLayout.columnDimensionNames[0] ? xLayout.dimensionNameIdsMap[xLayout.columnDimensionNames[0]] : [],
+ web.chart.createChart = function(xLayout, xResponse, legendSet) {
+ var columnIds = xLayout.columnDimensionNames[0] ? xLayout.dimensionNameIdsMap[xLayout.columnDimensionNames[0]] : [],
failSafeColumnIds = [],
failSafeColumnIdMap = {},
createFailSafeColumnIds = function() {
=== 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 00:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js 2015-05-13 02:00:49 +0000
@@ -2458,10 +2458,8 @@
// chart
web.chart = {};
- web.chart.createChart = function(ns, legendSet) {
- var xLayout = ns.app.xLayout,
- xResponse = ns.app.xResponse,
- columnIds = xLayout.columnDimensionNames[0] ? xLayout.dimensionNameIdsMap[xLayout.columnDimensionNames[0]] : [],
+ web.chart.createChart = function(xLayout, xResponse, legendSet) {
+ var columnIds = xLayout.columnDimensionNames[0] ? xLayout.dimensionNameIdsMap[xLayout.columnDimensionNames[0]] : [],
failSafeColumnIds = [],
failSafeColumnIdMap = {},
createFailSafeColumnIds = function() {
@@ -4322,7 +4320,7 @@
getReport = function() {
// create chart
- chart = ns.core.web.chart.createChart(ns, legendSet);
+ chart = ns.core.web.chart.createChart(xLayout, xResponse, legendSet);
// fade
//if (!ns.skipFade) {
@@ -4341,7 +4339,7 @@
// update viewport
ns.app.centerRegion.removeAll();
- ns.app.centerRegion.add(ns.app.chart);
+ ns.app.centerRegion.add(chart);
success();
};
@@ -4382,9 +4380,6 @@
getReport();
}
}
-
-
-
};
// ns
=== 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 00:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js 2015-05-13 02:00:49 +0000
@@ -5166,19 +5166,19 @@
chart = web.report.aggregate.createChart(layout, xLayout, xResponse, ns.app.centerRegion);
// fade
- if (!ns.skipFade) {
- chart.on('afterrender', function() {
- Ext.defer( function() {
- var el = Ext.get(init.el);
+ //if (!ns.skipFade) {
+ //chart.on('afterrender', function() {
+ //Ext.defer( function() {
+ //var el = Ext.get(init.el);
- if (el) {
- el.fadeIn({
- duration: 400
- });
- }
- }, 300 );
- });
- }
+ //if (el) {
+ //el.fadeIn({
+ //duration: 400
+ //});
+ //}
+ //}, 300 );
+ //});
+ //}
ns.app.centerRegion.removeAll();
ns.app.centerRegion.add(chart);
=== 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 00:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-05-13 02:00:49 +0000
@@ -2458,10 +2458,8 @@
// chart
web.chart = {};
- web.chart.createChart = function(ns, legendSet) {
- var xLayout = ns.app.xLayout,
- xResponse = ns.app.xResponse,
- columnIds = xLayout.columnDimensionNames[0] ? xLayout.dimensionNameIdsMap[xLayout.columnDimensionNames[0]] : [],
+ web.chart.createChart = function(xLayout, xResponse, legendSet) {
+ var columnIds = xLayout.columnDimensionNames[0] ? xLayout.dimensionNameIdsMap[xLayout.columnDimensionNames[0]] : [],
failSafeColumnIds = [],
failSafeColumnIdMap = {},
createFailSafeColumnIds = function() {
@@ -4322,7 +4320,7 @@
getReport = function() {
// create chart
- chart = ns.core.web.chart.createChart(ns, legendSet);
+ chart = ns.core.web.chart.createChart(xLayout, xResponse, legendSet);
// fade
//if (!ns.skipFade) {
@@ -4341,7 +4339,7 @@
// update viewport
ns.app.centerRegion.removeAll();
- ns.app.centerRegion.add(ns.app.chart);
+ ns.app.centerRegion.add(chart);
success();
};
@@ -4382,9 +4380,6 @@
getReport();
}
}
-
-
-
};
// ns
=== 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 00:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-05-13 02:00:49 +0000
@@ -5166,19 +5166,19 @@
chart = web.report.aggregate.createChart(layout, xLayout, xResponse, ns.app.centerRegion);
// fade
- if (!ns.skipFade) {
- chart.on('afterrender', function() {
- Ext.defer( function() {
- var el = Ext.get(init.el);
+ //if (!ns.skipFade) {
+ //chart.on('afterrender', function() {
+ //Ext.defer( function() {
+ //var el = Ext.get(init.el);
- if (el) {
- el.fadeIn({
- duration: 400
- });
- }
- }, 300 );
- });
- }
+ //if (el) {
+ //el.fadeIn({
+ //duration: 400
+ //});
+ //}
+ //}, 300 );
+ //});
+ //}
ns.app.centerRegion.removeAll();
ns.app.centerRegion.add(chart);
