dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 207
committer: Jan Henrik Overland janhenrik.overland@xxxxxxxxx
branch nick: trunk
timestamp: Mon 2009-04-20 19:49:20 +0200
message:
  Json and combobox bugs fixed.
modified:
  gis/dhis-web-mapping/src/main/webapp/demos/geostat/geostat.js
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMaps.vm
  gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Choropleth.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 16:49:17 +0000
+++ gis/dhis-web-mapping/src/main/webapp/demos/geostat/geostat.js	2009-04-20 17:49:20 +0000
@@ -117,7 +117,7 @@
         fieldLabel: 'Level',
         typeAhead: true,
         editable: false,
-        valueField: 'level',
+        valueField: 'id',
         displayField: 'name',
         emptyText: 'Required',
         mode: 'remote',
@@ -140,7 +140,7 @@
                         
                         Ext.Msg.show({
                         title:'Register shapefiles',
-                        msg: '<p style="padding-top:8px">' + orgunit + ' must be devided into a lower level than itself!</p>',
+                        msg: '<p style="padding-top:8px">The organisation unit selected above must be devided into a lower level than itself.</p>',
                         buttons: Ext.Msg.OK,
                         animEl: 'elId',
                         maxWidth: 300,

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMaps.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMaps.vm	2009-04-20 16:24:17 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMaps.vm	2009-04-20 17:49:20 +0000
@@ -7,3 +7,4 @@
     "organisationUnitLevel": $!{map.organisationUnitLevel.level}
   }#if( $velocityCount < $size ),#end
 #end
+] }
\ No newline at end of file

=== 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 16:49:17 +0000
+++ gis/dhis-web-mapping/src/main/webapp/mfbase/mapfish/widgets/geostat/Choropleth.js	2009-04-20 17:49:20 +0000
@@ -237,7 +237,7 @@
             mode: 'remote',
             forceSelection: true,
             triggerAction: 'all',
-            emptyText: 'Select indicator',
+            emptyText: 'Required',
             selectOnFocus: true,
             width: combo_width,
             store: indicatorStore,
@@ -266,7 +266,7 @@
             mode: 'remote',
             forceSelection: true,
             triggerAction: 'all',
-            emptyText: 'Select period type',
+            emptyText: 'Required',
             selectOnFocus: true,
             width: combo_width,
             store: periodTypeStore,
@@ -294,7 +294,7 @@
             mode: 'remote',
             forceSelection: true,
             triggerAction: 'all',
-            emptyText: 'Select period',
+            emptyText: 'Required',
             selectOnFocus: true,
             width: combo_width,
             store: periodStore
@@ -356,7 +356,7 @@
             mode: 'remote',
             forceSelection: true,
             triggerAction: 'all',
-            emptyText: 'Select legend',
+            emptyText: 'Optional',
             selectOnFocus: true,
             width: combo_width,
             store: legendStore,



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