OpenMRS

Timestamp:

05/24/08 14:37:02 (8 months ago)

Author:

bwolfe

Message:

Merging api-refactoring to trunk [3595]:[4355]

Files:

• openmrs/trunk/src/api/org/openmrs/PatientState.java (modified) (4 diffs)

openmrs/trunk/src/api/org/openmrs/PatientState.java

@@ -18 +18 @@
-import org.openmrs.util.OpenmrsUtil;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        private Integer patientStateId;
-        // private Program program;
-        // private ProgramWorkflow programWorkflow;
-        private PatientProgram patientProgram;
-        private ProgramWorkflowState state;
@@ -37 +48 @@
-        private String voidReason;
-        
+        // ******************
+        // Constructors
+        // ******************
+        
+        /** Default Constructor */
-        public PatientState() { }
+        
+        /** Constructor with id */
+        public PatientState(Integer patientStateId) {
+                setPatientStateId(patientStateId);
+        }
-        
-        /**
@@ -70 +91 @@
-                return target;
-        }
+        
+        // ******************
+        // Instance methods
+        // ******************
+        
+        /**
+         * Returns true if this {@link PatientState} is active as of the passed {@link Date}
+         * @param onDate - {@link Date} to check for {@link PatientState} enrollment
+         * @return boolean - true if this {@link PatientState} is active as of the passed {@link Date}
+         */
+        public boolean getActive(Date onDate) {
+                if (onDate == null) {
+                        onDate = new Date();
+                }
+                return !getVoided() && (startDate == null || OpenmrsUtil.compare(startDate, onDate) <= 0) && (endDate == null || OpenmrsUtil.compare(endDate, onDate) > 0);
+        }
+        
+        /**
+         * Returns true if this {@link PatientState} is currently active
+         * @return boolean - true if this {@link PatientState} is currently active
+         */
+        public boolean getActive() {
+                return getActive(null);
+        }
+        
+        /** @see Object#equals(Object) */
+        public boolean equals(Object obj) {
+                if (obj != null && obj instanceof PatientState) {
+                        PatientState p = (PatientState)obj;
+                        if (this.getPatientStateId() == null) {
+                                return p.getPatientStateId() == null;
+                        }
+                        return (this.getPatientStateId().equals(p.getPatientStateId()));
+                }
+                return false;
+        }
+
+        /** @see Object#toString() */
+        public String toString() {
+                return "PatientState(id=" + getPatientStateId() + ", patientProgram=" + getPatientProgram() + ", state=" + getState() + ", startDate=" + getStartDate() + ", endDate=" + getEndDate();
+        }
+        
+        // ******************
+        // Property Access
+        // ******************
-
-        public PatientProgram getPatientProgram() {
@@ -174 +240 @@
-                this.startDate = startDate;
-        }
-        
-        public boolean getActive() {
-                return getActive(null);
-        }
-        
-        public boolean getActive(Date onDate) {
-                if (onDate == null)
-                        onDate = new Date();
-                return (startDate == null || OpenmrsUtil.compare(startDate, onDate) <= 0) && (endDate == null || OpenmrsUtil.compare(endDate, onDate) > 0);
-        }
-        
-}