dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15876
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Fri 2014-06-27 12:55:22 +0200
message:
  both programinstance and programstageinstance can now have multiple comments
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveProgramInstanceCommentAction.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SaveTrackedEntityCommentAction.java


--
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/java/org/hisp/dhis/caseentry/action/caseentry/SaveProgramInstanceCommentAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveProgramInstanceCommentAction.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveProgramInstanceCommentAction.java	2014-06-27 10:55:22 +0000
@@ -93,7 +93,7 @@
         {
             TrackedEntityComment entityComment = new TrackedEntityComment( comment, currentUserService.getCurrentUsername(),
                 new Date() );
-            programInstance.setComment(entityComment);
+            programInstance.getComments().add(entityComment);
             programInstanceService.updateProgramInstance( programInstance );
         }      
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SaveTrackedEntityCommentAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SaveTrackedEntityCommentAction.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SaveTrackedEntityCommentAction.java	2014-06-27 10:55:22 +0000
@@ -98,7 +98,7 @@
             comment.setCreator( currentUserService.getCurrentUsername() );
             comment.setCreatedDate( new Date() );
 
-            programStageInstance.setComment(  comment );
+            programStageInstance.getComments().add(  comment );
 
             programStageInstanceService.updateProgramStageInstance( programStageInstance );