OpenMRS

Timestamp:

04/07/08 14:31:55 (9 months ago)

Author:

bwolfe

Message:

Merging obs_group branch to trunk [3438]:[3843]

Files:

• openmrs/trunk/.classpath (modified) (view diffs)
• openmrs/trunk/metadata/api/hibernate/org/openmrs/api/db/hibernate/Encounter.hbm.xml (modified) (view diffs)
• openmrs/trunk/metadata/api/hibernate/org/openmrs/api/db/hibernate/Obs.hbm.xml (modified) (view diffs)
• openmrs/trunk/metadata/model/openmrs_1.2.0-to-latest-mysqldiff.sql (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/Encounter.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/FormField.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/Obs.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/api/FormService.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/api/ObsService.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/api/db/FormDAO.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/api/db/ObsDAO.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/api/db/hibernate/HibernateFormDAO.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/api/db/hibernate/HibernateObsDAO.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/api/impl/EncounterServiceImpl.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/api/impl/FormServiceImpl.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/api/impl/ObsServiceImpl.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/hl7/HL7Constants.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/hl7/HL7Service.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/hl7/handler/ORUR01Handler.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/hl7/impl/HL7ServiceImpl.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/util/OpenmrsConstants.java (modified) (view diffs)
• openmrs/trunk/src/api/org/openmrs/validator (copied) (copied from openmrs/branches/obs_group/src/api/org/openmrs/validator) (view diffs)
• openmrs/trunk/src/api/org/openmrs/validator/ObsValidator.java (copied) (copied from openmrs/branches/obs_group/src/api/org/openmrs/validator/ObsValidator.java) (view diffs)
• openmrs/trunk/src/web/org/openmrs/web/controller/encounter/EncounterDisplayController.java (modified) (view diffs)
• openmrs/trunk/src/web/org/openmrs/web/controller/encounter/EncounterFormController.java (modified) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/CreateInitialDataSet.java (modified) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/EncounterTest.java (copied) (copied from openmrs/branches/obs_group/test/api/org/openmrs/test/EncounterTest.java) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/ObsTest.java (modified) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/PatientTest.java (modified) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/PersonTest.java (modified) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/api/EncounterServiceTest.java (modified) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/api/FormServiceTest.java (modified) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/api/ObsServiceTest.java (modified) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/api/include/FormServiceTest-formFields.xml (copied) (copied from openmrs/branches/obs_group/test/api/org/openmrs/test/api/include/FormServiceTest-formFields.xml) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/api/include/ObsServiceTest-initial.xml (modified) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/api/include/formfield.xml (copied) (copied from openmrs/branches/obs_group/test/api/org/openmrs/test/api/include/formfield.xml) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/hl7 (copied) (copied from openmrs/branches/obs_group/test/api/org/openmrs/test/hl7) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/hl7/ORUR01HandlerTest.java (copied) (copied from openmrs/branches/obs_group/test/api/org/openmrs/test/hl7/ORUR01HandlerTest.java) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/hl7/include (copied) (copied from openmrs/branches/obs_group/test/api/org/openmrs/test/hl7/include) (view diffs)
• openmrs/trunk/test/api/org/openmrs/test/hl7/include/ORUTest-initialData.xml (copied) (copied from openmrs/branches/obs_group/test/api/org/openmrs/test/hl7/include/ORUTest-initialData.xml) (view diffs)
• openmrs/trunk/test/web/org (copied) (copied from openmrs/branches/obs_group/test/web/org) (view diffs)
• openmrs/trunk/test/web/org/openmrs (copied) (copied from openmrs/branches/obs_group/test/web/org/openmrs) (view diffs)
• openmrs/trunk/test/web/org/openmrs/web (copied) (copied from openmrs/branches/obs_group/test/web/org/openmrs/web) (view diffs)
• openmrs/trunk/test/web/org/openmrs/web/test (copied) (copied from openmrs/branches/obs_group/test/web/org/openmrs/web/test) (view diffs)
• openmrs/trunk/test/web/org/openmrs/web/test/EncounterDisplayControllerTest.java (copied) (copied from openmrs/branches/obs_group/test/web/org/openmrs/web/test/EncounterDisplayControllerTest.java) (view diffs)
• openmrs/trunk/test/web/org/openmrs/web/test/include (copied) (copied from openmrs/branches/obs_group/test/web/org/openmrs/web/test/include) (view diffs)
• openmrs/trunk/test/web/org/openmrs/web/test/include/EncounterDisplayControllerTest.xml (copied) (copied from openmrs/branches/obs_group/test/web/org/openmrs/web/test/include/EncounterDisplayControllerTest.xml) (view diffs)
• openmrs/trunk/web/WEB-INF/messages.properties (modified) (view diffs)
• openmrs/trunk/web/WEB-INF/openmrs-servlet.xml (modified) (view diffs)
• openmrs/trunk/web/WEB-INF/view/admin/encounters/encounterForm.jsp (modified) (view diffs)
• openmrs/trunk/web/WEB-INF/view/admin/encounters/obsDisplay.jsp (copied) (copied from openmrs/branches/obs_group/web/WEB-INF/view/admin/encounters/obsDisplay.jsp) (view diffs)
• openmrs/trunk/web/WEB-INF/view/encounters/encounterDisplay.jsp (modified) (view diffs)
• openmrs/trunk/web/WEB-INF/view/portlets/patientEncounters.jsp (modified) (view diffs)
• openmrs/trunk/web/openmrs.css (modified) (view diffs)