Build: #162 was successful
Job: Default Job was successful
Code commits
openmrs-core 1.10.x
-
Wyclif Luyima 36cf42d698d28856623b1bbbc5315c966a12d452
Support deriving auto_expire_date from duration and duration units for Drug Orders - TRUNK-4446
TRUNK-4446: Infer drug order auto expire date based on duration and frequency
TRUNK-4446: Use uuid for comparision. Improved javadoc for ISO8601Duration
TRUNK-4446: Changes based on PR comments
* Remove unused constants in map type
* Use uuid of concept source
* Exception when duration code is unknown
* Exception when frequency not provide for recurring interval
* Fix uuid, dates in change set.
* New change set for alter column
* Check for duration and units before infering expire date
* Use getEffectiveStartDate to handle scheduled order
TRUNK-4446: Add preconditions for inserting concept source and reference terms
TRUNK-4446: Move migrations from liquibase-core-data.xml to liquibase-update-to-latest.xml
TRUNK-4446: Validate duration units is mapped to ISO 8601 duration when auto expire date is not set
Follow up to remove concept map uuid restriction and moved logic that checks for durations mappings to DrugOrderValidator - TRUNK-4446
Follow up to fix failing tests - TRUNK-4446
Conflicts:
api/src/main/resources/liquibase-update-to-latest.xml- api/src/main/java/org/openmrs/DosingInstructions.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/main/java/org/openmrs/DrugOrder.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/main/java/org/openmrs/FreeTextDosingInstructions.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/main/java/org/openmrs/ISO8601Duration.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/main/java/org/openmrs/SimpleDosingInstructions.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/main/resources/liquibase-core-data.xml (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/main/resources/liquibase-update-to-latest.xml (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/test/java/org/openmrs/CustomDosingInstructions.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/test/java/org/openmrs/ISO8601DurationTest.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/test/java/org/openmrs/SimpleDosingInstructionsTest.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/test/java/org/openmrs/test/TestUtil.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrderAutoExpireDate.xml (version 36cf42d698d28856623b1bbbc5315c966a12d452)
- webapp/src/main/webapp/WEB-INF/messages.properties (version 36cf42d698d28856623b1bbbc5315c966a12d452)