OpenMRS

Timestamp:

08/06/08 17:17:55 (5 months ago)

Author:

mseaton

Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

• openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/ProgramWorkflowServiceImpl.java (modified) (31 diffs)

openmrs/branches/data_synchronization_bidirectional/src/api/org/openmrs/api/impl/ProgramWorkflowServiceImpl.java

@@ -37 +37 @@
-import org.openmrs.api.context.Context;
-import org.openmrs.api.db.ProgramWorkflowDAO;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
@@ -49 +48 @@
- * @see org.openmrs.api.ProgramWorkflowService
- */
-
+
-public class ProgramWorkflowServiceImpl extends BaseOpenmrsService implements ProgramWorkflowService {
-        
@@ -145 +144 @@
-     * @see org.openmrs.api.ProgramWorkflowService#getProgram(java.lang.Integer)
-         */
-    @Transactional(readOnly=true)
-        public Program getProgram(Integer id) {
-                return dao.getProgram(id);
@@ -153 +151 @@
-     * @see org.openmrs.api.ProgramWorkflowService#getProgram(java.lang.String)
-         */
-    @Transactional(readOnly=true)
-        public Program getProgram(String name) {
-        return getProgramByName(name);
@@ -161 +158 @@
-         * @see org.openmrs.api.ProgramWorkflowService#getProgram(java.lang.String)
-         */
-    @Transactional(readOnly=true)
-        public Program getProgramByName(String name) {
-                for (Program p : getAllPrograms()) {
@@ -174 +170 @@
-     * @see org.openmrs.api.ProgramWorkflowService#getAllPrograms()
-         */
-    @Transactional(readOnly=true)
-    public List<Program> getAllPrograms() throws APIException {
-        return getAllPrograms(true);
@@ -182 +177 @@
-     * @see org.openmrs.api.ProgramWorkflowService#getAllPrograms(boolean)
-     */
-    @Transactional(readOnly=true)
-    public List<Program> getAllPrograms(boolean includeRetired) throws APIException {
-        return dao.getAllPrograms(includeRetired);
@@ -190 +184 @@
-     * @see org.openmrs.api.ProgramWorkflowService#findPrograms(java.lang.String)
-     */
-    @Transactional(readOnly=true)
-    public List<Program> getPrograms(String nameFragment) throws APIException {
-        return dao.findPrograms(nameFragment);
@@ -330 +323 @@
-     * @see org.openmrs.api.ProgramWorkflowService#getPatientProgram(java.lang.Integer)
-     */
-    @Transactional(readOnly=true)
-        public PatientProgram getPatientProgram(Integer patientProgramId) {
-                return dao.getPatientProgram(patientProgramId);
@@ -338 +330 @@
-     * @see org.openmrs.api.ProgramWorkflowService#getPatientPrograms(org.openmrs.Patient, org.openmrs.Program, java.util.Date, java.util.Date, java.util.Date, java.util.Date)
-         */
-    @Transactional(readOnly=true)
-    public List<PatientProgram> getPatientPrograms(Patient patient, Program program, Date minEnrollmentDate, Date maxEnrollmentDate, Date minCompletionDate, Date maxCompletionDate, boolean includeVoided) throws APIException {
-        return dao.getPatientPrograms(patient, program, minEnrollmentDate, maxEnrollmentDate, minCompletionDate, maxCompletionDate, includeVoided);
@@ -415 +406 @@
-     * @see org.openmrs.api.ProgramWorkflowService#getConceptStateConversion(java.lang.Integer)
-     */
-    @Transactional(readOnly=true)
-        public ConceptStateConversion getConceptStateConversion(Integer id) {
-                return dao.getConceptStateConversion(id);
@@ -423 +413 @@
-     * @see org.openmrs.api.ProgramWorkflowService#getAllConceptStateConversions()
-         */
-    @Transactional(readOnly=true)
-    public List<ConceptStateConversion> getAllConceptStateConversions() throws APIException {
-        return dao.getAllConceptStateConversions();
@@ -469 +458 @@
-         * @see org.openmrs.api.ProgramWorkflowService#getConceptStateConversion(org.openmrs.ProgramWorkflow, org.openmrs.Concept)
-         */
-        @Transactional(readOnly=true)
-        public ConceptStateConversion getConceptStateConversion(ProgramWorkflow workflow, Concept trigger) {
-                return dao.getConceptStateConversion(workflow, trigger);
@@ -489 +477 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public List<Program> getPrograms() {
-                return getAllPrograms();
@@ -521 +508 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public ProgramWorkflow getWorkflow(Integer id) {
-                for (Program p : getAllPrograms()) {
@@ -537 +523 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public ProgramWorkflow getWorkflow(Program program, String name) {
-                return program.getWorkflowByName(name);
@@ -559 +544 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public List<ProgramWorkflowState> getStates() {
-                return getStates(true);
@@ -568 +552 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public List<ProgramWorkflowState> getStates(boolean includeRetired) {
-                List<ProgramWorkflowState> ret = new ArrayList<ProgramWorkflowState>();
@@ -587 +570 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public ProgramWorkflowState getState(Integer id) {
-                for (ProgramWorkflowState s : getStates()) {
@@ -601 +583 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public ProgramWorkflowState getState(ProgramWorkflow programWorkflow, String name) {
-                return programWorkflow.getStateByName(name);
@@ -610 +591 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public List<ProgramWorkflowState> getPossibleNextStates(PatientProgram patientProgram, ProgramWorkflow workflow) {
-                return workflow.getPossibleNextStates(patientProgram);
@@ -619 +599 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public boolean isLegalTransition(ProgramWorkflowState fromState, ProgramWorkflowState toState) {
-                return fromState.getProgramWorkflow().isLegalTransition(fromState, toState);
@@ -663 +642 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public Collection<PatientProgram> getPatientPrograms(Patient patient) {
-                return getPatientPrograms(patient, null, null, null, null, null, false);
@@ -672 +650 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public Collection<Integer> patientsInProgram(Program program, Date fromDate, Date toDate) {
-                List<Integer> ret = new ArrayList<Integer>();
@@ -686 +663 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public Collection<PatientProgram> getCurrentPrograms(Patient patient, Date onDate) {
-                List<PatientProgram> ret = new ArrayList<PatientProgram>();
@@ -701 +677 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public boolean isInProgram(Patient patient, Program program, Date fromDate, Date toDate) {
-                return !getPatientPrograms(patient, program, null, toDate, fromDate, null, false).isEmpty();
@@ -714 +689 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public PatientState getPatientState(Integer patientStateId) {
-                for (PatientProgram p : getPatientPrograms(null, null, null, null, null, null, false)) {
@@ -729 +703 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public PatientState getLatestState(PatientProgram patientProgram, ProgramWorkflow workflow) {
-                return patientProgram.getCurrentState(workflow);
@@ -738 +711 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public Set<ProgramWorkflow> getCurrentWorkflowsByPatient(Patient patient) {
-                Set<ProgramWorkflow> ret = new HashSet<ProgramWorkflow>();
@@ -751 +723 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public Set<ProgramWorkflow> getCurrentWorkflowsByPatientProgram(PatientProgram patientProgram) {
-                Set<ProgramWorkflow> ret = new HashSet<ProgramWorkflow>();
@@ -811 +782 @@
-         * @deprecated
-         */
-        @Transactional(readOnly=true)
-        public List<ConceptStateConversion> getAllConversions() {
-                return getAllConceptStateConversions();