dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8042
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-09-12 11:24:09 +0700
message:
  Minor fix.
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/programTrackingList.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	2012-09-12 04:14:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm	2012-09-12 04:24:09 +0000
@@ -15,8 +15,8 @@
 		#foreach($programStageInstance in $programStageInstances)
 			#foreach( $comment in $programStageInstance.patientComments )
 				#if( $index < 5 )
-					<tr id="comment_$comment.id" #alternate($mark)>
-						<td>$format.formatDate($comment.createdDate)</td>
+					<tr id="comment_$comment.id">
+						<td>$format.formatDateTime($comment.createdDate)</td>
 						<td>$programStageInstance.programStage.name</td>
 						<td>$comment.creator</td>
 						<td>$comment.commentText</td>
@@ -29,8 +29,8 @@
 		#foreach($programStageInstance in $programStageInstances)
 			#foreach( $sms in $programStageInstance.outboundSms )
 				#if( $index < 5 )
-					<tr id="tr${sms.id}" #alternate($mark) >
-						<td>$format.formatDate($!sms.date)</td>
+					<tr id="tr${sms.id}">
+						<td>$format.formatDateTime($!sms.date)</td>
 						<td> $programStageInstance.programStage.name</td>
 						<td>$sms.sender</td>
 						<td>$sms.message</td>
@@ -42,8 +42,8 @@
 		#foreach($programStageInstance in $programStageInstances)
 			#foreach( $comment in $programStageInstance.patientComments )
 				#if( $index >= 5 )
-					<tr id="comment_$comment.id" #alternate($mark) class="hidden">
-						<td>$format.formatDate($comment.createdDate)</td>
+					<tr id="comment_$comment.id" class="hidden">
+						<td>$format.formatDateTime($comment.createdDate)</td>
 						<td>$programStageInstance.programStage.name</td>
 						<td>$comment.creator</td>
 						<td>$comment.commentText</td>
@@ -56,8 +56,8 @@
 		#foreach($programStageInstance in $programStageInstances)
 			#foreach( $sms in $programStageInstance.outboundSms )
 				#if( $index >= 5 )
-					<tr id="tr${sms.id}" #alternate($mark) >
-						<td>$format.formatDate($!sms.date)</td>
+					<tr id="tr${sms.id}"  class='hidden'>
+						<td>$format.formatDateTime($!sms.date)</td>
 						<td>$programStageInstance.programStage.name</td>
 						<td>$sms.sender</td>
 						<td>$sms.message</td>
@@ -67,4 +67,9 @@
 			#end
 		#end
 	</tbody>
-</table>
\ No newline at end of file
+</table>
+
+<br>
+#set($count = $programStageInstance.patientComments.size() + $programStageInstance.outboundSms.size() )
+<input type='button' id="showCommentBtn" name="showCommentBtn" value='$i18n.getString("show_hide_more")' #if($count<=5) class='hidden' #end onclick='commentDivToggle(false);'>
+<input type='button' id="hideCommentBtn" name="hideCommentBtn" value='$i18n.getString("show_hide_more")' class='hidden' onclick='commentDivToggle(true);'>
\ No newline at end of file

=== 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	2012-09-12 04:14:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2012-09-12 04:24:09 +0000
@@ -133,7 +133,7 @@
 				#foreach( $comment in $comments )
 					#if( $index < 5 )
 						<tr id="comment_$comment.id">
-							<td>$format.formatDate($comment.createdDate)</td>
+							<td>$format.formatDateTime($comment.createdDate)</td>
 							<td>$programStageInstance.programStage.name</td>
 							<td>$comment.creator</td>
 							<td>$comment.commentText</td>
@@ -145,7 +145,7 @@
 				#foreach( $sms in $outboundSms )
 					#if( $index < 5 )
 						<tr id="tr${sms.id}" >
-							<td>$format.formatDate($!sms.date)</td>
+							<td>$format.formatDateTime($!sms.date)</td>
 							<td>$programStageInstance.programStage.name</td>
 							<td>$sms.sender</td>
 							<td>$sms.message</td>
@@ -155,7 +155,7 @@
 				#foreach( $comment in $comments )
 					#if( $index >= 5 )
 						<tr id="comment_$comment.id" class='hidden'>
-							<td>$format.formatDate($comment.createdDate)</td>
+							<td>$format.formatDateTime($comment.createdDate)</td>
 							<td>$programStageInstance.programStage.name</td>
 							<td>$comment.creator</td>
 							<td>$comment.commentText</td>
@@ -166,7 +166,7 @@
 				#foreach( $sms in $outboundSms )
 					#if( $index >= 5 )
 						<tr id="tr${sms.id}" class='hidden' >
-							<td>$format.formatDate($!sms.date)</td>
+							<td>$format.formatDateTime($!sms.date)</td>
 							<td>$programStageInstance.programStage.name</td>
 							<td>$sms.sender</td>
 							<td>$sms.message</td>