dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36525
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18679: ER collapse data dimensions, work in progress + Minor plugin fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18679 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-03-24 18:26:06 +0100
message:
ER collapse data dimensions, work in progress + Minor plugin fixes.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js
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/i18n/i18n_app.properties
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-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
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.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-reports/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-03-05 16:18:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties 2015-03-16 16:37:33 +0000
@@ -191,3 +191,4 @@
select=Select
user_sub_units=User sub-units
user_sub_x2_units=User sub-x2-units
+collapse_data_dimensions=Collapse data dimensions
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-03-11 16:35:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-03-24 17:21:46 +0000
@@ -10,7 +10,7 @@
extendCore,
createViewport,
- dimConf,
+ dimConf;
ns = {
core: {},
@@ -1301,6 +1301,9 @@
filterStore,
onValueSelect,
value,
+ val,
+ onCollapseDataDimensionsChange,
+ collapseDataDimensions,
aggregationType,
getStore,
@@ -1326,7 +1329,8 @@
defaultValueId = 'default';
getStore = function(applyConfig) {
- var config = {};
+ var config = {},
+ store;
config.fields = ['id', 'name'];
@@ -1342,7 +1346,9 @@
return Ext.clone(dimensionNames);
};
- return Ext.create('Ext.data.Store', config);
+ store = Ext.create('Ext.data.Store', config);
+
+ return store;
};
getStoreKeys = function(store) {
@@ -1585,6 +1591,42 @@
}
});
+ val = Ext.create('Ext.panel.Panel', {
+ bodyStyle: 'padding: 1px',
+ width: defaultWidth,
+ height: 220,
+ items: value,
+ tbar: {
+ height: 25,
+ style: 'padding: 1px',
+ items: [
+ {
+ xtype: 'label',
+ height: 22,
+ style: 'padding-left: 6px; line-height: 22px',
+ text: NS.i18n.value
+ },
+ '->',
+ aggregationType
+ ]
+ }
+ });
+
+ onCollapseDataDimensionsChange = function(value) {
+ toggleDataItems(value);
+ toggleValueGui(value);
+ };
+
+ collapseDataDimensions = Ext.create('Ext.form.field.Checkbox', {
+ boxLabel: NS.i18n.collapse_data_dimensions,
+ style: 'margin-left: 3px',
+ listeners: {
+ change: function(chb, value) {
+ onCollapseDataDimensionsChange(value);
+ }
+ }
+ });
+
selectPanel = Ext.create('Ext.panel.Panel', {
bodyStyle: 'border:0 none',
items: [
@@ -1610,37 +1652,25 @@
bodyStyle: 'border:0 none',
items: [
row,
- {
- xtype: 'panel',
- bodyStyle: 'padding: 1px',
- width: defaultWidth,
- height: 220,
- items: value,
- tbar: {
- height: 25,
- style: 'padding: 1px',
- items: [
- {
- xtype: 'label',
- height: 22,
- style: 'padding-left: 6px; line-height: 22px',
- text: NS.i18n.value
- },
- '->',
- aggregationType
- ]
- }
- }
+ val
]
}
]
});
- addDimension = function(record, store, excludedStores) {
- var store = dimensionStoreMap[record.id] || store || filterStore;
+ addDimension = function(record, store, excludedStores, force) {
+ store = store && force ? store : dimensionStoreMap[record.id] || store || filterStore;
- if (!hasDimension(record.id, excludedStores) && record.id !== value.getValue()) {
- store.add(record);
+ if (hasDimension(record.id, excludedStores)) {
+ if (force) {
+ removeDimension(record.id);
+ store.add(record);
+ }
+ }
+ else {
+ if (record.id !== value.getValue()) {
+ store.add(record);
+ }
}
};
@@ -1726,6 +1756,57 @@
fixedFilterStore.setListHeight();
};
+ toggleDataItems = function(param) {
+ var stores = [colStore, rowStore, filterStore, fixedFilterStore],
+ collapse = Ext.isObject(param) && param.collapseDataItems ? param.collapseDataItems : param,
+ keys = ['ou', 'pe', 'dates'],
+ dy = ['dy'],
+ keys;
+
+ // clear filters
+ for (var i = 0, store; i < stores.length; i++) {
+ stores[i].clearFilter();
+ }
+
+ // add dy if it does not exist
+ if (!hasDimension('dy')) {
+ addDimension({
+ id: 'dy',
+ name: NS.i18n.data
+ }, rowStore);
+ }
+
+ // keys
+ if (collapse) { // included keys
+ keys = ['ou', 'pe', 'dates', 'dy'];
+ }
+ else { // excluded keys
+ keys = ['dy'];
+ }
+
+ // data items
+ for (var i = 0, store, include; i < stores.length; i++) {
+ store = stores[i];
+
+ if (collapse) {
+ store.filterBy(function(record, id) {
+ return Ext.Array.contains(keys, record.data.id);
+ });
+ }
+ else {
+ store.filterBy(function(record, id) {
+ return !Ext.Array.contains(keys, record.data.id);
+ });
+ }
+ }
+ };
+
+ toggleValueGui = function(param) {
+ var collapse = Ext.isObject(param) && param.collapseDataItems ? param.collapseDataItems : param;
+
+ val.setDisabled(collapse);
+ };
+
window = Ext.create('Ext.window.Window', {
title: NS.i18n.table_layout,
bodyStyle: 'background-color:#fff; padding:' + margin + 'px',
@@ -1743,9 +1824,14 @@
addDimension: addDimension,
removeDimension: removeDimension,
hasDimension: hasDimension,
+ dimensionStoreMap: dimensionStoreMap,
saveState: saveState,
resetData: resetData,
reset: reset,
+ onCollapseDataDimensionsChange: onCollapseDataDimensionsChange,
+ collapseDataDimensions: collapseDataDimensions,
+ toggleDataItems: toggleDataItems,
+ toggleValueGui: toggleValueGui,
getValueConfig: function() {
var config = {},
valueId = value.getValue();
@@ -1757,9 +1843,15 @@
return config;
},
- hideOnBlur: true,
+ getOptions: function() {
+ return {
+ collapseDataDimensions: collapseDataDimensions.getValue()
+ };
+ },
+ hideOnBlur: true,
items: selectPanel,
bbar: [
+ collapseDataDimensions,
'->',
{
text: NS.i18n.hide,
@@ -1815,7 +1907,7 @@
}
}
});
-
+nissa = window;
return window;
};
@@ -4354,8 +4446,11 @@
'ou': {id: 'ou', name: 'Organisation units'}
},
extendDim = function(dim) {
+ var md = ns.app.response.metaData,
+ dimConf = ns.core.conf.finals.dimension;
+
dim.id = dim.id || dim.dimension;
- dim.name = dim.name || ns.app.response.metaData.names[dim.dimension];
+ dim.name = dim.name || md.names[dim.dimension] || dimConf.objectNameMap[dim.dimension].name;
return dim;
};
@@ -4425,37 +4520,46 @@
// favorite
if (layout && layout.dataType === 'aggregated_values') {
+
+ // start end dates
if (layout.startDate && layout.endDate) {
aggWindow.fixedFilterStore.add({id: dimConf.startEndDate.value, name: dimConf.startEndDate.name});
}
+ // columns
if (layout.columns) {
for (var i = 0, record, dim; i < layout.columns.length; i++) {
dim = layout.columns[i];
record = recordMap[dim.dimension];
- aggWindow.addDimension(record || extendDim(Ext.clone(dim)), aggWindow.colStore);
+ aggWindow.addDimension(record || extendDim(Ext.clone(dim)), aggWindow.colStore, null, true);
}
}
+ // rows
if (layout.rows) {
for (var i = 0, record, dim; i < layout.rows.length; i++) {
dim = layout.rows[i];
record = recordMap[dim.dimension];
- aggWindow.addDimension(record || extendDim(Ext.clone(dim)), aggWindow.rowStore);
+ aggWindow.addDimension(record || extendDim(Ext.clone(dim)), aggWindow.rowStore, null, true);
}
}
+ // filters
if (layout.filters) {
for (var i = 0, store, record, dim; i < layout.filters.length; i++) {
dim = layout.filters[i];
record = recordMap[dim.dimension];
store = Ext.Array.contains(includeKeys, element.type) || element.optionSet ? aggWindow.filterStore : aggWindow.fixedFilterStore;
- aggWindow.addDimension(record || extendDim(Ext.clone(dim)), store);
+ aggWindow.addDimension(record || extendDim(Ext.clone(dim)), store, null, true);
}
}
+
+ // collapse data dimensions
+ aggWindow.collapseDataDimensions.setValue(layout.collapseDataDimensions);
+ aggWindow.onCollapseDataDimensionsChange(layout.collapseDataDimensions);
}
};
@@ -6044,6 +6148,9 @@
rows = [],
filters = [],
values = [],
+ addAxisDimension,
+ store,
+ data,
a;
view.dataType = dataType;
@@ -6054,6 +6161,9 @@
return;
}
+ // dy
+ map['dy'] = [{dimension: 'dy'}];
+
// pe
if (periodMode.getValue() === 'dates') {
view.startDate = startDate.getSubmitValue();
@@ -6098,110 +6208,71 @@
map['longitude'] = [{dimension: 'longitude'}];
map['latitude'] = [{dimension: 'latitude'}];
- // dimensions
- if (layoutWindow.colStore) {
- layoutWindow.colStore.each(function(item) {
- a = map[item.data.id] || [];
-
- if (a.length) {
- if (a.length === 1) {
- columns.push(a[0]);
- }
- else {
- var dim;
-
- for (var i = 0; i < a.length; i++) {
- if (!dim) {
- dim = a[i];
- }
- else {
- dim.filter += ':' + a[i].filter;
- }
- }
-
- columns.push(dim);
- }
- }
- });
- }
-
- if (layoutWindow.rowStore) {
- layoutWindow.rowStore.each(function(item) {
- a = map[item.data.id] || [];
-
- if (a.length) {
- if (a.length === 1) {
- rows.push(a[0]);
- }
- else {
- var dim;
-
- for (var i = 0; i < a.length; i++) {
- if (!dim) {
- dim = a[i];
- }
- else {
- dim.filter += ':' + a[i].filter;
- }
- }
-
- rows.push(dim);
- }
- }
- });
- }
-
- if (layoutWindow.filterStore) {
- layoutWindow.filterStore.each(function(item) {
- a = map[item.data.id] || [];
-
- if (a.length) {
- if (a.length === 1) {
- filters.push(a[0]);
- }
- else {
- var dim;
-
- for (var i = 0; i < a.length; i++) {
- if (!dim) {
- dim = a[i];
- }
- else {
- dim.filter += ':' + a[i].filter;
- }
- }
-
- filters.push(dim);
- }
- }
- });
- }
-
- if (layoutWindow.fixedFilterStore) {
- layoutWindow.fixedFilterStore.each(function(item) {
- a = map[item.data.id] || [];
-
- if (a.length) {
- if (a.length === 1) {
- filters.push(a[0]);
- }
- else {
- var dim;
-
- for (var i = 0; i < a.length; i++) {
- if (!dim) {
- dim = a[i];
- }
- else {
- dim.filter += ':' + a[i].filter;
- }
- }
-
- filters.push(dim);
- }
- }
- });
- }
+ addAxisDimension = function(a, axis) {
+ if (a.length) {
+ if (a.length === 1) {
+ axis.push(a[0]);
+ }
+ else {
+ var dim;
+
+ for (var i = 0; i < a.length; i++) {
+ if (!dim) { //todo ??
+ dim = a[i];
+ }
+ else {
+ dim.filter += ':' + a[i].filter;
+ }
+ }
+
+ axis.push(dim);
+ }
+ }
+ };
+
+ // columns
+ store = layoutWindow.colStore;
+
+ if (store) {
+ data = store.snapshot || store.data;
+
+ data.each(function(item) {
+ addAxisDimension(map[item.data.id] || [], columns);
+ });
+ }
+
+ // rows
+ store = layoutWindow.rowStore;
+
+ if (store) {
+ data = store.snapshot || store.data;
+
+ data.each(function(item) {
+ addAxisDimension(map[item.data.id] || [], rows);
+ });
+ }
+
+ // filters
+ store = layoutWindow.filterStore;
+
+ if (store) {
+ data = store.snapshot || store.data;
+
+ data.each(function(item) {
+ addAxisDimension(map[item.data.id] || [], filters);
+ });
+ }
+
+ // fixed filters
+ store = layoutWindow.fixedFilterStore;
+
+ if (store) {
+ data = store.snapshot || store.data;
+
+ data.each(function(item) {
+ addAxisDimension(map[item.data.id] || [], filters);
+ });
+ }
if (columns.length) {
view.columns = columns;
@@ -6215,7 +6286,7 @@
// value, aggregation type
Ext.apply(view, layoutWindow.getValueConfig());
-
+console.log(view);
return view;
};
@@ -6769,16 +6840,15 @@
web.report = web.report || {};
web.report.getLayoutConfig = function() {
- var view = ns.app.accordion.getView(),
- options = {};
+ var view = ns.app.accordion.getView();
if (!view) {
return;
}
if (view.dataType === 'aggregated_values') {
- options = ns.app.aggregateOptionsWindow.getOptions();
- Ext.applyIf(view, options);
+ Ext.applyIf(view, ns.app.aggregateOptionsWindow.getOptions());
+ Ext.applyIf(view, ns.app.aggregateLayoutWindow.getOptions());
// if order and limit -> sort
if (view.sortOrder && view.topLimit) {
@@ -6790,8 +6860,7 @@
}
if (view.dataType === 'individual_cases') {
- options = ns.app.queryOptionsWindow.getOptions();
- Ext.applyIf(view, options);
+ Ext.applyIf(view, ns.app.queryOptionsWindow.getOptions());
view.paging = {
page: ns.app.statusBar.getCurrentPage(),
@@ -6895,6 +6964,7 @@
// add to dimConf, TODO
for (var i = 0, map = dimConf.objectNameMap, header; i < response.headers.length; i++) {
header = response.headers[i];
+
map[header.name] = map[header.name] || {
id: header.name,
dimensionName: header.name,
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-03-09 15:03:37 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-03-24 08:59:35 +0000
@@ -32,8 +32,8 @@
data: {
value: 'data',
name: NS.i18n.data || 'Data',
- dimensionName: 'dx',
- objectName: 'dx',
+ dimensionName: 'dy',
+ objectName: 'dy',
warning: {
filter: '...'//NS.i18n.wm_multiple_filter_ind_de
}
@@ -1296,6 +1296,32 @@
return headerNames;
};
+ // collapse data dimensions?
+ (function() {
+ var keys = xLayout.collapseDataDimensions ? ['dy', 'pe', 'ou'] : ['dy'],
+ dimensionsToRemove = [];
+
+ // find dimensions to remove
+ for (var i = 0, dim; i < dimensions.length; i++) {
+ dim = dimensions[i];
+
+ if (xLayout.collapseDataDimensions && !Ext.Array.contains(keys, dim.dimension)) {
+ dimensionsToRemove.push(dim);
+ }
+ else if (!xLayout.collapseDataDimensions && Ext.Array.contains(keys, dim.dimension)) {
+ dimensionsToRemove.push(dim);
+ }
+ }
+
+ // remove dimensions
+ for (var i = 0, dim; i < dimensionsToRemove.length; i++) {
+ removeDimensionFromXLayout(dimensionsToRemove[i].dimension);
+ }
+
+ // update dimensions array
+ dimensions = Ext.Array.clean([].concat(xLayout.columns || [], xLayout.rows || [], xLayout.filters || []));
+ }());
+
// items
for (var i = 0, dim, header; i < dimensions.length; i++) {
dim = dimensions[i];
@@ -1923,13 +1949,17 @@
// idValueMap: vars
var valueHeaderIndex = response.nameHeaderMap[conf.finals.dimension.value.value].index,
- dx = dimConf.data.dimensionName,
+ dy = dimConf.data.dimensionName,
axisDimensionNames = xLayout.axisDimensionNames,
idIndexOrder = [];
// idValueMap: idIndexOrder
- for (var i = 0; i < axisDimensionNames.length; i++) {
- idIndexOrder.push(response.nameHeaderMap[axisDimensionNames[i]].index);
+ for (var i = 0, dimensionName; i < axisDimensionNames.length; i++) {
+ dimensionName = axisDimensionNames[i];
+
+ if (response.nameHeaderMap.hasOwnProperty(dimensionName)) {
+ idIndexOrder.push(response.nameHeaderMap[dimensionName].index);
+ }
}
// idValueMap
@@ -2072,7 +2102,7 @@
web.analytics.getParamString = function(view, format, skipPaging) {
var paramString,
dimensions = Ext.Array.clean([].concat(view.columns || [], view.rows || [])),
- ignoreKeys = ['longitude', 'latitude'],
+ ignoreKeys = ['dy', 'longitude', 'latitude'],
dataTypeMap = {
'aggregated_values': 'aggregate',
'individual_cases': 'query'
@@ -2194,6 +2224,11 @@
// display property
paramString += '&displayProperty=' + init.userAccount.settings.keyAnalysisDisplayProperty.toUpperCase();
+ // collapse data items
+ if (view.collapseDataDimensions) {
+ paramString += '&collapseDataDimensions=true';
+ }
+
return paramString;
};
@@ -2456,7 +2491,7 @@
for (var j = 0; j < xRowAxis.dims - 1; j++) {
a.push(getEmptyNameTdConfig({
cls: 'pivot-dim-label',
- htmlValue: dimConf.objectNameMap[xLayout.rowObjectNames[j]].name
+ htmlValue: dimConf.objectNameMap[xLayout.rowObjectNames[j]] ? dimConf.objectNameMap[xLayout.rowObjectNames[j]].name : 'missing col name'
}));
}
}
=== 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-03-22 19:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-03-23 12:48:05 +0000
@@ -3654,7 +3654,7 @@
defaultConfig.legend = getDefaultLegend(store, config);
if (defaultConfig.legend.position === 'right') {
- defaultConfig.insetPaddingObject.top = ns.dashboard ? 20 : 40;
+ defaultConfig.insetPaddingObject.top = ns.dashboard ? 22 : 40;
defaultConfig.insetPaddingObject.right = ns.dashboard ? 5 : 40;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties 2015-03-09 13:15:43 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties 2015-03-24 07:46:52 +0000
@@ -249,3 +249,4 @@
user_sub_units=User sub-units
user_sub_x2_units=User sub-x2-units
metadata_id_scheme=Meta-data ID scheme
+chart_layout=Chart layout
=== 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-03-10 11:32:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-03-24 07:46:52 +0000
@@ -539,7 +539,7 @@
};
window = Ext.create('Ext.window.Window', {
- title: NS.i18n.table_layout,
+ title: NS.i18n.chart_layout,
bodyStyle: 'background-color:#fff; padding:' + margin + 'px',
closeAction: 'hide',
autoShow: true,
=== 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-03-22 19:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-03-23 12:48:05 +0000
@@ -3216,7 +3216,7 @@
defaultConfig.legend = getDefaultLegend(store, config);
if (defaultConfig.legend.position === 'right') {
- defaultConfig.insetPaddingObject.top = ns.dashboard ? 20 : 40;
+ defaultConfig.insetPaddingObject.top = ns.dashboard ? 22 : 40;
defaultConfig.insetPaddingObject.right = ns.dashboard ? 5 : 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-03-22 19:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js 2015-03-23 12:48:05 +0000
@@ -3214,7 +3214,7 @@
defaultConfig.legend = getDefaultLegend(store, config);
if (defaultConfig.legend.position === 'right') {
- defaultConfig.insetPaddingObject.top = ns.dashboard ? 20 : 40;
+ defaultConfig.insetPaddingObject.top = ns.dashboard ? 22 : 40;
defaultConfig.insetPaddingObject.right = ns.dashboard ? 5 : 40;
}
}
=== 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-03-22 19:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js 2015-03-23 12:48:05 +0000
@@ -3654,7 +3654,7 @@
defaultConfig.legend = getDefaultLegend(store, config);
if (defaultConfig.legend.position === 'right') {
- defaultConfig.insetPaddingObject.top = ns.dashboard ? 20 : 40;
+ defaultConfig.insetPaddingObject.top = ns.dashboard ? 22 : 40;
defaultConfig.insetPaddingObject.right = ns.dashboard ? 5 : 40;
}
}
=== 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-03-22 19:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-03-23 12:48:05 +0000
@@ -71,7 +71,7 @@
styleEl = document.createElement("style");
styleEl.setAttribute("type", "text/css");
-
+
if (id) {
styleEl.setAttribute("id", id);
}
@@ -3192,7 +3192,7 @@
shadow: false,
insetPadding: ns.dashboard ? 17 : 35,
insetPaddingObject: {
- top: 10,
+ top: 12,
right: 3,
bottom: 2,
left: 7
@@ -3207,7 +3207,7 @@
defaultConfig.legend = getDefaultLegend(store, config);
if (defaultConfig.legend.position === 'right') {
- defaultConfig.insetPaddingObject.top = ns.dashboard ? 20 : 40;
+ defaultConfig.insetPaddingObject.top = ns.dashboard ? 22 : 40;
defaultConfig.insetPaddingObject.right = ns.dashboard ? 5 : 40;
}
}
=== 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-03-22 19:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-03-23 12:48:05 +0000
@@ -71,7 +71,7 @@
styleEl = document.createElement("style");
styleEl.setAttribute("type", "text/css");
-
+
if (id) {
styleEl.setAttribute("id", id);
}
@@ -3647,7 +3647,7 @@
defaultConfig.legend = getDefaultLegend(store, config);
if (defaultConfig.legend.position === 'right') {
- defaultConfig.insetPaddingObject.top = ns.dashboard ? 20 : 40;
+ defaultConfig.insetPaddingObject.top = ns.dashboard ? 22 : 40;
defaultConfig.insetPaddingObject.right = ns.dashboard ? 5 : 40;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js 2015-03-22 19:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js 2015-03-23 12:48:05 +0000
@@ -15,7 +15,12 @@
styleEl = document.createElement("style");
styleEl.setAttribute("type", "text/css");
-
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
if (id) {
styleEl.setAttribute("id", id);
}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js 2015-03-22 19:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js 2015-03-23 12:48:05 +0000
@@ -1470,7 +1470,12 @@
styleEl = document.createElement("style");
styleEl.setAttribute("type", "text/css");
-
+ var ss,
+ head = document.getElementsByTagName("head")[0],
+ styleEl = document.createElement("style");
+
+ styleEl.setAttribute("type", "text/css");
+
if (id) {
styleEl.setAttribute("id", id);
}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js 2015-03-22 19:08:11 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js 2015-03-23 12:48:05 +0000
@@ -15,7 +15,7 @@
styleEl = document.createElement("style");
styleEl.setAttribute("type", "text/css");
-
+
if (id) {
styleEl.setAttribute("id", id);
}
