dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10907
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-05-21 11:39:29 +0700
message:
  Remove comments of program-instance in Dashboard; reput it into dataentry form.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.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/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-05-21 04:33:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2013-05-21 04:39:29 +0000
@@ -67,7 +67,6 @@
 				</table>
 			</td>
 		</tr>
-		
 	</table>
 	</table>
 	

=== 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 09:00:15 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-05-21 04:39:29 +0000
@@ -124,14 +124,7 @@
 					#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'
@@ -160,12 +153,6 @@
 						</td>
 					</tr>
 					#end
-					
-					<!-- Fill messages -->
-					#if($messages!='')
-					<tr><td>$messages</td></tr>
-					#end
-					
 				#end
 			</table>
 		</div>