Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18179 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Thu 2015-02-05 13:56:12 +0100
message:
Dashboard, improved validation.
modified:
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-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-02-05 12:34:16 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-02-05 12:55:33 +0000
@@ -4150,25 +4150,27 @@
createViewport = function() {
var el = Ext.get(ns.core.init.el),
- setFavorite,
centerRegion,
- width,
- height;
-
- if (!ns.skipFade && el) {
- var elBorderW = parseInt(el.getStyle('border-left-width')) + parseInt(el.getStyle('border-right-width')),
- elBorderH = parseInt(el.getStyle('border-top-width')) + parseInt(el.getStyle('border-bottom-width')),
- elPaddingW = parseInt(el.getStyle('padding-left')) + parseInt(el.getStyle('padding-right')),
- elPaddingH = parseInt(el.getStyle('padding-top')) + parseInt(el.getStyle('padding-bottom'));
-
- width = el.getWidth() - elBorderW - elPaddingW,
- height = el.getHeight() - elBorderH - elPaddingH;
+ elBorderW,
+ elBorderH,
+ elPaddingW,
+ elPaddingH,
+ width,
+ height;
+
+ if (el) {
+ elBorderW = parseInt(el.getStyle('border-left-width')) + parseInt(el.getStyle('border-right-width'));
+ elBorderH = parseInt(el.getStyle('border-top-width')) + parseInt(el.getStyle('border-bottom-width'));
+ elPaddingW = parseInt(el.getStyle('padding-left')) + parseInt(el.getStyle('padding-right'));
+ elPaddingH = parseInt(el.getStyle('padding-top')) + parseInt(el.getStyle('padding-bottom'));
+ width = el.getWidth() - elBorderW - elPaddingW;
+ height = el.getHeight() - elBorderH - elPaddingH;
}
centerRegion = Ext.create('Ext.panel.Panel', {
renderTo: el,
bodyStyle: 'border: 0 none',
- width: config.width || width || '100%',
+ width: config.width || width || '90%',
height: config.height || height || '50%',
layout: 'fit'
});
=== 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-02-05 12:34:16 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-02-05 12:55:33 +0000
@@ -4771,14 +4771,18 @@
createViewport = function() {
var el = Ext.get(ns.core.init.el),
centerRegion,
- elBorderW = parseInt(el.getStyle('border-left-width')) + parseInt(el.getStyle('border-right-width')),
- elBorderH = parseInt(el.getStyle('border-top-width')) + parseInt(el.getStyle('border-bottom-width')),
- elPaddingW = parseInt(el.getStyle('padding-left')) + parseInt(el.getStyle('padding-right')),
- elPaddingH = parseInt(el.getStyle('padding-top')) + parseInt(el.getStyle('padding-bottom')),
+ elBorderW,
+ elBorderH,
+ elPaddingW,
+ elPaddingH,
width,
height;
if (el) {
+ elBorderW = parseInt(el.getStyle('border-left-width')) + parseInt(el.getStyle('border-right-width'));
+ elBorderH = parseInt(el.getStyle('border-top-width')) + parseInt(el.getStyle('border-bottom-width'));
+ elPaddingW = parseInt(el.getStyle('padding-left')) + parseInt(el.getStyle('padding-right'));
+ elPaddingH = parseInt(el.getStyle('padding-top')) + parseInt(el.getStyle('padding-bottom'));
width = el.getWidth() - elBorderW - elPaddingW;
height = el.getHeight() - elBorderH - elPaddingH;
}
@@ -4786,8 +4790,8 @@
centerRegion = Ext.create('Ext.panel.Panel', {
renderTo: el,
bodyStyle: 'border: 0 none',
- width: config.width || width,
- height: config.height || height,
+ width: config.width || width || '90%',
+ height: config.height || height || '50%',
layout: 'fit'
});
_______________________________________________
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
