Build #560

Plan branch:
OpenMRS Core Master

Build: #560 was successful Changes by Wyclif Luyima

Stages & jobs

  1. Build and Test

Code commits

openmrs-core

  • Wyclif Luyima

    Wyclif Luyima aee6f9ef19f1fe308d88b450f6d6e5f2520328c8

    TRUNK-4445 Added support for custom dosing type for DrugOrders. Changed the current dosing type enum to a string, while keeping the support for SIMPLE and FREE_TEXT dosing types using constants
    TRUNK-4445 Made doing type of type class <? extends dosinginstructions>

    TRUNK-4445 Adding validation to the the dosing instructions class, and removing them from drugordervalidator

    TRUNK-4445 changing the shoulds and verifies in the required places, renamed dosinginstructionsobject to dosinginstructionsinstance. Catching exceptions inside the getter now. Updated the message.properties with suitable messages for dosingIntructions Free Text

    Adding java doc for DosingInstructions and removing unused import

    Follow up to clean up unit tests and the liquibase update file   - TRUNK-4445

    • api/src/main/java/org/openmrs/DosingInstructions.java (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/main/java/org/openmrs/DrugOrder.java (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/main/java/org/openmrs/FreeTextDosingInstructions.java (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/main/java/org/openmrs/SimpleDosingInstructions.java (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/main/resources/liquibase-update-to-latest.xml (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/test/java/org/openmrs/CustomDosingInstructions.java (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/test/java/org/openmrs/DrugOrderTest.java (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersWitSameConceptAndDifferentFormAndStrength.xml (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-reviseDiscontinuedOrders.xml (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version aee6f9ef19f1fe308d88b450f6d6e5f2520328c8)