dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16035
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-07-09 10:48:23 +0700
message:
  Display comments of program-instance in Message list of Reschedule and set status tab of TEI Dashboard.
modified:
  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/visitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2014-07-09 03:43:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2014-07-09 03:48:23 +0000
@@ -40,7 +40,7 @@
 			<a href='javascript:markForFollowup($programInstance.id, true)' #if( $followup == 'true') class='hidden' #end name='imgUnmarkFollowup' title='$i18n.getString("toggle_risk_status")' ><img src='images/unrisk_large.png'></a>			
 		</td>
 		<td rowspan='3' colspan='8'>
-			<textarea id="comment" name='comment' maxlength="360" style="height:100px;width:100%">$!encoder.htmlEncode( $programInstance.comment.commentText )</textarea>
+			<textarea id="comment" name='comment' maxlength="360" style="height:100px;width:100%"></textarea>
 		</td>
    </tr>
    
@@ -93,7 +93,8 @@
 
 </table>
 
-#if( $programInstance.outboundSms.size() > 0 )
+#if( $programInstance.outboundSms.size() > 0 
+	|| $programInstance.comments.size() > 0 )
 	<table>
 		<tr>
 			<td><span class="commentHeader">$i18n.getString('message')</span><td>
@@ -107,6 +108,14 @@
 				</td>
 			</tr>
 		#end
+		#foreach($comment in $programInstance.comments)
+			<tr>
+				<td>
+					($format.formatDateTime($!comment.createdDate) - $encoder.htmlEncode($comment.creator) )
+					$encoder.htmlEncode($comment.commentText)
+				</td>
+			</tr>
+		#end
 		</tbody>
 	</table>
 #end