Build: #817 was successful Scheduled with changes by Daniel Kayiwa and achintar <achintar@INachintar.local>
Code commits
openmrs-core master
-
achintar <achintar@INachintar.local> 6f2a1c3b5e4eaffc31101a303eedb0dd20fe7920
OrderSet-Story Extra Changes
Added helper methods to OrderSet model.
a. removing an orderSetMember from an orderSet
b. retiring an orderSetMember in an orderSet
c. fetching unretired orderSetMembers
Added a method to fetch orderSetMembers by Uuid.
Retiring an orderSet retires the orderSetMembers as well.
Added bi-directional mapping between orderSet and orderSetMember.
(cherry picked from commit fd36c0ccd47d0a84bd5aa1a43a350d58fdf65c72)- api/src/main/java/org/openmrs/OrderSet.java (version 6f2a1c3b5e4eaffc31101a303eedb0dd20fe7920)
- api/src/main/java/org/openmrs/api/OrderSetService.java (version 6f2a1c3b5e4eaffc31101a303eedb0dd20fe7920)
- api/src/main/java/org/openmrs/api/db/OrderSetDAO.java (version 6f2a1c3b5e4eaffc31101a303eedb0dd20fe7920)
- api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderSetDAO.java (version 6f2a1c3b5e4eaffc31101a303eedb0dd20fe7920)
- api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java (version 6f2a1c3b5e4eaffc31101a303eedb0dd20fe7920)
- api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml (version 6f2a1c3b5e4eaffc31101a303eedb0dd20fe7920)
- api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetMember.hbm.xml (version 6f2a1c3b5e4eaffc31101a303eedb0dd20fe7920)
- api/src/test/java/org/openmrs/api/OrderSetServiceTest.java (version 6f2a1c3b5e4eaffc31101a303eedb0dd20fe7920)
-
Daniel Kayiwa 61b25a7ff9d3d8574e4adcb79f3eadc70338f133
Merge pull request #1756 from maany/TRUNK-208
TRUNK-208: Fix Transactions Across Service Methods -
Mayank Sharma ebb1d496e06adadde79929ec19329b4781e5dee5 m
TRUNK-208: Fix Transactions Across Service Methods
- api/src/main/java/org/openmrs/api/db/ContextDAO.java (version ebb1d496e06adadde79929ec19329b4781e5dee5)
- api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java (version ebb1d496e06adadde79929ec19329b4781e5dee5)
- api/src/main/java/org/openmrs/logic/LogicService.java (version ebb1d496e06adadde79929ec19329b4781e5dee5)
- api/src/main/java/org/openmrs/messagesource/MutableMessageSource.java (version ebb1d496e06adadde79929ec19329b4781e5dee5)
- api/src/main/java/org/openmrs/messagesource/impl/MessageSourceServiceImpl.java (version ebb1d496e06adadde79929ec19329b4781e5dee5)