dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15787
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-06-20 21:08:17 +0800
message:
  Fixed status of events in tracker UI.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstance.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstances.vm
  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/programTrackingList.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceDashboard.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.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/jsonProgramStageInstance.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstance.vm	2014-04-21 16:30:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstance.vm	2014-06-20 13:08:17 +0000
@@ -4,7 +4,7 @@
     "id": "$!programStageInstance.id",
     "dueDate": "$format.formatDate( $!programStageInstance.dueDate )",
     "executionDate": "$!format.formatDate( $programStageInstance.executionDate )",
-    "status": "$!programStageInstance.getEventStatus()",
+    "status": "$!programStageInstance.getEventStatus().getValue()",
     "completed": "$!programStageInstance.completed",
     "comment": "$!encoder.jsonEncode( $!programStageInstance.comment.commentText )",
     #if($programStageInstance.programStage.captureCoordinates)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstances.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstances.vm	2013-01-23 10:27:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstances.vm	2014-06-20 13:08:17 +0000
@@ -7,7 +7,7 @@
 		"programStageId": "$programStageInstance.programStage.id",
 		"programStageName": "$programStageInstance.programStage.displayName",
 		"dueDate": "$format.formatDate( $programStageInstance.dueDate )",
-		"status": "$programStageInstance.getEventStatus()"
+		"status": "$programStageInstance.getEventStatus().getValue()"
 	  }#if( $velocityCount < $size ),#end
 	#end]
 }
\ No newline at end of file

=== 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	2014-06-10 10:06:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm	2014-06-20 13:08:17 +0000
@@ -34,7 +34,7 @@
 								psid="$programStageInstance.programStage.id"
 								psuid="$programStageInstance.programStage.uid"
 								psname="$programStageInstance.programStage.displayName"
-								status="$programStageInstance.getEventStatus()"
+								status="$programStageInstance.getEventStatus().getValue()"
 								programType='$programInstance.program.type'
 								reportDate="$!format.formatDate( $!programStageInstance.executionDate )"
 								reportDateDes="$programStageInstance.programStage.reportDateDescription"
@@ -45,7 +45,7 @@
 								value="$programStageInstance.programStage.displayName&#13;&#10;&nbsp;$valueDate" 
 								onclick="javascript:loadDataEntry( $programStageInstance.id );">
 							<script>	
-								var status = $programStageInstance.getEventStatus();
+								var status = "$programStageInstance.getEventStatus().getValue()";
 								setEventColorStatus( $programStageInstance.id ,status);
 							</script>
 						</td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2014-04-11 00:54:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2014-06-20 13:08:17 +0000
@@ -10,7 +10,7 @@
 
 #set($programInstance = $programStageInstance.programInstance)
 
-	#set($status = $programStageInstance.getEventStatus())
+	#set($status = $programStageInstance.getEventStatus().getValue())
 	#if( $auth.hasAccess( "dhis-web-caseentry", "accessAttributes" ) )
 		<table>
 			#foreach( $programAttribute in $programInstance.program.programAttributes)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceDashboard.vm	2014-06-10 07:56:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceDashboard.vm	2014-06-20 13:08:17 +0000
@@ -83,13 +83,13 @@
 					
 					#if($programStageInstance=='')
 							#foreach( $psi in $programInstance.programStageInstances )
-								#if ( $psi.getStatus() != 1 && $psi.getStatus() != 5  )
+								#if ( $psi.getEventStatus() != 1 && $psi.getEventStatus() != 5  )
 									#set($programStageInstance=$psi)
 								#end
 							#end
 					#end
 					#if( $!programStageInstance!='')
-						#set( $status = $programStageInstance.getEventStatus() )
+						#set( $status = $programStageInstance.getEventStatus().getValue() )
 						<tr id='tr1_$programInstance.id' type='$programInstance.program.type'
 						programStageInstanceId='$programStageInstance.id' 
 						relationshipText='$!programInstance.program.relationshipText'

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2014-06-18 10:15:16 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2014-06-20 13:08:17 +0000
@@ -147,7 +147,7 @@
 				$encoder.htmlEncode( $programStageInstance.programStage.displayName )						
 			</td>
 			#set( $duedateId = "value_" + $programStageInstance.id + "_date" )        
-			#set($status = $programStageInstance.getEventStatus())
+			#set($status = $programStageInstance.getEventStatus().getValue())
 			<td>        
 				<input type="text" id="$duedateId" style='width:80%;' value="$!format.formatDate( $programStageInstance.dueDate )" onchange="saveDueDate( $programInstance.id, $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.displayName )' )" />
 				<script type="text/javascript">