dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 396
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-06-25 13:18:23 +0200
message:
  Added polygonCoordinates property to organisationunit. Impl function for retrieveing plygon shapefiles dynamically. Can be accessed at getPolygonShapefile.action?level=X.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java
  dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm
  gis/dhis-web-mapping/pom.xml
  gis/dhis-web-mapping/src/main/resources/xwork.xml
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMap.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapViews.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriodTypes.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriods.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm
  gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMaps.vm

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2009-06-16 15:14:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java	2009-06-25 11:18:23 +0000
@@ -65,7 +65,7 @@
 
     private String comment;
     
-    private String geoCode;
+    private String polygonCoordinates;
     
     private String latitude;
     
@@ -136,6 +136,11 @@
         return latitude != null && latitude.trim().length() > 0 && longitude != null && longitude.trim().length() > 0;
     }
     
+    public boolean hasPolygonCoordinates()
+    {
+        return polygonCoordinates != null && polygonCoordinates.trim().length() > 0;
+    }
+    
     // -------------------------------------------------------------------------
     // hashCode, equals and toString
     // -------------------------------------------------------------------------
@@ -299,14 +304,14 @@
         this.comment = comment;
     }
 
-    public String getGeoCode()
+    public String getPolygonCoordinates()
     {
-        return geoCode;
+        return polygonCoordinates;
     }
 
-    public void setGeoCode( String geoCode )
+    public void setPolygonCoordinates( String polygonCoordinates )
     {
-        this.geoCode = geoCode;
+        this.polygonCoordinates = polygonCoordinates;
     }
 
     public String getLatitude()

=== modified file 'dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2009-06-16 15:14:25 +0000
+++ dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml	2009-06-25 11:18:23 +0000
@@ -43,7 +43,7 @@
 		
     <property name="comment" length="360"/>
     
-    <property name="geoCode"/>
+    <property name="polygonCoordinates" type="text"/>
     
     <property name="latitude"/>
       

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java	2009-06-16 15:14:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java	2009-06-25 11:18:23 +0000
@@ -115,13 +115,13 @@
         this.comment = comment;
     }
     
-    private String geoCode;
+    private String polygonCoordinates;
 
-    public void setGeoCode( String geoCode )
+    public void setPolygonCoordinates( String polygonCoordinates )
     {
-        this.geoCode = geoCode;
+        this.polygonCoordinates = polygonCoordinates;
     }
-    
+
     private String latitude;
 
     public void setLatitude( String latitude )
@@ -186,7 +186,7 @@
             code, date, null, true, comment );
         
         organisationUnit.setType( type );
-        organisationUnit.setGeoCode( geoCode );
+        organisationUnit.setPolygonCoordinates( polygonCoordinates );
         organisationUnit.setLatitude( latitude );
         organisationUnit.setLongitude( longitude );
         organisationUnit.setUrl( url );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java	2009-06-16 15:14:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java	2009-06-25 11:18:23 +0000
@@ -127,13 +127,13 @@
         this.comment = comment;
     }
 
-    private String geoCode;
+    private String polygonCoordinates;
 
-    public void setGeoCode( String geoCode )
+    public void setPolygonCoordinates( String polygonCoordinates )
     {
-        this.geoCode = geoCode;
+        this.polygonCoordinates = polygonCoordinates;
     }
-    
+
     private String latitude;
 
     public void setLatitude( String latitude )
@@ -195,7 +195,7 @@
         organisationUnit.setClosedDate( cDate );
         organisationUnit.setType( type );
         organisationUnit.setComment( comment );
-        organisationUnit.setGeoCode( geoCode );
+        organisationUnit.setPolygonCoordinates( polygonCoordinates );
         organisationUnit.setLatitude( latitude );
         organisationUnit.setLongitude( longitude );
         organisationUnit.setUrl( url );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2009-06-16 15:14:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties	2009-06-25 11:18:23 +0000
@@ -108,4 +108,4 @@
 latitude											= Latitude
 longitude											= Longitude
 type												= Type
-geo_code											= Geo code
+polygon_coordinates									= Polygon coordinates

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm	2009-06-16 15:14:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm	2009-06-25 11:18:23 +0000
@@ -37,11 +37,11 @@
     </tr>
 	<tr>
 		<td><label for="comment">$i18n.getString( "comment" )</label></td>
-		<td><textarea id="comment" name="comment" style="width:20em; height:5em" rows="5" cols="20"></textarea></td>
+		<td><textarea id="comment" name="comment" style="width:20em; height:5em"></textarea></td>
 	</tr>
     <tr>
-        <td><label for="geoCode">$i18n.getString( "geo_code" )</label></td>
-        <td><input type="text" id="geoCode" name="geoCode" style="width:20em"></td>
+        <td><label for="polygonCoordinates">$i18n.getString( "polygon_coordinates" )</label></td>
+        <td><textarea id="polygonCoordinates" name="polygonCoordinates" style="width:20em; height:5em"></textarea></td>
     </tr>
     <tr>
         <td><label for="latitude">$i18n.getString( "latitude" )</label></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2009-06-16 15:14:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm	2009-06-25 11:18:23 +0000
