dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10548
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-04-15 15:10:29 +0700
message:
  reverted back jsonProgramMeta.vm
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.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-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.vm	2013-04-15 07:46:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.vm	2013-04-15 08:10:29 +0000
@@ -3,15 +3,27 @@
 #set( $psize = $programs.size() )
 #foreach( $program in $programs )
 "${program.id}":{
-"name":"$encoder.jsonEncode( ${program.displayName} )",
-"description":"$encoder.jsonEncode( ${program.description} )",
-"enrollmentDescription":"$encoder.jsonEncode( ${program.dateOfEnrollmentDescription} )",
-"incidentDescription":"$encoder.jsonEncode( ${program.dateOfIncidentDescription} )",
-"programStages":[#set( $pssize = $program.programStages.size() )
-#foreach( $ps in $program.programStages )
-{ "id": "${ps.id}", "name": "$encoder.jsonEncode( ${ps.displayName} )", "reportDateDescription": "$encoder.jsonEncode( ${ps.reportDateDescription} )" }#if( $velocityCount < $pssize ),#end
-#end],
-"programAssociations": $programAssociations.get(${program.id})
+    "name":"$encoder.jsonEncode( ${program.displayName} )",
+    "description":"$encoder.jsonEncode( ${program.description} )",
+    "enrollmentDescription":"$encoder.jsonEncode( ${program.dateOfEnrollmentDescription} )",
+    "incidentDescription":"$encoder.jsonEncode( ${program.dateOfIncidentDescription} )",
+    "type": "$!program.type",
+    "blockEntryForm": $!program.blockEntryForm,
+    "remindCompleted": $!program.remindCompleted,
+    "programStages":[#set( $pssize = $program.programStages.size() )
+    #foreach( $ps in $program.programStages )
+    {
+        "id": "${ps.id}",
+        "uid": "$encoder.jsonEncode( $!ps.uid )",
+        "name": "$encoder.jsonEncode( ${ps.displayName} )",
+        "reportDateDescription": "$encoder.jsonEncode( ${ps.reportDateDescription} )",
+        "irregular": $!ps.irregular,
+        "displayGenerateEventBox": $!ps.displayGenerateEventBox,
+        "validCompleteOnly": $!ps.validCompleteOnly,
+        "captureCoordinates": $!ps.captureCoordinates
+    }#if( $velocityCount < $pssize ),#end
+    #end],
+    "programAssociations": $programAssociations.get(${program.id})
 }#if( $velocityCount < $psize ),#end
 #end }
 }}