dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37414
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19145: DV EV plugin fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 19145 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-05-13 04:20:21 +0200
message:
DV EV plugin fixes.
modified:
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-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.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-visualizer/scripts/chart.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-05-13 02:00:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-05-13 02:19:56 +0000
@@ -2986,50 +2986,59 @@
};
getDefaultSeriesTitle = function(store) {
- var a = [];
+ var a = [],
+ ls = Ext.isObject(xLayout.legendStyle) ? xLayout.legendStyle : null;
- if (Ext.isObject(xLayout.legendStyle) && Ext.isArray(xLayout.legendStyle.labelNames)) {
- return xLayout.legendStyle.labelNames;
+ if (ls && Ext.isArray(ls.labelNames)) {
+ return ls.labelNames;
}
else {
for (var i = 0, id, name, mxl, ids; i < store.rangeFields.length; i++) {
id = failSafeColumnIdMap[store.rangeFields[i]];
name = xResponse.metaData.names[id];
- //if (Ext.isString(name) && Ext.isObject(xLayout.legendStyle) && Ext.isNumber(xLayout.legendStyle.labelMaxLength)) {
- //var mxl = parseInt(xLayout.legendStyle.labelMaxLength);
+ if (ls && ls.labelMaxLength) {
+ var mxl = parseInt(ls.labelMaxLength);
- //name = name.length > mxl ? name.substr(0, mxl) + '..' : name;
- //}
+ if (Ext.isNumber(mxl) && name.length > mxl) {
+ name = name.substr(0, mxl) + '..';
+ }
+ }
a.push(name);
}
}
- return getFormatedSeriesTitle(a);
+ return ns.dashboard ? getFormatedSeriesTitle(a) : a;
};
getPieSeriesTitle = function(store) {
- var a = [];
+ var a = [],
+ ls = Ext.isObject(xLayout.legendStyle) ? xLayout.legendStyle : null;
- if (Ext.isObject(xLayout.legendStyle) && Ext.isArray(xLayout.legendStyle.labelNames)) {
- return xLayout.legendStyle.labelNames;
+ if (ls && Ext.isArray(ls.labelNames)) {
+ return ls.labelNames;
}
else {
- var id = store.domainFields[0];
+ var id = store.domainFields[0],
+ name;
store.each( function(r) {
- a.push(r.data[id]);
-
- //if (Ext.isString(name) && Ext.isObject(xLayout.legendStyle) && Ext.isNumber(xLayout.legendStyle.labelMaxLength)) {
- //var mxl = parseInt(xLayout.legendStyle.labelMaxLength);
-
- //name = name.length > mxl ? name.substr(0, mxl) + '..' : name;
- //}
+ name = r.data[id];
+
+ if (ls && ls.labelMaxLength) {
+ var mxl = parseInt(ls.labelMaxLength);
+
+ if (Ext.isNumber(mxl) && name.length > mxl) {
+ name = name.substr(0, mxl) + '..';
+ }
+ }
+
+ a.push(name);
});
}
- return getFormatedSeriesTitle(a);
+ return ns.dashboard ? getFormatedSeriesTitle(a) : a;
};
getDefaultSeries = function(store) {
=== 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-13 02:00:49 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-05-13 02:19:56 +0000
@@ -2929,50 +2929,59 @@
};
getDefaultSeriesTitle = function(store) {
- var a = [];
+ var a = [],
+ ls = Ext.isObject(xLayout.legendStyle) ? xLayout.legendStyle : null;
- if (Ext.isObject(xLayout.legendStyle) && Ext.isArray(xLayout.legendStyle.labelNames)) {
- return xLayout.legendStyle.labelNames;
+ if (ls && Ext.isArray(ls.labelNames)) {
+ return ls.labelNames;
}
else {
for (var i = 0, id, name, mxl, ids; i < store.rangeFields.length; i++) {
id = failSafeColumnIdMap[store.rangeFields[i]];
name = xResponse.metaData.names[id];
- //if (Ext.isString(name) && Ext.isObject(xLayout.legendStyle) && Ext.isNumber(xLayout.legendStyle.labelMaxLength)) {
- //var mxl = parseInt(xLayout.legendStyle.labelMaxLength);
+ if (ls && ls.labelMaxLength) {
+ var mxl = parseInt(ls.labelMaxLength);
- //name = name.length > mxl ? name.substr(0, mxl) + '..' : name;
- //}
+ if (Ext.isNumber(mxl) && name.length > mxl) {
+ name = name.substr(0, mxl) + '..';
+ }
+ }
a.push(name);
}
}
- return getFormatedSeriesTitle(a);
+ return ns.dashboard ? getFormatedSeriesTitle(a) : a;
};
getPieSeriesTitle = function(store) {
- var a = [];
+ var a = [],
+ ls = Ext.isObject(xLayout.legendStyle) ? xLayout.legendStyle : null;
- if (Ext.isObject(xLayout.legendStyle) && Ext.isArray(xLayout.legendStyle.labelNames)) {
- return xLayout.legendStyle.labelNames;
+ if (ls && Ext.isArray(ls.labelNames)) {
+ return ls.labelNames;
}
else {
- var id = store.domainFields[0];
+ var id = store.domainFields[0],
+ name;
store.each( function(r) {
- a.push(r.data[id]);
-
- //if (Ext.isString(name) && Ext.isObject(xLayout.legendStyle) && Ext.isNumber(xLayout.legendStyle.labelMaxLength)) {
- //var mxl = parseInt(xLayout.legendStyle.labelMaxLength);
-
- //name = name.length > mxl ? name.substr(0, mxl) + '..' : name;
- //}
+ name = r.data[id];
+
+ if (ls && ls.labelMaxLength) {
+ var mxl = parseInt(ls.labelMaxLength);
+
+ if (Ext.isNumber(mxl) && name.length > mxl) {
+ name = name.substr(0, mxl) + '..';
+ }
+ }
+
+ a.push(name);
});
}
- return getFormatedSeriesTitle(a);
+ return ns.dashboard ? getFormatedSeriesTitle(a) : a;
};
getDefaultSeries = function(store) {
=== 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:00:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js 2015-05-13 02:19:56 +0000
@@ -2986,50 +2986,59 @@
};
getDefaultSeriesTitle = function(store) {
- var a = [];
+ var a = [],
+ ls = Ext.isObject(xLayout.legendStyle) ? xLayout.legendStyle : null;
- if (Ext.isObject(xLayout.legendStyle) && Ext.isArray(xLayout.legendStyle.labelNames)) {
- return xLayout.legendStyle.labelNames;
+ if (ls && Ext.isArray(ls.labelNames)) {
+ return ls.labelNames;
}
else {
for (var i = 0, id, name, mxl, ids; i < store.rangeFields.length; i++) {
id = failSafeColumnIdMap[store.rangeFields[i]];
name = xResponse.metaData.names[id];
- //if (Ext.isString(name) && Ext.isObject(xLayout.legendStyle) && Ext.isNumber(xLayout.legendStyle.labelMaxLength)) {
- //var mxl = parseInt(xLayout.legendStyle.labelMaxLength);
+ if (ls && ls.labelMaxLength) {
+ var mxl = parseInt(ls.labelMaxLength);
- //name = name.length > mxl ? name.substr(0, mxl) + '..' : name;
- //}
+ if (Ext.isNumber(mxl) && name.length > mxl) {
+ name = name.substr(0, mxl) + '..';
+ }
+ }
a.push(name);
}
}
- return getFormatedSeriesTitle(a);
+ return ns.dashboard ? getFormatedSeriesTitle(a) : a;
};
getPieSeriesTitle = function(store) {
- var a = [];
+ var a = [],
+ ls = Ext.isObject(xLayout.legendStyle) ? xLayout.legendStyle : null;
- if (Ext.isObject(xLayout.legendStyle) && Ext.isArray(xLayout.legendStyle.labelNames)) {
- return xLayout.legendStyle.labelNames;
+ if (ls && Ext.isArray(ls.labelNames)) {
+ return ls.labelNames;
}
else {
- var id = store.domainFields[0];
+ var id = store.domainFields[0],
+ name;
store.each( function(r) {
- a.push(r.data[id]);
-
- //if (Ext.isString(name) && Ext.isObject(xLayout.legendStyle) && Ext.isNumber(xLayout.legendStyle.labelMaxLength)) {
- //var mxl = parseInt(xLayout.legendStyle.labelMaxLength);
-
- //name = name.length > mxl ? name.substr(0, mxl) + '..' : name;
- //}
+ name = r.data[id];
+
+ if (ls && ls.labelMaxLength) {
+ var mxl = parseInt(ls.labelMaxLength);
+
+ if (Ext.isNumber(mxl) && name.length > mxl) {
+ name = name.substr(0, mxl) + '..';
+ }
+ }
+
+ a.push(name);
});
}
- return getFormatedSeriesTitle(a);
+ return ns.dashboard ? getFormatedSeriesTitle(a) : a;
};
getDefaultSeries = function(store) {
=== 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:00:49 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-05-13 02:19:56 +0000
@@ -2986,50 +2986,59 @@
};
getDefaultSeriesTitle = function(store) {
- var a = [];
+ var a = [],
+ ls = Ext.isObject(xLayout.legendStyle) ? xLayout.legendStyle : null;
- if (Ext.isObject(xLayout.legendStyle) && Ext.isArray(xLayout.legendStyle.labelNames)) {
- return xLayout.legendStyle.labelNames;
+ if (ls && Ext.isArray(ls.labelNames)) {
+ return ls.labelNames;
}
else {
for (var i = 0, id, name, mxl, ids; i < store.rangeFields.length; i++) {
id = failSafeColumnIdMap[store.rangeFields[i]];
name = xResponse.metaData.names[id];
- //if (Ext.isString(name) && Ext.isObject(xLayout.legendStyle) && Ext.isNumber(xLayout.legendStyle.labelMaxLength)) {
- //var mxl = parseInt(xLayout.legendStyle.labelMaxLength);
+ if (ls && ls.labelMaxLength) {
+ var mxl = parseInt(ls.labelMaxLength);
- //name = name.length > mxl ? name.substr(0, mxl) + '..' : name;
- //}
+ if (Ext.isNumber(mxl) && name.length > mxl) {
+ name = name.substr(0, mxl) + '..';
+ }
+ }
a.push(name);
}
}
- return getFormatedSeriesTitle(a);
+ return ns.dashboard ? getFormatedSeriesTitle(a) : a;
};
getPieSeriesTitle = function(store) {
- var a = [];
+ var a = [],
+ ls = Ext.isObject(xLayout.legendStyle) ? xLayout.legendStyle : null;
- if (Ext.isObject(xLayout.legendStyle) && Ext.isArray(xLayout.legendStyle.labelNames)) {
- return xLayout.legendStyle.labelNames;
+ if (ls && Ext.isArray(ls.labelNames)) {
+ return ls.labelNames;
}
else {
- var id = store.domainFields[0];
+ var id = store.domainFields[0],
+ name;
store.each( function(r) {
- a.push(r.data[id]);
-
- //if (Ext.isString(name) && Ext.isObject(xLayout.legendStyle) && Ext.isNumber(xLayout.legendStyle.labelMaxLength)) {
- //var mxl = parseInt(xLayout.legendStyle.labelMaxLength);
-
- //name = name.length > mxl ? name.substr(0, mxl) + '..' : name;
- //}
+ name = r.data[id];
+
+ if (ls && ls.labelMaxLength) {
+ var mxl = parseInt(ls.labelMaxLength);
+
+ if (Ext.isNumber(mxl) && name.length > mxl) {
+ name = name.substr(0, mxl) + '..';
+ }
+ }
+
+ a.push(name);
});
}
- return getFormatedSeriesTitle(a);
+ return ns.dashboard ? getFormatedSeriesTitle(a) : a;
};
getDefaultSeries = function(store) {
