dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18888 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2015-04-12 18:34:43 +0200
message:
  PT DV 'Raw data SQL' added as download option.
added:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/images/dl_advanced.png
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/images/dl_advanced.png
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css
  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/styles/style.css


--
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

=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/images/dl_advanced.png'
Binary files dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/images/dl_advanced.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/images/dl_advanced.png	2015-04-12 16:29:02 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2015-04-09 09:18:34 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js	2015-04-12 16:29:02 +0000
@@ -5672,11 +5672,24 @@
                                 ]
                             },
                             {
-                                text: 'JRXML',
-                                iconCls: 'ns-menu-item-datasource',
-                                handler: function() {
-                                    openPlainDataSource(ns.core.init.contextPath + '/api/analytics.jrxml' + getParamString(), true);
-                                }
+                                text: 'Advanced',
+                                iconCls: 'ns-menu-item-advanced',
+                                menu: [
+                                    {
+                                        text: 'JRXML',
+                                        iconCls: 'ns-menu-item-datasource',
+                                        handler: function() {
+                                            openPlainDataSource(ns.core.init.contextPath + '/api/analytics.jrxml' + getParamString(), true);
+                                        }
+                                    },
+                                    {
+                                        text: 'Raw data SQL',
+                                        iconCls: 'ns-menu-item-datasource',
+                                        handler: function() {
+                                            openPlainDataSource(ns.core.init.contextPath + '/api/analytics/debug/sql' + getParamString(), true);
+                                        }
+                                    }
+                                ]
                             }
                         ];
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css	2015-04-08 13:50:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css	2015-04-12 16:29:02 +0000
@@ -639,6 +639,7 @@
 .ns-menu-item-image,
 .ns-menu-item-tablelayout,
 .ns-menu-item-datasource,
+.ns-menu-item-advanced,
 .ns-menu-item-scheme,
 .ns-menu-item-selected,
 .ns-menu-item-unselected {
@@ -654,6 +655,9 @@
 .ns-menu-item-datasource {
     background-image:url('../images/dl_datasource.png');
 }
+.ns-menu-item-advanced {
+    background-image:url('../images/dl_advanced.png');
+}
 .ns-menu-item-scheme {
     background-image:url('../images/dl_scheme.png');
 }

=== added file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/images/dl_advanced.png'
Binary files dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/images/dl_advanced.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/images/dl_advanced.png	2015-04-12 16:33:50 +0000 differ
=== 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-04-09 09:25:36 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js	2015-04-12 16:33:06 +0000
@@ -5767,6 +5767,26 @@
                                         }
                                     }
                                 ]
+                            },
+                            {
+                                text: 'Advanced',
+                                iconCls: 'ns-menu-item-advanced',
+                                menu: [
+                                    {
+                                        text: 'JRXML',
+                                        iconCls: 'ns-menu-item-datasource',
+                                        handler: function() {
+                                            openPlainDataSource(ns.core.init.contextPath + '/api/analytics.jrxml' + getParamString(), true);
+                                        }
+                                    },
+                                    {
+                                        text: 'Raw data SQL',
+                                        iconCls: 'ns-menu-item-datasource',
+                                        handler: function() {
+                                            openPlainDataSource(ns.core.init.contextPath + '/api/analytics/debug/sql' + getParamString(), true);
+                                        }
+                                    }
+                                ]
                             }
                         ];
 

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css	2015-04-08 13:50:25 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css	2015-04-12 16:33:06 +0000
@@ -455,6 +455,7 @@
 .ns-menu-item-image,
 .ns-menu-item-tablelayout,
 .ns-menu-item-datasource,
+.ns-menu-item-advanced,
 .ns-menu-item-scheme,
 .ns-menu-item-selected,
 .ns-menu-item-unselected {
@@ -470,6 +471,9 @@
 .ns-menu-item-datasource {
     background-image:url('../images/dl_datasource.png');
 }
+.ns-menu-item-advanced {
+    background-image:url('../images/dl_advanced.png');
+}
 .ns-menu-item-scheme {
     background-image:url('../images/dl_scheme.png');
 }