dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 208
committer: Jan Henrik Overland janhenrik.overland@xxxxxxxxx
branch nick: trunk
timestamp: Mon 2009-04-20 20:49:25 +0200
message:
  Minor bugs fixed.
modified:
  gis/dhis-web-mapping/src/main/webapp/demos/geostat/geostat.js
  gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Choropleth.js
  gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Mapping.js

=== modified file 'gis/dhis-web-mapping/src/main/webapp/demos/geostat/geostat.js'
--- gis/dhis-web-mapping/src/main/webapp/demos/geostat/geostat.js	2009-04-20 17:49:20 +0000
+++ gis/dhis-web-mapping/src/main/webapp/demos/geostat/geostat.js	2009-04-20 18:49:25 +0000
@@ -133,8 +133,8 @@
                     var level1 = Ext.getCmp('newmap_cb').getValue();
                     var level2 = Ext.getCmp('organisationunitlevel_cb').getValue();
                     var orgunit = Ext.getCmp('organisationunit_cb').getValue();
-                    
-                    if (level1 >= level2)
+
+                    if (level1 >= level2) // CURRENTLY NOT WORKING BECAUSE OF valuefield: 'id'
                     {
                         organisationUnitLevelComboBox.reset();
                         
@@ -181,7 +181,7 @@
     });
     
     var editNameColumnTextField = new Ext.form.TextField({
-        id: 'editcolumn_tf',
+        id: 'editnamecolumn_tf',
         emptyText: 'Required',
         width: combo_width
     });
@@ -311,12 +311,38 @@
                 Ext.MessageBox.alert('Error', 'Form is not complete');
                 return;
             }
-            
+/*            
+            Ext.Ajax.request(
+            {
+                url: path + 'getMapByMapLayerPath' + type,
+                method: 'GET',
+                params: { mapLayerPath: em },
+
+                success: function( responseObject )
+                {
+                    Ext.Msg.show({
+                        title:'Register shapefiles',
+                        msg: '<p style="padding-top:8px">The map <b>' + mlp + '</b> was successfully updated!</b></p>',
+                        buttons: Ext.Msg.OK,
+                        animEl: 'elId',
+                        minWidth: 400,
+                        icon: Ext.MessageBox.INFO
+                    });
+                    
+                    Ext.getCmp('map_cb').getStore().reload();
+                    Ext.getCmp('maps_cb').getStore().reload();
+                },
+                failure: function()
+                {
+                    alert( 'Status', 'Error while saving data' );
+                }
+            });
+*/            
             Ext.Ajax.request(
             {
                 url: path + 'addOrUpdateMap' + type,
                 method: 'GET',
-                params: { mapLayerPath: mlp, organisationUnitId: oui, organisationUnitLevelId: ouli, uniqueColumn: uc, nameColumn: nc,
+                params: { mapLayerPath: em, organisationUnitId: oui, organisationUnitLevelId: ouli, uniqueColumn: uc, nameColumn: nc,
                           longitude: lon, latitude: lat, zoom: zoom},
 
                 success: function( responseObject )
@@ -944,7 +970,7 @@
     {
         url: path + 'getMapByMapLayerPath' + type,
         method: 'GET',
-        params: { mapLayerPath: 'who:Indian_state', format: 'json' },
+        params: { mapLayerPath: choropleth.currentUrl, format: 'json' },
 
         success: function( responseObject )
         {

=== 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-04-20 17:49:20 +0000
+++ gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Choropleth.js	2009-04-20 18:49:25 +0000
@@ -139,6 +139,8 @@
      
     newUrl : false,
     
+    currentUrl : false,
+    
     initComponent : function() {
     
         indicatorGroupStore = new Ext.data.JsonStore({
@@ -493,9 +495,9 @@
         }
         
         if (this.newUrl) {
-            var url = this.newUrl;
+            this.currentUrl = this.newUrl;
             this.newUrl = false;
-            this.setUrl('../../../geoserver/wfs?request=GetFeature&typename=' + url + '&outputformat=json&version=1.0.0');
+            this.setUrl('../../../geoserver/wfs?request=GetFeature&typename=' + this.currentUrl + '&outputformat=json&version=1.0.0');
         }
         
         if (!Ext.getCmp('indicator_cb').getValue() ||

=== modified file 'gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Mapping.js'
--- gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Mapping.js	2009-04-20 16:49:17 +0000
+++ gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Mapping.js	2009-04-20 18:49:25 +0000
@@ -139,6 +139,8 @@
      
     newUrl : false,
     
+    currentUrl : false,
+    
     initComponent : function() {
     
         mapStore = new Ext.data.JsonStore({
@@ -189,7 +191,8 @@
                 triggerAction: 'all',
                 emptyText: 'Required',
                 selectOnFocus: true,
-                width: 125,
+                width: 133,
+                minListWidth: combo_width + 26,
                 store: mapStore,
                 listeners: {
                     'select': {
@@ -298,9 +301,9 @@
         }
         
         if (this.newUrl) {
-            var url = this.newUrl;
+            this.currentUrl = this.newUrl;
             this.newUrl = false;
-            this.setUrl('../../../geoserver/wfs?request=GetFeature&typename=' + url + '&outputformat=json&version=1.0.0');
+            this.setUrl('../../../geoserver/wfs?request=GetFeature&typename=' + this.currentUrl + '&outputformat=json&version=1.0.0');
         }
         
         if (!Ext.getCmp('maps_cb').getValue()) {



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