dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4145
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-07-14 15:50:46 +0200
message:
  extended jsonOU with more information
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnits.vm


--
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-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnits.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnits.vm	2011-05-16 14:21:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnits.vm	2011-07-14 13:50:46 +0000
@@ -6,7 +6,14 @@
     "name": "$!encoder.jsonEncode( ${unit.name} )",
     "shortName": "$!encoder.jsonEncode( ${unit.shortName} )",
     "code": "$!encoder.jsonEncode( ${unit.code} )",
-    "hasChildrenWithCoordinates": $!{unit.hasChildrenWithCoordinates()}
+    "openingDate": "$!encoder.jsonEncode( ${unit.openingDate.toString()} )",
+    "closedDate": "$!encoder.jsonEncode( ${unit.closedDate.toString()} )",
+    "lastUpdated": "$!encoder.jsonEncode( ${unit.lastUpdated.toString()} )",
+    "active": ${unit.active},
+    "hasChildrenWithCoordinates": $!{unit.hasChildrenWithCoordinates()},
+    "groups": [ #foreach( $group in $unit.groups )${group.id}#if( $velocityCount < $unit.groups.size() ),#end#end ],
+    "dataSets": [ #foreach( $dataSet in $unit.dataSets )${dataSet.id}#if( $velocityCount < $unit.dataSets.size() ),#end#end ],
+    "users": [ #foreach( $user in $unit.users )${user.id}#if( $velocityCount < $unit.users.size() ),#end#end ]
   }#if( $velocityCount < $size ),#end
 #end
 ]