dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 463
committer: Jan Henrik Overland janhenrik.overland@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-07-14 13:42:08 +0200
message:
  Load mask added to thematic map.
modified:
  gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js
  gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Choropleth.js

=== modified file 'gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js'
--- gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js	2009-07-13 20:00:15 +0000
+++ gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js	2009-07-14 11:42:08 +0000
@@ -41,7 +41,6 @@
     });
 
     myMap: null;
-
     map = new OpenLayers.Map($('olmap'));
     this.myMap = map;
 
@@ -49,6 +48,8 @@
     features_choropleth = null;
     features_mapping = null;
     
+    mask = new Ext.LoadMask(Ext.getBody(), {msg:"Please wait..."});
+    
     MAPDATA = null;
     URL = null;
     ACTIVEPANEL = 'choropleth';
@@ -157,7 +158,7 @@
         })
     });
     
-    map.addLayers([ local_wfs, vmap0, choroplethLayer, static1Layer ]);
+    map.addLayers([ vmap0, local_wfs, choroplethLayer, static1Layer ]);
 
     var selectFeatureChoropleth = new OpenLayers.Control.newSelectFeature(
         choroplethLayer,
@@ -1633,6 +1634,7 @@
     {
         var center_panel = Ext.getCmp('center');
         var south_panel = Ext.getCmp('south-panel');
+alert("south_panel x = " + south_panel.x + "\n\n" + "south_panel y = " + south_panel.y);
 
         var height = 230;
         var collapsed = 48;
@@ -1836,6 +1838,8 @@
         choropleth.coreComp.updateOptions(options);
         choropleth.coreComp.applyClassification();
         choropleth.classificationApplied = true;
+        
+        mask.hide();
     }
     else
     {
@@ -1891,6 +1895,8 @@
                 choropleth.coreComp.updateOptions(options);
                 choropleth.coreComp.applyClassification();
                 choropleth.classificationApplied = true;
+                
+                mask.hide();
             },
             failure: function()
             {

=== modified file 'gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Choropleth.js'
--- gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Choropleth.js	2009-07-13 20:00:15 +0000
+++ gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Choropleth.js	2009-07-14 11:42:08 +0000
@@ -810,6 +810,8 @@
                 return;
         }
 
+Ext.msg.wait('Doing stuff...', 'Please wait');
+
         loadMapData('choropleth');
     },
 



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