=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-10-11 06:50:09 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2013-10-12 14:19:28 +0000
@@ -664,7 +664,7 @@
+ 'psid="' + programStageId + '" '
+ 'psuid="' + programStageUid + '" '
+ 'psname="' + programStageName + '" '
- + 'status=3'
+ + 'status="3"'
+ 'programType="' + selectedStage.attr('programType') + '" '
+ 'reportDate="" '
+ 'reportDateDes="' + selectedStage.attr('reportDateDes') + '" '
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm 2013-10-11 15:37:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm 2013-10-12 14:19:28 +0000
@@ -45,7 +45,7 @@
"items": [
#foreach( $item in $dimensionIdentifierTypes )
{
- "id": "$item",
+ "id": "$item.uid",
"name": "",
"compulsory": "",
"valueType": #if( $iden.optionSet )
@@ -86,7 +86,7 @@
#foreach( $item in $filterIdentifierTypes )
{
- "id": "$item",
+ "id": "$item.uid",
"name": "",
"compulsory": "",
"valueType": #if( $iden.optionSet )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm 2013-09-24 11:21:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm 2013-10-12 14:19:28 +0000
@@ -86,8 +86,18 @@
#else
#set($standardInterval=0)
#end
-
+
#else
#set($hasEvent="false")
#foreach( $programStageInstance in $programInstance.programStageInstances )
@@ -106,8 +116,10 @@
#end