dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 4404 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-08-20 23:59:17 +0200
message:
  (GIS) More mapview management improvements.
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


--
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 19:52:17 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/global.js	2011-08-20 20:36:57 +0000
@@ -59,6 +59,10 @@
 	
 //	DHIS variables
 
+    map_widget_choropleth: 'choropleth',
+    map_widget_point: 'point',
+    map_widget_symbol: 'symbol',
+    map_widget_centroid: 'centroid',    
 	map_source_type_database: 'database',
 	map_source_type_geojson: 'geojson',
 	map_source_type_shapefile: 'shapefile',

=== 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 19:15:25 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js	2011-08-20 20:36:57 +0000
@@ -463,7 +463,7 @@
 		layout: 'fit',
         closeAction: 'hide',
 		width: G.conf.window_width,
-        height: 205,
+        height: 230,
         items: [
             {
                 xtype: 'form',
@@ -481,6 +481,27 @@
                         autoCreate: {tag: 'input', type: 'text', size: '20', autocomplete: 'off', maxlength: '255'}
                     },
                     {
+                        xtype: 'combo',
+                        id: 'favoritelayer_cb',
+                        fieldLabel: G.i18n.layer,
+                        labelSeparator: G.conf.labelseparator,
+                        editable: false,
+                        valueField: 'id',
+                        displayField: 'name',
+                        width: G.conf.combo_width_fieldset,
+                        minListWidth: G.conf.combo_width_fieldset,
+                        mode: 'local',
+                        triggerAction: 'all',
+                        value: G.conf.map_widget_choropleth,
+                        store: new Ext.data.ArrayStore({
+                            fields: ['id', 'name'],
+                            data: [
+                                [G.conf.map_widget_choropleth, G.conf.thematic_layer_1],
+                                [G.conf.map_widget_point, G.conf.thematic_layer_2]
+                            ]
+                        })
+                    },
+                    {
                         xtype: 'checkbox',
                         id: 'favoritesystem_chb',
                         disabled: !G.user.isAdmin,
@@ -506,7 +527,7 @@
                         selectOnFocus: true,
                         width: G.conf.combo_width_fieldset,
                         listWidth: 'auto',
-                        store:G.stores.mapView
+                        store: G.stores.mapView
                     }
                 ]
             }
@@ -525,22 +546,15 @@
 						Ext.message.msg(false, G.i18n.form_is_not_complete);
 						return;
 					}
-                    
-                    var params;                    
-                    
-                    if (G.vars.activePanel.isPolygon()) {
-                        if (!choropleth.formValidation.validateForm.apply(choropleth, [true])) {
-                            return;
-                        }
-                        params = choropleth.formValues.getAllValues.call(choropleth);
-                    }
-                    else if (G.vars.activePanel.isPoint()) {
-                        if (!point.formValidation.validateForm.apply(point, [true])) {
-                            return;
-                        }
-                        params = point.formValues.getAllValues.call(point);
-                    }
-                    
+                    var widget = Ext.getCmp('favoritelayer_cb').getValue() == G.conf.map_widget_choropleth ?
+                        choropleth : point;
+                    
+                    if (!widget.layer.features.length) {
+						Ext.message.msg(false, '<span class="x-msg-hl">' + widget.layer.name + '</span> is empty');
+						return;
+                    }   
+                    
+                    var params = widget.formValues.getAllValues.call(widget);                    
                     params.name = vn;
                     params.system = Ext.getCmp('favoritesystem_chb').getValue();
                     
@@ -630,7 +644,14 @@
 					});
 				}
             }
-        ]
+        ],
+        listeners: {
+            'show': function() {
+                if (!polygonLayer.visibility && pointLayer.visibility) {
+                    Ext.getCmp('favoritelayer_cb').setValue(G.conf.map_widget_point);
+                }
+            }
+        }
     });
 	
 	/* Section: export map */