← Back to branch summary

~registry/dhis2-academy/trunk

« back to all changes in this revision

Viewing changes to dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm

  • Committer: Abyot Asalefew Gizaw
  • Date: 2012-10-12 00:08:27 UTC
  • Revision ID: abyota@gmail.com-20121012000827-qqmmfllx0s5vtkqi
Updating the acadmy trunk with the main DHIS2 trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm
12
12
    "mapDateType": "$!encoder.jsonEncode( ${object.mapDateTypeNullSafe} )",
13
13
    "periodTypeId": "$!encoder.jsonEncode( ${object.periodType.name} )",
14
14
    "periodId": "$!{object.period.id}",
15
 
    "startDate": "$!encoder.jsonEncode( ${object.startDate} )",
16
 
    "endDate": "$!encoder.jsonEncode( ${object.endDate} )",
17
15
    "parentOrganisationUnitId": "$!{object.parentOrganisationUnit.id}",
18
16
    "parentOrganisationUnitName": "$!encoder.jsonEncode( ${object.parentOrganisationUnit.name} )",
19
17
    "parentOrganisationUnitLevel": "$!{object.parentOrganisationUnit.level}",