dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15786
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-06-20 21:05:15 +0800
message:
  Fixed build test fail
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.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-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java	2014-06-20 12:32:01 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java	2014-06-20 13:05:15 +0000
@@ -50,15 +50,25 @@
      * Determines if a de-serialized file is compatible with this class.
      */
     private static final long serialVersionUID = 6239130884678145713L;
+
     private ProgramInstance programInstance;
+
     private ProgramStage programStage;
+
     private Date dueDate;
+
     private Date executionDate;
+
     private OrganisationUnit organisationUnit;
+
     private List<OutboundSms> outboundSms = new ArrayList<OutboundSms>();
+
     private List<MessageConversation> messageConversations = new ArrayList<MessageConversation>();
+
     private TrackedEntityComment comment;
+
     private EventStatus status = EventStatus.ACTIVE;
+
     private Double longitude;
 
     private Double latitude;
@@ -81,7 +91,7 @@
         this.programInstance = programInstance;
         this.programStage = programStage;
     }
-    
+
     // -------------------------------------------------------------------------
     // Getters and setters
     // -------------------------------------------------------------------------
@@ -165,7 +175,7 @@
      */
     public boolean isCompleted()
     {
-        return ( status == EventStatus.COMPLETED ) ? true : false;
+        return (status == EventStatus.COMPLETED) ? true : false;
     }
 
     public OrganisationUnit getOrganisationUnit()
@@ -242,9 +252,14 @@
     {
         this.comment = comment;
     }
-    
+
     public EventStatus getStatus()
     {
+       return status;
+    }
+
+    public EventStatus getEventStatus()
+    {
         if ( status == EventStatus.COMPLETED )
         {
             return status;