dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12595
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-10-12 21:19:28 +0700
message:
  Fixed bug - when creating a new event, the report-date description is displayed as underfined.
modified:
  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/jsonTabularReport.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.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/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
-							<option value="$programStage.uid" localid='$programStage.id' prevStageId='$prevStageId'
-								standardInterval='$standardInterval' selected repeatable="true">$!programStage.displayName</option>
+							<option value="$programStage.uid" 
+							localid='$programStage.id' 
+							prevStageId='$prevStageId'
+							standardInterval='$standardInterval' 
+							selected repeatable="true"
+							allowGenerateNextVisit='$allowGenerateNextVisit' 
+							programType = '$programStage.program.type'
+							reportDateDes='$programStage.reportDateDescription'
+							repeatable="false"
+							openAfterEnrollment="$programStage.openAfterEnrollment"
+							reportDateToUse="$reportDateToUse"
+							>$!programStage.displayName</option>
 						#else
 							#set($hasEvent="false")
 							#foreach( $programStageInstance in $programInstance.programStageInstances )
@@ -106,8 +116,10 @@
 							#end
 							<option 
 								#if($hasEvent=="true") style="display:none;" #else selected #end 
-								value="$programStage.uid" localid='$programStage.id' prevStageId='$prevStageId'
-								standardInterval='$programStage.minDaysFromStart' allowGenerateNextVisit='$allowGenerateNextVisit' 
+								value="$programStage.uid" localid='$programStage.id' 
+								prevStageId='$prevStageId'
+								standardInterval='$programStage.minDaysFromStart' 
+								allowGenerateNextVisit='$allowGenerateNextVisit' 
 								programType = '$programStage.program.type'
 								reportDateDes='$programStage.reportDateDescription'
 								repeatable="false"
@@ -169,10 +181,6 @@
 		else{
 			jQuery("[name=newEncounterBtn]").addClass("show-new-event");
 		}
-		
-		if( jQuery('.stage-object').length > 0 ){
-			disable( 'newEncounterBtn_$programInstance.id' );
-		}
 		resize();
 	});