dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37425
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19154: DV ER EV plugin alert fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 19154 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-05-13 19:01:47 +0200
message:
DV ER EV plugin alert fixes.
modified:
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/eventreport.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/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/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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventreport.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
--
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/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-05-11 18:25:57 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js 2015-05-13 16:59:59 +0000
@@ -412,19 +412,19 @@
// Indicators as filter
if (layout.filters[i].dimension === dimConf.indicator.objectName) {
- ns.alert(NS.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter');
+ ns.alert(NS.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter.');
return;
}
// Categories as filter
if (layout.filters[i].dimension === dimConf.category.objectName) {
- ns.alert(NS.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter');
+ ns.alert(NS.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter.');
return;
}
// Data sets as filter
if (layout.filters[i].dimension === dimConf.dataSet.objectName) {
- ns.alert(NS.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter');
+ ns.alert(NS.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter.');
return;
}
}
@@ -432,25 +432,25 @@
// dc and in
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.indicator.objectName]) {
- ns.alert('Indicators and detailed data elements cannot be specified together');
+ ns.alert('Indicators and detailed data elements cannot be specified together.');
return;
}
// dc and de
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataElement.objectName]) {
- ns.alert('Detailed data elements and totals cannot be specified together');
+ ns.alert('Detailed data elements and totals cannot be specified together.');
return;
}
// dc and ds
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataSet.objectName]) {
- ns.alert('Data sets and detailed data elements cannot be specified together');
+ ns.alert('Data sets and detailed data elements cannot be specified together.');
return;
}
// dc and co
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.category.objectName]) {
- ns.alert('Categories and detailed data elements cannot be specified together');
+ ns.alert('Categories and detailed data elements cannot be specified together.');
return;
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js 2015-05-13 00:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js 2015-05-13 16:59:59 +0000
@@ -469,19 +469,19 @@
// Indicators as filter
if (layout.filters[i].dimension === dimConf.indicator.objectName) {
- ns.alert(ER.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter');
+ ns.alert(ER.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter.');
return;
}
// Categories as filter
if (layout.filters[i].dimension === dimConf.category.objectName) {
- ns.alert(ER.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter');
+ ns.alert(ER.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter.');
return;
}
// Data sets as filter
if (layout.filters[i].dimension === dimConf.dataSet.objectName) {
- ns.alert(ER.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter');
+ ns.alert(ER.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter.');
return;
}
}
@@ -489,25 +489,25 @@
// dc and in
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.indicator.objectName]) {
- ns.alert('Indicators and detailed data elements cannot be specified together');
+ ns.alert('Indicators and detailed data elements cannot be specified together.');
return;
}
// dc and de
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataElement.objectName]) {
- ns.alert('Detailed data elements and totals cannot be specified together');
+ ns.alert('Detailed data elements and totals cannot be specified together.');
return;
}
// dc and ds
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataSet.objectName]) {
- ns.alert('Data sets and detailed data elements cannot be specified together');
+ ns.alert('Data sets and detailed data elements cannot be specified together.');
return;
}
// dc and co
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.category.objectName]) {
- ns.alert('Categories and detailed data elements cannot be specified together');
+ ns.alert('Categories and detailed data elements cannot be specified together.');
return;
}
@@ -3830,11 +3830,21 @@
'Content-Type': headerMap[type],
'Accepts': headerMap[type]
},
- el = Ext.get(init.el);
+ el = Ext.get(config.el);
// init
init.el = config.el;
+ // message
+ web.message = web.message || {};
+
+ web.message.alert = function(text) {
+ if (el) {
+ el.setStyle('opacity', 1);
+ el.update('<div class="ns-plugin-alert">' + text + '</div>');
+ }
+ };
+
// mouse events
web.events = web.events || {};
@@ -4259,12 +4269,9 @@
ns.skipMask = init.skipMask;
ns.skipFade = init.skipFade;
- ns.alert = function(text) {
- if (el) {
- el.setStyle('opacity', 1);
- el.update('<div class="ns-plugin-alert">' + text + '</div>');
- }
- };
+ ns.alert = web.message.alert;
+
+ init.el = config.el;
};
createViewport = function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html 2015-05-13 00:51:19 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html 2015-05-13 16:59:59 +0000
@@ -28,7 +28,8 @@
DHIS.getEventChart({
url: url,
el: 'report1',
- id: 'kSFCt1c5TQ7'
+ id: 'HyITmkk7kEh',
+ columns: []
});
//DHIS.getEventChart({
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-05-13 16:20:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js 2015-05-13 16:59:59 +0000
@@ -1045,7 +1045,7 @@
// column
if (!config.columns) {
- alert('No series items selected');
+ ns.alert('No series items selected');
return;
}
@@ -1057,7 +1057,7 @@
// row
if (!config.rows) {
- alert('No category items selected');
+ ns.alert('No category items selected');
return;
}
=== 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 16:25:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js 2015-05-13 16:59:59 +0000
@@ -1118,7 +1118,7 @@
// period
if (!Ext.Array.contains(objectNames, 'pe') && !(config.startDate && config.endDate)) {
- ns.alert('At least one fixed period, one relative period or start/end dates must be specified');
+ ns.alert('At least one fixed period, one relative period or start/end dates must be specified.');
return;
}
@@ -1128,7 +1128,7 @@
// column
if (!config.columns) {
- alert('No series items selected');
+ ns.alert('No series items selected.');
return;
}
@@ -1140,7 +1140,7 @@
// row
if (!config.rows) {
- alert('No category items selected');
+ ns.alert('No category items selected.');
return;
}
@@ -4963,15 +4963,17 @@
'Content-Type': headerMap[type],
'Accepts': headerMap[type]
},
- el = Ext.get(init.el);
-
- ns.plugin = init.plugin;
- ns.dashboard = init.dashboard;
- ns.crossDomain = init.crossDomain;
- ns.skipMask = init.skipMask;
- ns.skipFade = init.skipFade;
-
- init.el = config.el;
+ el = Ext.get(config.el);
+
+ // message
+ web.message = web.message || {};
+
+ web.message.alert = function(text) {
+ if (el) {
+ el.setStyle('opacity', 1);
+ el.update('<div class="ns-plugin-alert">' + text + '</div>');
+ }
+ };
// report
web.report = web.report || {};
@@ -5214,6 +5216,17 @@
getXResponse();
}
};
+
+ // ns
+ ns.plugin = init.plugin;
+ ns.dashboard = init.dashboard;
+ ns.crossDomain = init.crossDomain;
+ ns.skipMask = init.skipMask;
+ ns.skipFade = init.skipFade;
+
+ ns.alert = web.message.alert;
+
+ init.el = config.el;
};
createViewport = function() {
=== 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 16:25:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js 2015-05-13 16:59:59 +0000
@@ -1059,19 +1059,19 @@
// Indicators as filter
if (layout.filters[i].dimension === dimConf.indicator.objectName) {
- ns.alert(DV.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter');
+ ns.alert(DV.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter.');
return;
}
// Categories as filter
if (layout.filters[i].dimension === dimConf.category.objectName) {
- ns.alert(DV.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter');
+ ns.alert(DV.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter.');
return;
}
// Data sets as filter
if (layout.filters[i].dimension === dimConf.dataSet.objectName) {
- ns.alert(DV.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter');
+ ns.alert(DV.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter.');
return;
}
}
@@ -1079,31 +1079,31 @@
// dc and in
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.indicator.objectName]) {
- ns.alert('Indicators and detailed data elements cannot be specified together', true);
+ ns.alert('Indicators and detailed data elements cannot be specified together.', true);
return;
}
// dc and de
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataElement.objectName]) {
- ns.alert('Detailed data elements and totals cannot be specified together', true);
+ ns.alert('Detailed data elements and totals cannot be specified together.', true);
return;
}
// dc and ds
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataSet.objectName]) {
- ns.alert('Data sets and detailed data elements cannot be specified together', true);
+ ns.alert('Data sets and detailed data elements cannot be specified together.', true);
return;
}
// dc and co
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.category.objectName]) {
- ns.alert('Categories and detailed data elements cannot be specified together', true);
+ ns.alert('Categories and detailed data elements cannot be specified together.', true);
return;
}
// in and aggregation type
if (objectNameDimensionMap[dimConf.indicator.objectName] && config.aggregationType !== 'DEFAULT') {
- ns.alert('Indicators and aggregation types cannot be specified together', true);
+ ns.alert('Indicators and aggregation types cannot be specified together.', true);
return;
}
@@ -1126,12 +1126,12 @@
// at least one dimension specified as column and row
if (!config.columns) {
- ns.alert('No series items selected');
+ ns.alert('No series items selected.');
return;
}
if (!config.rows) {
- ns.alert('No category items selected');
+ ns.alert('No category items selected.');
return;
}
@@ -1146,7 +1146,7 @@
// at least one period
if (!Ext.Array.contains(objectNames, dimConf.period.objectName)) {
- ns.alert('At least one period must be specified as series, category or filter');
+ ns.alert('At least one period must be specified as series, category or filter.');
return;
}
@@ -4182,7 +4182,7 @@
'Content-Type': headerMap[type],
'Accepts': headerMap[type]
},
- el = Ext.get(init.el);
+ el = Ext.get(config.el);
// message
web.message = web.message || {};
=== 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 16:20:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js 2015-05-13 16:59:59 +0000
@@ -1002,19 +1002,19 @@
// Indicators as filter
if (layout.filters[i].dimension === dimConf.indicator.objectName) {
- ns.alert(NS.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter');
+ ns.alert(NS.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter.');
return;
}
// Categories as filter
if (layout.filters[i].dimension === dimConf.category.objectName) {
- ns.alert(NS.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter');
+ ns.alert(NS.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter.');
return;
}
// Data sets as filter
if (layout.filters[i].dimension === dimConf.dataSet.objectName) {
- ns.alert(NS.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter');
+ ns.alert(NS.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter.');
return;
}
}
@@ -1022,31 +1022,31 @@
// dc and in
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.indicator.objectName]) {
- ns.alert('Indicators and detailed data elements cannot be specified together', true);
+ ns.alert('Indicators and detailed data elements cannot be specified together.', true);
return;
}
// dc and de
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataElement.objectName]) {
- ns.alert('Detailed data elements and totals cannot be specified together', true);
+ ns.alert('Detailed data elements and totals cannot be specified together.', true);
return;
}
// dc and ds
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataSet.objectName]) {
- ns.alert('Data sets and detailed data elements cannot be specified together', true);
+ ns.alert('Data sets and detailed data elements cannot be specified together.', true);
return;
}
// dc and co
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.category.objectName]) {
- ns.alert('Categories and detailed data elements cannot be specified together', true);
+ ns.alert('Categories and detailed data elements cannot be specified together.', true);
return;
}
// in and aggregation type
if (objectNameDimensionMap[dimConf.indicator.objectName] && config.aggregationType !== 'DEFAULT') {
- ns.alert('Indicators and aggregation types cannot be specified together', true);
+ ns.alert('Indicators and aggregation types cannot be specified together.', true);
return;
}
=== 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 16:25:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js 2015-05-13 16:59:59 +0000
@@ -1059,19 +1059,19 @@
// Indicators as filter
if (layout.filters[i].dimension === dimConf.indicator.objectName) {
- ns.alert(DV.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter');
+ ns.alert(DV.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter.');
return;
}
// Categories as filter
if (layout.filters[i].dimension === dimConf.category.objectName) {
- ns.alert(DV.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter');
+ ns.alert(DV.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter.');
return;
}
// Data sets as filter
if (layout.filters[i].dimension === dimConf.dataSet.objectName) {
- ns.alert(DV.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter');
+ ns.alert(DV.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter.');
return;
}
}
@@ -1079,31 +1079,31 @@
// dc and in
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.indicator.objectName]) {
- ns.alert('Indicators and detailed data elements cannot be specified together', true);
+ ns.alert('Indicators and detailed data elements cannot be specified together.', true);
return;
}
// dc and de
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataElement.objectName]) {
- ns.alert('Detailed data elements and totals cannot be specified together', true);
+ ns.alert('Detailed data elements and totals cannot be specified together.', true);
return;
}
// dc and ds
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataSet.objectName]) {
- ns.alert('Data sets and detailed data elements cannot be specified together', true);
+ ns.alert('Data sets and detailed data elements cannot be specified together.', true);
return;
}
// dc and co
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.category.objectName]) {
- ns.alert('Categories and detailed data elements cannot be specified together', true);
+ ns.alert('Categories and detailed data elements cannot be specified together.', true);
return;
}
// in and aggregation type
if (objectNameDimensionMap[dimConf.indicator.objectName] && config.aggregationType !== 'DEFAULT') {
- ns.alert('Indicators and aggregation types cannot be specified together', true);
+ ns.alert('Indicators and aggregation types cannot be specified together.', true);
return;
}
@@ -1126,12 +1126,12 @@
// at least one dimension specified as column and row
if (!config.columns) {
- ns.alert('No series items selected');
+ ns.alert('No series items selected.');
return;
}
if (!config.rows) {
- ns.alert('No category items selected');
+ ns.alert('No category items selected.');
return;
}
@@ -1146,7 +1146,7 @@
// at least one period
if (!Ext.Array.contains(objectNames, dimConf.period.objectName)) {
- ns.alert('At least one period must be specified as series, category or filter');
+ ns.alert('At least one period must be specified as series, category or filter.');
return;
}
@@ -4182,7 +4182,7 @@
'Content-Type': headerMap[type],
'Accepts': headerMap[type]
},
- el = Ext.get(init.el);
+ el = Ext.get(config.el);
// message
web.message = web.message || {};
=== 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 16:25:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js 2015-05-13 16:59:59 +0000
@@ -1118,7 +1118,7 @@
// period
if (!Ext.Array.contains(objectNames, 'pe') && !(config.startDate && config.endDate)) {
- ns.alert('At least one fixed period, one relative period or start/end dates must be specified');
+ ns.alert('At least one fixed period, one relative period or start/end dates must be specified.');
return;
}
@@ -1128,7 +1128,7 @@
// column
if (!config.columns) {
- alert('No series items selected');
+ ns.alert('No series items selected.');
return;
}
@@ -1140,7 +1140,7 @@
// row
if (!config.rows) {
- alert('No category items selected');
+ ns.alert('No category items selected.');
return;
}
@@ -4963,15 +4963,17 @@
'Content-Type': headerMap[type],
'Accepts': headerMap[type]
},
- el = Ext.get(init.el);
-
- ns.plugin = init.plugin;
- ns.dashboard = init.dashboard;
- ns.crossDomain = init.crossDomain;
- ns.skipMask = init.skipMask;
- ns.skipFade = init.skipFade;
-
- init.el = config.el;
+ el = Ext.get(config.el);
+
+ // message
+ web.message = web.message || {};
+
+ web.message.alert = function(text) {
+ if (el) {
+ el.setStyle('opacity', 1);
+ el.update('<div class="ns-plugin-alert">' + text + '</div>');
+ }
+ };
// report
web.report = web.report || {};
@@ -5214,6 +5216,17 @@
getXResponse();
}
};
+
+ // ns
+ ns.plugin = init.plugin;
+ ns.dashboard = init.dashboard;
+ ns.crossDomain = init.crossDomain;
+ ns.skipMask = init.skipMask;
+ ns.skipFade = init.skipFade;
+
+ ns.alert = web.message.alert;
+
+ init.el = config.el;
};
createViewport = function() {
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventreport.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventreport.js 2015-05-13 02:28:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventreport.js 2015-05-13 16:59:59 +0000
@@ -469,19 +469,19 @@
// Indicators as filter
if (layout.filters[i].dimension === dimConf.indicator.objectName) {
- ns.alert(ER.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter');
+ ns.alert(ER.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter.');
return;
}
// Categories as filter
if (layout.filters[i].dimension === dimConf.category.objectName) {
- ns.alert(ER.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter');
+ ns.alert(ER.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter.');
return;
}
// Data sets as filter
if (layout.filters[i].dimension === dimConf.dataSet.objectName) {
- ns.alert(ER.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter');
+ ns.alert(ER.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter.');
return;
}
}
@@ -489,25 +489,25 @@
// dc and in
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.indicator.objectName]) {
- ns.alert('Indicators and detailed data elements cannot be specified together');
+ ns.alert('Indicators and detailed data elements cannot be specified together.');
return;
}
// dc and de
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataElement.objectName]) {
- ns.alert('Detailed data elements and totals cannot be specified together');
+ ns.alert('Detailed data elements and totals cannot be specified together.');
return;
}
// dc and ds
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataSet.objectName]) {
- ns.alert('Data sets and detailed data elements cannot be specified together');
+ ns.alert('Data sets and detailed data elements cannot be specified together.');
return;
}
// dc and co
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.category.objectName]) {
- ns.alert('Categories and detailed data elements cannot be specified together');
+ ns.alert('Categories and detailed data elements cannot be specified together.');
return;
}
@@ -3830,11 +3830,21 @@
'Content-Type': headerMap[type],
'Accepts': headerMap[type]
},
- el = Ext.get(init.el);
+ el = Ext.get(config.el);
// init
init.el = config.el;
+ // message
+ web.message = web.message || {};
+
+ web.message.alert = function(text) {
+ if (el) {
+ el.setStyle('opacity', 1);
+ el.update('<div class="ns-plugin-alert">' + text + '</div>');
+ }
+ };
+
// mouse events
web.events = web.events || {};
@@ -4259,12 +4269,9 @@
ns.skipMask = init.skipMask;
ns.skipFade = init.skipFade;
- ns.alert = function(text) {
- if (el) {
- el.setStyle('opacity', 1);
- el.update('<div class="ns-plugin-alert">' + text + '</div>');
- }
- };
+ ns.alert = web.message.alert;
+
+ init.el = config.el;
};
createViewport = function() {
=== 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 16:25:38 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-05-13 16:59:59 +0000
@@ -1059,19 +1059,19 @@
// Indicators as filter
if (layout.filters[i].dimension === dimConf.indicator.objectName) {
- ns.alert(DV.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter');
+ ns.alert(DV.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter.');
return;
}
// Categories as filter
if (layout.filters[i].dimension === dimConf.category.objectName) {
- ns.alert(DV.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter');
+ ns.alert(DV.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter.');
return;
}
// Data sets as filter
if (layout.filters[i].dimension === dimConf.dataSet.objectName) {
- ns.alert(DV.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter');
+ ns.alert(DV.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter.');
return;
}
}
@@ -1079,31 +1079,31 @@
// dc and in
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.indicator.objectName]) {
- ns.alert('Indicators and detailed data elements cannot be specified together', true);
+ ns.alert('Indicators and detailed data elements cannot be specified together.', true);
return;
}
// dc and de
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataElement.objectName]) {
- ns.alert('Detailed data elements and totals cannot be specified together', true);
+ ns.alert('Detailed data elements and totals cannot be specified together.', true);
return;
}
// dc and ds
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataSet.objectName]) {
- ns.alert('Data sets and detailed data elements cannot be specified together', true);
+ ns.alert('Data sets and detailed data elements cannot be specified together.', true);
return;
}
// dc and co
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.category.objectName]) {
- ns.alert('Categories and detailed data elements cannot be specified together', true);
+ ns.alert('Categories and detailed data elements cannot be specified together.', true);
return;
}
// in and aggregation type
if (objectNameDimensionMap[dimConf.indicator.objectName] && config.aggregationType !== 'DEFAULT') {
- ns.alert('Indicators and aggregation types cannot be specified together', true);
+ ns.alert('Indicators and aggregation types cannot be specified together.', true);
return;
}
@@ -1126,12 +1126,12 @@
// at least one dimension specified as column and row
if (!config.columns) {
- ns.alert('No series items selected');
+ ns.alert('No series items selected.');
return;
}
if (!config.rows) {
- ns.alert('No category items selected');
+ ns.alert('No category items selected.');
return;
}
@@ -1146,7 +1146,7 @@
// at least one period
if (!Ext.Array.contains(objectNames, dimConf.period.objectName)) {
- ns.alert('At least one period must be specified as series, category or filter');
+ ns.alert('At least one period must be specified as series, category or filter.');
return;
}
@@ -4182,7 +4182,7 @@
'Content-Type': headerMap[type],
'Accepts': headerMap[type]
},
- el = Ext.get(init.el);
+ el = Ext.get(config.el);
// message
web.message = web.message || {};
=== 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 16:25:38 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-05-13 16:59:59 +0000
@@ -1118,7 +1118,7 @@
// period
if (!Ext.Array.contains(objectNames, 'pe') && !(config.startDate && config.endDate)) {
- ns.alert('At least one fixed period, one relative period or start/end dates must be specified');
+ ns.alert('At least one fixed period, one relative period or start/end dates must be specified.');
return;
}
@@ -1128,7 +1128,7 @@
// column
if (!config.columns) {
- alert('No series items selected');
+ ns.alert('No series items selected.');
return;
}
@@ -1140,7 +1140,7 @@
// row
if (!config.rows) {
- alert('No category items selected');
+ ns.alert('No category items selected.');
return;
}
@@ -4963,15 +4963,17 @@
'Content-Type': headerMap[type],
'Accepts': headerMap[type]
},
- el = Ext.get(init.el);
-
- ns.plugin = init.plugin;
- ns.dashboard = init.dashboard;
- ns.crossDomain = init.crossDomain;
- ns.skipMask = init.skipMask;
- ns.skipFade = init.skipFade;
-
- init.el = config.el;
+ el = Ext.get(config.el);
+
+ // message
+ web.message = web.message || {};
+
+ web.message.alert = function(text) {
+ if (el) {
+ el.setStyle('opacity', 1);
+ el.update('<div class="ns-plugin-alert">' + text + '</div>');
+ }
+ };
// report
web.report = web.report || {};
@@ -5214,6 +5216,17 @@
getXResponse();
}
};
+
+ // ns
+ ns.plugin = init.plugin;
+ ns.dashboard = init.dashboard;
+ ns.crossDomain = init.crossDomain;
+ ns.skipMask = init.skipMask;
+ ns.skipFade = init.skipFade;
+
+ ns.alert = web.message.alert;
+
+ init.el = config.el;
};
createViewport = function() {
=== 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-05-13 02:27:31 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js 2015-05-13 16:59:59 +0000
@@ -469,19 +469,19 @@
// Indicators as filter
if (layout.filters[i].dimension === dimConf.indicator.objectName) {
- ns.alert(ER.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter');
+ ns.alert(ER.i18n.indicators_cannot_be_specified_as_filter || 'Indicators cannot be specified as filter.');
return;
}
// Categories as filter
if (layout.filters[i].dimension === dimConf.category.objectName) {
- ns.alert(ER.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter');
+ ns.alert(ER.i18n.categories_cannot_be_specified_as_filter || 'Categories cannot be specified as filter.');
return;
}
// Data sets as filter
if (layout.filters[i].dimension === dimConf.dataSet.objectName) {
- ns.alert(ER.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter');
+ ns.alert(ER.i18n.data_sets_cannot_be_specified_as_filter || 'Data sets cannot be specified as filter.');
return;
}
}
@@ -489,25 +489,25 @@
// dc and in
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.indicator.objectName]) {
- ns.alert('Indicators and detailed data elements cannot be specified together');
+ ns.alert('Indicators and detailed data elements cannot be specified together.');
return;
}
// dc and de
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataElement.objectName]) {
- ns.alert('Detailed data elements and totals cannot be specified together');
+ ns.alert('Detailed data elements and totals cannot be specified together.');
return;
}
// dc and ds
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.dataSet.objectName]) {
- ns.alert('Data sets and detailed data elements cannot be specified together');
+ ns.alert('Data sets and detailed data elements cannot be specified together.');
return;
}
// dc and co
if (objectNameDimensionMap[dimConf.operand.objectName] && objectNameDimensionMap[dimConf.category.objectName]) {
- ns.alert('Categories and detailed data elements cannot be specified together');
+ ns.alert('Categories and detailed data elements cannot be specified together.');
return;
}
@@ -3830,11 +3830,21 @@
'Content-Type': headerMap[type],
'Accepts': headerMap[type]
},
- el = Ext.get(init.el);
+ el = Ext.get(config.el);
// init
init.el = config.el;
+ // message
+ web.message = web.message || {};
+
+ web.message.alert = function(text) {
+ if (el) {
+ el.setStyle('opacity', 1);
+ el.update('<div class="ns-plugin-alert">' + text + '</div>');
+ }
+ };
+
// mouse events
web.events = web.events || {};
@@ -4259,12 +4269,9 @@
ns.skipMask = init.skipMask;
ns.skipFade = init.skipFade;
- ns.alert = function(text) {
- if (el) {
- el.setStyle('opacity', 1);
- el.update('<div class="ns-plugin-alert">' + text + '</div>');
- }
- };
+ ns.alert = web.message.alert;
+
+ init.el = config.el;
};
createViewport = function() {