@@ -58,8 +58,8 @@
 		<td><textarea id="comment" name="comment" style="width:20em; height:5em">$!encoder.htmlEncode( $organisationUnit.comment )</textarea></td>
 	</tr>
     <tr>
-        <td><label for="geoCode">$i18n.getString( "geo_code" )</label></td>
-        <td><input type="text" id="geoCode" name="geoCode" value="$!encoder.htmlEncode( $organisationUnit.geoCode )" style="width:20em"></td>
+        <td><label for="polygonCoordinates">$i18n.getString( "polygon_coordinates" )</label></td>
+        <td><textarea id="polygonCoordinates" name="polygonCoordinates" value="$!encoder.htmlEncode( $organisationUnit.polygonCoordinates )" style="width:20em; height:5em"></td>
     </tr>
     <tr>
         <td><label for="latitude">$i18n.getString( "latitude" )</label></td>

=== modified file 'gis/dhis-web-mapping/pom.xml'
--- gis/dhis-web-mapping/pom.xml	2009-06-19 18:32:35 +0000
+++ gis/dhis-web-mapping/pom.xml	2009-06-25 11:18:23 +0000
@@ -39,6 +39,10 @@
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-service-reporting</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-user-hibernate</artifactId>
     </dependency>
     <dependency>

=== modified file 'gis/dhis-web-mapping/src/main/resources/xwork.xml'
--- gis/dhis-web-mapping/src/main/resources/xwork.xml	2009-06-16 14:40:57 +0000
+++ gis/dhis-web-mapping/src/main/resources/xwork.xml	2009-06-25 11:18:23 +0000
@@ -141,5 +141,9 @@
       <result name="success" type="velocity-json">/dhis-web-mapping/pointShapefile.vm</result>
     </action>
       
+    <action name="getPolygonShapefile" class="org.hisp.dhis.mapping.action.GetOrganisationUnitsWithCoordinatesAction">
+      <result name="success" type="velocity-json">/dhis-web-mapping/pointShapefile.vm</result>
+    </action>
+      
   </package>
 </xwork>

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm	2009-04-17 21:35:32 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm	2009-06-25 11:18:23 +0000
@@ -1,10 +1,10 @@
 { "mapvalues": [
 #foreach( $value in $object )
   {
-    "organisationUnitId": $!{value.organisationUnitId},
+    "organisationUnitId": "$!{value.organisationUnitId}",
     "geoCode": "$!{value.geoCode}",
     "orgUnit": "$!{value.organisationUnitName}",
-    "value": $!{value.value}
+    "value": "$!{value.value}"
   },
 #end
 ] }
\ No newline at end of file

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm	2009-04-20 16:24:17 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm	2009-06-25 11:18:23 +0000
@@ -2,8 +2,8 @@
 { "indicatorGroups": [
 #foreach( $indicatorGroup in $object )
   {
-    "id": $!{indicatorGroup.id},
-    "name": "$!encoder.jsEncode( ${indicatorGroup.name} )",
+    "id": "$!{indicatorGroup.id}",
+    "name": "$!encoder.jsEncode( ${indicatorGroup.name} )"
   }#if( $velocityCount < $size ),#end
 #end
 ] }
\ No newline at end of file

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMap.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMap.vm	2009-04-28 14:23:39 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMap.vm	2009-06-25 11:18:23 +0000
@@ -1,6 +1,6 @@
 { "map": 
   [{
-    "id": $!{object.id},
+    "id": "$!{object.id}",
     "name": "$!encoder.jsEncode( ${object.name} )",
     "mapLayerPath": "$!encoder.jsEncode( ${object.mapLayerPath} )",
     "organisationUnit": "$!encoder.jsEncode( ${object.organisationUnit.name} )",
@@ -9,6 +9,6 @@
     "nameColumn": "$!encoder.jsEncode( ${object.nameColumn} )",
     "longitude": "$!encoder.jsEncode( ${object.longitude} )",
     "latitude": "$!encoder.jsEncode( ${object.latitude} )",
-    "zoom": $!{object.zoom}
+    "zoom": "$!{object.zoom}"
   }]
 }
