← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #26363

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13065: (PT, DV, GIS) Using hasChildren to define leaf nodes.

  Thread Previous • Date Previous • • Thread Next 
Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13065 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-11-29 12:54:07 +0100
message:
  (PT, DV, GIS) Using hasChildren to define leaf nodes.
added:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/leaf.gif
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/leaf.gif
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/leaf.gif
modified:
  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/styles/style.css
  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/styles/style.css
  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/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-mapping/src/main/webapp/dhis-web-mapping/app/images/leaf.gif'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/leaf.gif	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/images/leaf.gif	2013-11-29 11:52:49 +0000 differ
=== 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-11-21 08:50:57 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-11-29 11:52:49 +0000
@@ -3473,6 +3473,13 @@
 					id: gis.conf.finals.root.id,
 					expanded: true,
 					children: gis.init.rootNodes
+				},
+				listeners: {
+					load: function(store, node, records) {
+						Ext.Array.each(records, function(record) {
+							record.set('leaf', !record.raw.hasChildren);
+						});
+					}
 				}
 			}),
 			xable: function(values) {
@@ -4808,6 +4815,13 @@
 					id: gis.conf.finals.root.id,
 					expanded: true,
 					children: gis.init.rootNodes
+				},
+				listeners: {
+					load: function(store, node, records) {
+						Ext.Array.each(records, function(record) {
+							record.set('leaf', !record.raw.hasChildren);
+						});
+					}
 				}
 			}),
 			xable: function(values) {
@@ -5665,6 +5679,13 @@
 					id: gis.conf.finals.root.id,
 					expanded: true,
 					children: gis.init.rootNodes
+				},
+				listeners: {
+					load: function(store, node, records) {
+						Ext.Array.each(records, function(record) {
+							record.set('leaf', !record.raw.hasChildren);
+						});
+					}
 				}
 			}),
 			xable: function(values) {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css	2013-10-16 13:47:40 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/styles/style.css	2013-11-29 11:52:49 +0000
@@ -567,6 +567,16 @@
 
 
 /*----------------------------------------------------------------------------
+ * Treepanel
+ *--------------------------------------------------------------------------*/
+
+
+.x-tree-icon-leaf {
+	background-image: url('../images/leaf.gif');
+}
+
+
+/*----------------------------------------------------------------------------
  * GIS Treepanel
  *--------------------------------------------------------------------------*/
 

=== added file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/leaf.gif'
Binary files dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/leaf.gif	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/images/leaf.gif	2013-11-29 11:52:49 +0000 differ
=== 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	2013-11-27 17:04:27 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-11-29 11:52:49 +0000
@@ -3811,6 +3811,13 @@
 					id: ns.core.conf.finals.root.id,
 					expanded: true,
 					children: ns.core.init.rootNodes
+				},
+				listeners: {
+					load: function(store, node, records) {
+						Ext.Array.each(records, function(record) {
+							record.set('leaf', !record.raw.hasChildren);
+						});
+					}
 				}
 			}),
 			xable: function(values) {

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2013-10-30 18:55:35 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/styles/style.css	2013-11-29 11:52:49 +0000
@@ -826,6 +826,16 @@
 
 
 /*----------------------------------------------------------------------------
+ * Treepanel
+ *--------------------------------------------------------------------------*/
+
+
+.x-tree-icon-leaf {
+	background-image: url('../images/leaf.gif');
+}
+
+
+/*----------------------------------------------------------------------------
  * PT Treepanel
  *--------------------------------------------------------------------------*/
 

=== added file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/leaf.gif'
Binary files dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/leaf.gif	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/images/leaf.gif	2013-11-29 11:52:49 +0000 differ
=== 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	2013-11-27 17:04:27 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-11-29 11:52:49 +0000
@@ -3628,6 +3628,13 @@
 					id: ns.core.conf.finals.root.id,
 					expanded: true,
 					children: ns.core.init.rootNodes
+				},
+				listeners: {
+					load: function(store, node, records) {
+						Ext.Array.each(records, function(record) {
+							record.set('leaf', !record.raw.hasChildren);
+						});
+					}
 				}
 			}),
 			xable: function(values) {

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css	2013-11-27 13:16:08 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/styles/style.css	2013-11-29 11:52:49 +0000
@@ -688,6 +688,16 @@
 
 
 /*----------------------------------------------------------------------------
+ * Treepanel
+ *--------------------------------------------------------------------------*/
+
+
+.x-tree-icon-leaf {
+	background-image: url('../images/leaf.gif');
+}
+
+
+/*----------------------------------------------------------------------------
  * DV Treepanel
  *--------------------------------------------------------------------------*/
  Thread Previous • Date Previous • • Thread Next