OpenMRS

Timestamp:

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

Author:

bwolfe

Message:

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

Files:

• openmrs/trunk/src/api/org/openmrs/PatientProgram.java (modified) (5 diffs)

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

@@ -24 +24 @@
-import org.openmrs.util.OpenmrsUtil;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * PatientProgram
+ */
-public class PatientProgram implements java.io.Serializable {
-        
-        public static final long serialVersionUID = 0L;
-
+
+
+
+
+
+
-        private Integer patientProgramId;
-        private Patient patient;
@@ -33 +44 @@
-        private Date dateEnrolled;
-        private Date dateCompleted;
-
-
-
+
-        private User creator; 
-        private Date dateCreated; 
@@ -45 +54 @@
-        private String voidReason;
-        
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-         * Does a mostly-shallow copy of this PatientProgram. Does not copy patientProgramId.
-         * The 'states' property will be deep-copied.
@@ -89 +106 @@
-                target.setVoidReason(this.getVoidReason());
-                return target;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        public User getCreator() {
@@ -205 +403 @@
-                this.voidReason = voidReason;
-        }
-
-        public boolean getActive(Date onDate) {
-                if (onDate == null)
-                        onDate = new Date();
-                return !getVoided() && (dateEnrolled == null || OpenmrsUtil.compare(dateEnrolled, onDate) <= 0) && (dateCompleted == null || OpenmrsUtil.compare(dateCompleted, onDate) > 0); 
-        }
-        
-        public boolean getActive() {
-                return getActive(null);
-        }
-        
-        public PatientState getCurrentState(ProgramWorkflow wf) {
-                Set<PatientState> states = this.getStates();
-                Date now = new Date();
-                if (states != null) {
-                        for (PatientState state : states) {
-                                if ( !state.getVoided() &&
-                                                ( wf == null || state.getState().getProgramWorkflow().equals(wf) ) &&
-                                                state.getActive(now) )
-                                        return state;
-                        }
-                }
-                return null;
-        }
-        
-        @Deprecated
-        public PatientState getCurrentState() {
-                // TODO: this isn't really right - a patient can have many current states (in different workflows)
-                return getCurrentState(null);
-        }
-
-
-        public Set<PatientState> getCurrentStates() {
-                
-                Set<PatientState> ret = null;
-                
-                Set<PatientState> states = this.getStates();
-                if ( states != null ) {
-                        Date now = new Date();
-                        for ( PatientState state : states ) {
-                                if (!state.getVoided() && state.getActive(now)) {
-                                        if ( ret == null ) ret = new HashSet<PatientState>();
-                                        ret.add(state);
-                                }
-                        }
-                }
-                return ret;
-        }
-
-        public List<PatientState> statesInWorkflow(ProgramWorkflow wf, boolean includeVoided) {
-                List<PatientState> ret = new ArrayList<PatientState>();
-                for (PatientState st : getStates()) {
-                        if (st.getState().getProgramWorkflow().equals(wf) && (includeVoided || !st.getVoided()))
-                                ret.add(st);
-                }
-                Collections.sort(ret, new Comparator<PatientState>() {
-                                public int compare(PatientState left, PatientState right) {
-                                        return OpenmrsUtil.compareWithNullAsEarliest(left.getStartDate(), right.getStartDate());
-                                }
-                        });
-                return ret;
-        }
-        
-}