\ No newline at end of file

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm	2009-04-20 16:24:17 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm	2009-06-25 11:18:23 +0000
@@ -2,7 +2,7 @@
 { "mapOrganisationUnitRelations": [
 #foreach( $mapOrganisationUnitRelation in $object )
   {
-    "id": $!{mapOrganisationUnitRelation.id},
+    "id": "$!{mapOrganisationUnitRelation.id}",
     "map": "$!encoder.jsEncode( ${mapOrganisationUnitRelation.map.mapLayerPath} )",
     "organisationUnit": "$!encoder.jsEncode( ${mapOrganisationUnitRelation.organisationUnit.name} )",
     "organisationUnitId": $!{mapOrganisationUnitRelation.organisationUnit.id},

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm	2009-05-27 13:20:03 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm	2009-06-25 11:18:23 +0000
@@ -1,6 +1,6 @@
 { "mapView": 
   [{
-    "id": $!{object.id},
+    "id": "$!{object.id}",
     "name": "$!encoder.jsEncode( ${object.name} )",
     "indicatorGroupId": $!{object.indicatorGroup.id},
     "indicatorId": $!{object.indicator.id},

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapViews.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapViews.vm	2009-05-27 10:26:48 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapViews.vm	2009-06-25 11:18:23 +0000
@@ -2,7 +2,7 @@
 { "mapViews": [
 #foreach( $mapView in $object )
   {
-    "id": $!{mapView.id},
+    "id": "$!{mapView.id}",
     "name": "$!encoder.jsEncode( ${mapView.name} )",
     "indicatorGroupId": $!{mapView.indicatorGroup.id},
     "indicatorId": $!{mapView.indicator.id},

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm	2009-04-20 16:24:17 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm	2009-06-25 11:18:23 +0000
@@ -2,8 +2,8 @@
 { "organisationUnitLevels": [
 #foreach ( $level in $object )
   {
-    "id": $!{level.id},
-    "level": $!{level.level},
+    "id": "$!{level.id}",
+    "level": "$!{level.level}",
     "name": "$!encoder.jsEncode( ${level.name} )"
   }#if( $velocityCount < $size ),#end
 #end

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm	2009-04-20 16:24:17 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm	2009-06-25 11:18:23 +0000
@@ -2,7 +2,7 @@
 { "organisationUnits": [
 #foreach ( $unit in $object )
   {
-    "id": $!{unit.id},
+    "id": "$!{unit.id}",
     "name": "$!encoder.jsEncode( ${unit.name} )",
     "shortName": "$!encoder.jsEncode( ${unit.shortName} )",
     "code": "$!encoder.jsEncode( ${unit.code} )",

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriodTypes.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriodTypes.vm	2009-04-20 16:24:17 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriodTypes.vm	2009-06-25 11:18:23 +0000
@@ -2,7 +2,7 @@
 { "periodTypes": [
 #foreach( $periodType in $object )
   {
-    "id": $!{periodType.id},
+    "id": "$!{periodType.id}",
     "name": "$!encoder.jsEncode( ${periodType.name} )"
   }#if( $velocityCount < $size ),#end
 #end

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriods.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriods.vm	2009-04-23 21:12:33 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriods.vm	2009-06-25 11:18:23 +0000
@@ -2,7 +2,7 @@
 { "periods": [
 #foreach( $period in $object )
   {
-    "id": $!{period.id},
+    "id": "$!{period.id}",
     "startDate": "$!format.formatDate( ${period.startDate} )",
     "endDate": "$!format.formatDate( ${period.endDate} )",
     "name": "$!encoder.jsEncode( ${period.name} )"

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm	2009-05-29 15:39:03 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm	2009-06-25 11:18:23 +0000
@@ -2,9 +2,9 @@
 { "indicators": [
 #foreach( $indicator in $object )
   {
-    "id": $!{indicator.id},
+    "id": "$!{indicator.id}",
     "name": "$!encoder.jsEncode( ${indicator.name} )",
-    "shortName": "$!encoder.jsEncode( ${indicator.shortName} )",
+    "shortName": "$!encoder.jsEncode( ${indicator.shortName} )"
   }#if( $velocityCount < $size ),#end
 #end
 ] }
\ No newline at end of file

=== modified file 'gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm'
--- gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm	2009-05-27 10:26:48 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm	2009-06-25 11:18:23 +0000
@@ -3,7 +3,7 @@
 #foreach( $mapView in $object )
   {
     "id": $!{mapView.id},
-    "name": "$!encoder.jsEncode( ${mapView.name} )",
+    "name": "$!encoder.jsEncode( ${mapView.name} )"
   }#if( $velocityCount < $size ),#end
 #end
 ] }
\ No newline at end of file

=== 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-23 13:08:41 +0000
+++ gis/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMaps.vm	2009-06-25 11:18:23 +0000
@@ -2,10 +2,10 @@
 { "maps": [
 #foreach( $map in $object )
   {
-    "id": $!{map.id},
+    "id": "$!{map.id}",
     "name": "$!encoder.jsEncode( ${map.name} )",
     "mapLayerPath": "$!encoder.jsEncode( ${map.mapLayerPath} )",
-    "organisationUnitLevel": $!{map.organisationUnitLevel.level}
+    "organisationUnitLevel": "$!{map.organisationUnitLevel.level}"
   }#if( $velocityCount < $size ),#end
 #end
 ] }
\ No newline at end of file



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