dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11513
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-07-25 13:08:47 +0700
message:
  Add program-instance sms messages into Message history tab in Dashboard.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.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/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-07-23 05:44:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-07-25 06:08:47 +0000
@@ -665,4 +665,5 @@
 is_hidden = Is hidden
 default_form_name = Default form name
 custom_form_name = Custom form name
-use_orgunits_from_level = Use organisation units from level
\ No newline at end of file
+use_orgunits_from_level = Use organisation units from level
+message = Message
\ No newline at end of file

=== 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-05-29 06:09:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm	2013-07-25 06:08:47 +0000
@@ -29,6 +29,16 @@
 				#set( $mark = !$mark )
 			#end
 		#end
+		#foreach( $sms in $programInstances.outboundSms )
+			<tr id="tr${sms.id}" #alternate( $mark )>
+				<td>$format.formatDateTime($!sms.date)</td>
+				<td>$programStageInstance.programStage.displayName</td>
+				<td>$sms.sender</td>
+				<td>$i18n.getString('message')</td>
+				<td>$sms.message</td>
+			</tr>
+			#set( $mark = !$mark )
+		#end
 		#foreach($programStageInstance in $programStageInstances)
 			#foreach( $sms in $programStageInstance.outboundSms )
 				<tr id="tr${sms.id}" #alternate( $mark )>