dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13551 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-01-02 20:54:33 +0100
message:
  PT, DV, GIS, plugin configuration fixes
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-12-31 12:06:53 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2014-01-02 19:53:20 +0000
@@ -89,6 +89,8 @@
 			};
 
 			util.map.map2plugin = function(map) {
+				map.url = init.contextPath;
+				
 				if (map.id) {
 					return {id: map.id};
 				}
@@ -7981,14 +7983,15 @@
 			},
 			handler: function() {
 				var textArea,
-					window;
+					window,
+					text = 'DHIS.getMap(' + JSON.stringify(gis.util.map.map2plugin(gis.util.layout.getPluginConfig())) + ');';
 
 				textArea = Ext.create('Ext.form.field.TextArea', {
 					width: 400,
 					height: 200,
 					readOnly: true,
 					cls: 'gis-textarea monospaced',
-					value: JSON.stringify(gis.util.map.map2plugin(gis.util.layout.getPluginConfig()))
+					value: text
 				});
 
 				window = Ext.create('Ext.window.Window', {
@@ -8003,7 +8006,7 @@
 						{
 							text: 'Format',
 							handler: function() {
-								textArea.setValue(JSON.stringify(gis.util.map.map2plugin(gis.util.layout.getPluginConfig()), null, 2));
+								textArea.setValue('DHIS.getMap(' + JSON.stringify(gis.util.map.map2plugin(gis.util.layout.getPluginConfig()), null, 2) + ');');
 
 							}
 						},

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-01-02 15:36:23 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-01-02 19:49:41 +0000
@@ -4797,14 +4797,15 @@
 			},
 			handler: function() {
 				var textArea,
-					window;
+					window,
+					text = 'DHIS.getTable(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout)) + ');';
 
 				textArea = Ext.create('Ext.form.field.TextArea', {
 					width: 400,
 					height: 200,
 					readOnly: true,
 					cls: 'ns-textarea monospaced',
-					value: JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout))
+					value: text
 				});
 
 				window = Ext.create('Ext.window.Window', {
@@ -4819,8 +4820,7 @@
 						{
 							text: 'Format',
 							handler: function() {
-								textArea.setValue(JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout), null, 2));
-
+								textArea.setValue('DHIS.getTable(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout), null, 2) + ');');
 							}
 						},
 						{

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-12-31 16:01:52 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2014-01-02 19:49:41 +0000
@@ -1521,6 +1521,8 @@
 				var layout = Ext.clone(layout),
 					dimensions = Ext.Array.clean([].concat(layout.columns || [], layout.rows || [], layout.filters || []));
 
+				layout.url = init.contextPath;
+
 				if (Ext.isString(layout.id)) {
 					return {id: layout.id};
 				}

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2014-01-02 18:14:38 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2014-01-02 19:49:41 +0000
@@ -4475,14 +4475,15 @@
 			},
 			handler: function() {
 				var textArea,
-					window;
+					window,
+					text = 'DHIS.getChart(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout)) + ');';
 
 				textArea = Ext.create('Ext.form.field.TextArea', {
 					width: 400,
 					height: 200,
 					readOnly: true,
 					cls: 'ns-textarea monospaced',
-					value: JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout))
+					value: text
 				});
 
 				window = Ext.create('Ext.window.Window', {
@@ -4497,8 +4498,7 @@
 						{
 							text: 'Format',
 							handler: function() {
-								textArea.setValue(JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout), null, 2));
-
+								textArea.setValue('DHIS.getChart(' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout), null, 2) + ');');
 							}
 						},
 						{

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2013-12-31 16:01:52 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2014-01-02 19:49:41 +0000
@@ -1195,6 +1195,8 @@
 				var layout = Ext.clone(layout),
 					dimensions = Ext.Array.clean([].concat(layout.columns || [], layout.rows || [], layout.filters || []));
 
+				layout.url = init.contextPath;
+				
 				if (Ext.isString(layout.id)) {
 					return {id: layout.id};
 				}