dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12001
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-09-10 13:22:26 +0700
message:
  Add message converstation in Message tab in Lost to follow-up function.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.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/eventMessage.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm	2013-09-10 06:22:26 +0000
@@ -105,7 +105,7 @@
 				</td>
 			</tr>
 			#set( $mark = !$mark )
-		#end
+			#end
 		#end
 	</tbody>
 </table>

=== 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	2013-08-27 08:37:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackingEventMessage.vm	2013-09-10 06:22:26 +0000
@@ -44,5 +44,19 @@
 			</tr>
 			#set( $mark = !$mark )
 		#end
+		#foreach( $messageConversation in $programStageInstance.messageConversations )
+		<tr id="tr${sms.id}" #alternate( $mark )>
+			<td>$format.formatDateTime($!messageConversation.lastMessage)</td>
+			<td>$programStageInstance.programStage.displayName</td>
+			<td>$messageConversation.lastSender.username</td>
+			<td>$i18n.getString('message')</td>
+			<td></td>
+			<td>$messageConversation.messages.get(0)</td>
+			<td>
+				<a href="javascript:removeMessage( $programInstances.id, '', $sms.id )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
+			</td>
+		</tr>
+		#set( $mark = !$mark )
+		#end
 	</tbody>
 </table>
\ No newline at end of file