=== 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 ]