dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4409 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-08-21 15:48:07 +0200
message:
  History bug fixed + Mapview from dashboard -> layer 1.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.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/mapping/javascript/global.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2011-08-20 21:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2011-08-21 13:46:00 +0000
@@ -523,7 +523,7 @@
                         iconCls: 'icon-thematic1',
                         hideLabel: true,
                         handler: function() {
-                            G.util.mapView.prepare.call(choropleth, id);
+                            G.util.mapView.mapView.call(choropleth, id);
                             Ext.getCmp('mapviewlayer_w').destroy();
                         }
                     },
@@ -532,7 +532,7 @@
                         iconCls: 'icon-thematic2',
                         hideLabel: true,
                         handler: function() {
-                            G.util.mapView.prepare.call(point, id);
+                            G.util.mapView.mapView.call(point, id);
                             Ext.getCmp('mapviewlayer_w').destroy();
                         }
                     }
@@ -544,27 +544,27 @@
             w.show();
         },
         
-        prepare: function(id) {
-            
+        mapView: function(id) {
+            var store = G.stores.mapView;
+            if (!store.isLoaded) {
+                store.load({scope: this, callback: function() {
+                    var mapView = store.getAt(store.find('id', id)).data;
+                    G.util.mapView.launch.call(this, mapView);
+                }});
+            }
+            else {
+                var mapView = store.getAt(store.find('id', id)).data;
+                G.util.mapView.launch.call(this, mapView);
+            }
+        },
+        
+        launch: function(mapView) {
             if (!this.window.isShown) {
                 this.window.show();
                 this.window.hide();
             }
-            var store = G.stores.mapView;
-            if (!store.isLoaded) {
-                store.load({scope: this, callback: function() {
-                    G.util.mapView.launch.call(this, id);
-                }});
-            }
-            else {
-                G.util.mapView.launch.call(this, id);
-            }
-        },
-        
-        launch: function(id) {
-            var store = G.stores.mapView;
-            this.mapView = store.getAt(store.find('id', id)).data;
-            this.updateValues = true;
+            this.mapView = mapView;
+            this.updateValues = true;      
             
             this.legend.value = this.mapView.mapLegendType;
             this.legend.method = this.mapView.method || this.legend.method;
@@ -1057,25 +1057,11 @@
                                                     items[items.length-1].destroy();
                                                 }
                                             },
-                                            'click': function(menu, item, e) {
-                                                var mapView = item.mapView;
-                                                var scope = mapView.widget;                                            
-                                                scope.mapView = mapView;
-                                                scope.updateValues = true;
-                                                
-                                                scope.legend.value = mapView.mapLegendType;
-                                                scope.legend.method = mapView.method || scope.legend.method;
-                                                scope.legend.classes = mapView.classes || scope.legend.classes;
-                                                
-                                                G.vars.map.setCenter(new OpenLayers.LonLat(mapView.longitude, mapView.latitude), mapView.zoom);
-                                                G.system.mapDateType.value = mapView.mapDateType;
-                                                Ext.getCmp('mapdatetype_cb').setValue(G.system.mapDateType.value);
-
-                                                scope.valueType.value = mapView.mapValueType;
-                                                scope.cmp.mapValueType.setValue(scope.valueType.value);
-                                                
-                                                G.util.expandWidget(scope);                        
-                                                scope.setMapView();
+                                            'click': {
+                                                scope: this,
+                                                fn: function(menu, item) {
+                                                    G.util.mapView.launch.call(this.parentMenu.parent.widget, item.mapView);
+                                                }
                                             }
                                         }
                                     });

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-08-20 23:43:52 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-08-21 13:46:00 +0000
@@ -2929,7 +2929,7 @@
                 helpWindow.setPagePosition(c+((e-c)/2)-(helpWindow.width/2), Ext.getCmp('east').y + 100);
                 
                 if (G.vars.parameter.id) {
-                    G.util.mapView.layer(G.vars.parameter.id);
+                    G.util.mapView.mapView.call(choropleth, G.vars.parameter.id);
                     G.vars.parameter.id = null;
                 }
             }

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-08-20 21:53:24 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js	2011-08-21 13:46:00 +0000
@@ -278,7 +278,7 @@
                 'select': {
                     scope: this,
                     fn: function(cb) {
-                        G.util.mapView.prepare.call(this, cb.getValue());
+                        G.util.mapView.mapView.call(this, cb.getValue());
                     }
                 }
             }