dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10769
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-05-06 16:00:15 +0700
message:
  Put comments into data entry form on Active programs tab of person dashboard.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.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/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-05-06 07:12:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-05-06 09:00:15 +0000
@@ -124,7 +124,14 @@
 					#end
 					
 					#set($flag = 'false')
+					#set($messages = "")
 					#foreach( $programStageInstance in $programInstance.programStageInstances )
+						<!-- Messages of stage -->
+						#foreach( $comment in $programStageInstance.patientComments )
+							#set($messages = $messages + $format.formatDateTime($comment.createdDate) + ' ' + $comment.creator + ' ' + $comment.commentText + '<br>' )
+							#set( $mark = !$mark )
+						#end
+						
 						#set( $status = $programStageInstance.getEventStatus() )
 						#if( $status!=1 && $status!=5 && $flag=='false')
 							<tr id='tr1_$programInstance.id' type='$programInstance.program.type'
@@ -153,6 +160,12 @@
 						</td>
 					</tr>
 					#end
+					
+					<!-- Fill messages -->
+					#if($messages!='')
+					<tr><td>$messages</td></tr>
+					#end
+					
 				#end
 			</table>
 		</div>

=== 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	2013-04-18 09:56:44 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm	2013-05-06 09:00:15 +0000
@@ -69,11 +69,11 @@
                 	<td colspan="3" style="height:15px"></td>
                 </tr>
                 <tr>
-                	<td colspan="2" style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_by" )</td>
+                	<td colspan="2" style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_by" ):</td>
                 	<td>$!encoder.htmlEncode( $programInstance.patientComment.creator )</td>
                 </tr>
                 <tr>
-                	<td colspan="2" style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_date" )</td>
+                	<td colspan="2" style="background-color: #e0e0e0; height:26px;">$i18n.getString( "stored_date" ):</td>
                 	<td>$!format.formatDate( $programInstance.patientComment.createdDate )</td>
                 </tr>
             </table>