Git

• 

  Daniel Kayiwa 23 Mar 2016 924eeba53d18ab06c8bd48d7b618f5aaab5dbc8d

  Merge pull request #1748 from vinayvenu/orderset-forwardport
  Forward port OrderSet feature from 1.12.x to master
• 

  ys-achinta <achintar@thoughtworks.com> 23 Mar 2016 008b101aaae07cb61006beec703b3cc4e7f05a6b

  TRUNK-4834 | Support for orderSets and orderGroups
  Creating OrderSet, OrderSetMember metadata,
  Corresponding tables order_set, order_set_meber,
  Services OrderSetService for operations on the metadata.
  Creating OrderGroup
  Adding extra methods in OrderService for saving the OrderGroup,
  Updating the Order model to have new fields for OrderGroup
  
  Used a List for putting the orderSetMembers in OrderSet,
          (Hibernate internally sets the sequenceNumber)
  Added functionality in OrderSet to add a member at a particular position
  Used a List for putting the orders in the OrderGroup,
          (Used a bag for mapping the list of orders in hibernate mapping file)
  Added functionality in OrderGroup to add an order at a particular postion.
  
  Added functionality for the API to handle negative position values for adding orderSetMembers and Orders
  Added validation for illegal position values for adding orderSetMembers and Orders
  
  Added a parameter to the OrderSetMember model to take in a templateType.
  (This template type is a name which will decide the schema of the orderTemplate
  to be generated)
  
  OrderSet-Implementation:
  Added two utility methods to Encounter model
          a. to getOrderGroups within a list of orders
          b. to get the orders which are not associated with orderGroups
  
  EncounterSave iterates through the list of orderGroups and saves them one by one.
  EncounterSave iterates through a list of order not having orderGroups for saving them.
  
  OrderService saves an orderGroup and the orders within it.

  • api/src/main/java/org/openmrs/Encounter.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/Order.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/OrderGroup.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/OrderSet.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/OrderSetMember.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/TestOrder.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/OrderService.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/OrderSetService.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/context/Context.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/context/ServiceContext.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/db/OrderDAO.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/db/OrderSetDAO.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderSetDAO.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/api/impl/OrderSetServiceImpl.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/util/PrivilegeConstants.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/java/org/openmrs/validator/OrderValidator.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/resources/applicationContext-service.xml (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/resources/hibernate.cfg.xml (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/resources/liquibase-update-to-latest.xml (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroup.hbm.xml (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetMember.hbm.xml (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/test/java/org/openmrs/OrderTest.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/test/java/org/openmrs/TestOrderTest.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/test/java/org/openmrs/api/EncounterServiceTest.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/test/java/org/openmrs/api/OrderSetServiceTest.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/test/java/org/openmrs/api/builder/DrugOrderBuilder.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/test/java/org/openmrs/api/builder/OrderBuilder.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/test/java/org/openmrs/api/db/hibernate/HibernateOrderDAOTest.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/test/java/org/openmrs/validator/OrderValidatorTest.java (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)
  • api/src/test/resources/org/openmrs/api/include/OrderSetServiceTest-general.xml (version 008b101aaae07cb61006beec703b3cc4e7f05a6b)