Build: #950 was successful Scheduled with changes by teleivo <mrteleivo@gmail.com> and Daniel Kayiwa
Code commits
Git
-
teleivo <mrteleivo@gmail.com> 8444b6348188d6a71e34ae41b81935b1a99ed2c4
TRUNK-4901 Scheduled orders cannot be discontinued
* add Order.isActivated()
* add Order.isActivated(Date)
* fix issues introduced by switching isFuture with isStarted/!isStarted for
orders scheduled in the future
** Order.isActive(Date) of stopped orders scheduled for the future were
considered active
** Order.isDiscontinued(Date) of stopped orders scheduled for the future which
were not considered discontinued
* add OrderService tests to ensure we can revise orders scheduled in the
future and that the original orders are considered discontinued
* add OrderService tests to ensure we can discontinue orders scheduled in the
future- api/src/main/java/org/openmrs/Order.java (version 8444b6348188d6a71e34ae41b81935b1a99ed2c4)
- api/src/main/java/org/openmrs/api/OrderService.java (version 8444b6348188d6a71e34ae41b81935b1a99ed2c4)
- api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 8444b6348188d6a71e34ae41b81935b1a99ed2c4)
- api/src/test/java/org/openmrs/OrderTest.java (version 8444b6348188d6a71e34ae41b81935b1a99ed2c4)
- api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 8444b6348188d6a71e34ae41b81935b1a99ed2c4)
-
teleivo <mrteleivo@gmail.com> 8e16a1233c7240995e70886eaf1a5197468c4052
fix ugly formatting in some Order related classes
- api/src/main/java/org/openmrs/Order.java (version 8e16a1233c7240995e70886eaf1a5197468c4052)
- api/src/main/java/org/openmrs/api/OrderService.java (version 8e16a1233c7240995e70886eaf1a5197468c4052)
- api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 8e16a1233c7240995e70886eaf1a5197468c4052)
- api/src/test/java/org/openmrs/OrderTest.java (version 8e16a1233c7240995e70886eaf1a5197468c4052)
- api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 8e16a1233c7240995e70886eaf1a5197468c4052)
-
Daniel Kayiwa 9fc74b59214b62eac2807e5c24310e8b87441f53
Merge pull request #1817 from teleivo/TRUNK-4902
TRUNK-4902 HibernateOrderDAO exception uses wrong message code -
teleivo <mrteleivo@gmail.com> 9e7f0879beef1b9dedc18ed0c88a6da5e4f5ac84 m
TRUNK-4902 HibernateOrderDAO exception uses wrong message code
HibernateOrderDAO has a whitespace in one of its exceptions message codes in
getNextOrderNumberSeedSequenceValue
* remove whitespace in message code string
* remove unused code in getNextOrderNumberSeedSequenceValue- api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version 9e7f0879beef1b9dedc18ed0c88a6da5e4f5ac84)