dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16011
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-07-08 13:47:43 +0800
message:
  Fixed bug - The messages of program and events don't display in Message tab of Lost to follow-up function..
modified:
  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/trackingEventMessage.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/programTrackingList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2014-06-20 13:08:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2014-07-08 05:47:43 +0000
@@ -84,7 +84,7 @@
 				<td>$i18n.getString( "post_comment" )</td>
 				<td>
 					<input type='text' id='commentText' name='commentText' onkeypress="keypressOnComment(event,this,'$programStageInstance.id');" >
-					<input type='button' value="+" class='tiny-button' title='$i18n.getString("post_comment")' onclick="addComment( byId('commentText'),'$programStageInstance.id');" >
+					<input type='button' value="$i18n.getString('post_comment')" title='$i18n.getString("post_comment")' onclick="addComment( byId('commentText'),'$programStageInstance.id');" >
 				</td>
 			</tr>
 			

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingEventMessage.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingEventMessage.vm	2014-04-15 15:19:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingEventMessage.vm	2014-07-08 05:47:43 +0000
@@ -16,16 +16,17 @@
 	</tr>
 	<tbody id='commentTB' name='commentTB'>
 		#set( $mark = false )
-		#if($programStageInstance.comment)
-		<tr id="comment_$programStageInstance.comment.id" #alternate( $mark )>
-			<td>$format.formatDateTime($programStageInstance.comment.createdDate)</td>
+		#foreach($comment in $programStageInstance.comments)
+		$comment.creator
+		<tr id="comment_$comment.id" #alternate( $mark )>
+			<td>$format.formatDateTime($comment.createdDate)</td>
 			<td>$encoder.htmlEncode($programStageInstance.programStage.displayName)</td>
-			<td>$encoder.htmlEncode($programStageInstance.comment.creator)</td>
+			<td>$encoder.htmlEncode($comment.creator)</td>
 			<td>$i18n.getString('comment')</td>
 			<td></td>
-			<td>$encoder.htmlEncode($programStageInstance.comment.commentText)</td>
+			<td>$encoder.htmlEncode($comment.commentText)</td>
 			<td>
-				<a href="javascript:removeComment( '$programStageInstance.id', '$programStageInstance.comment.id' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
+				<a href="javascript:removeComment( '$programStageInstance.id', '$comment.id' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 			</td>
 		</tr>
 		#end