Build #726

Plan branch:

Build: #726 was successful Changes by Deluan <deluan@thoughtworks.com>

Stages & jobs

  1. Build

  2. Package

Code commits

Git

  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> 149762c737747896fc61455e80f9e67b3aaf5fd7

    ER-136 - Made names for units fields consistent across backed/frontend

    • omod/src/main/webapp/resources/html/tabletapp/templates/patient/newIvFluidOrderDetails.html (version 149762c737747896fc61455e80f9e67b3aaf5fd7)
    • omod/src/main/webapp/resources/scripts/tabletapp/constants.js (version 149762c737747896fc61455e80f9e67b3aaf5fd7)
    • omod/src/main/webapp/resources/scripts/tabletapp/iv-fluid-orders-service.js (version 149762c737747896fc61455e80f9e67b3aaf5fd7)
    • omod/src/main/webapp/resources/scripts/tabletapp/iv-fluid-orders.js (version 149762c737747896fc61455e80f9e67b3aaf5fd7)
  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> 8558c8e61512fa261fccd388ef45dc18cd6d6fcb

    ER-136 - Added last 3 fluids

    • omod/src/main/webapp/resources/scripts/tabletapp/constants.js (version 8558c8e61512fa261fccd388ef45dc18cd6d6fcb)
  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> 25d7ac327c20456939064069c95f812d6a1de341

    ER-136 - Created different fields for Bolus Rate and Infusion Duration

    • api/src/main/java/org/openmrs/module/ebolaexample/domain/IvFluidOrder.java (version 25d7ac327c20456939064069c95f812d6a1de341)
    • api/src/main/resources/hibernate/IvFluidOrder.hbm.xml (version 25d7ac327c20456939064069c95f812d6a1de341)
    • api/src/main/resources/liquibase.xml (version 25d7ac327c20456939064069c95f812d6a1de341)
    • api/src/test/java/org/openmrs/module/ebolaexample/domain/IvFluidOrderTest.java (version 25d7ac327c20456939064069c95f812d6a1de341)
    • omod/src/main/java/org/openmrs/module/ebolaexample/rest/IvFluidOrderSubclassHandler.java (version 25d7ac327c20456939064069c95f812d6a1de341)
  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> aec657fef4966014aea1d91abc78baa94f77b011

    Merge branch 'master' into iv-fluid-orders

  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> 1ebaef748fc7f156c63b970dd6a1a4f76805916a m

    Merge branch 'master' into iv-fluid-orders

  • michaelpai <mpai@thoughtworks.com>

    michaelpai <mpai@thoughtworks.com> 21b0fb8733d731ffc43c002f105ad2ae1258b309 m

    [Michael|Deluan] ER-136 - Added iv fluid order service (incomplete) and fixed iv fluid order type conversion error.

    • omod/src/main/webapp/resources/scripts/tabletapp/iv-fluid-orders-service.js (version 21b0fb8733d731ffc43c002f105ad2ae1258b309)
  • michaelpai <mpai@thoughtworks.com>

    michaelpai <mpai@thoughtworks.com> a131b5526b8b37a9844d5df1913b1a09e5da7a79 m

    [Michael|Deluan] ER-136 - iv fluid order service temp.

    • api/src/test/java/org/openmrs/module/ebolaexample/domain/IvFluidOrderTest.java (version a131b5526b8b37a9844d5df1913b1a09e5da7a79)
    • omod/src/main/java/org/openmrs/module/ebolaexample/rest/IvFluidOrderSubclassHandler.java (version a131b5526b8b37a9844d5df1913b1a09e5da7a79)
    • omod/src/main/webapp/resources/scripts/tabletapp/iv-fluid-orders-service.js (version a131b5526b8b37a9844d5df1913b1a09e5da7a79)
  • michaelpai <mpai@thoughtworks.com>

    michaelpai <mpai@thoughtworks.com> 655950c53cee1fcc86f6b3391dc768473a5fbc5d m

    Merge branch 'master' into iv-fluid-orders

  • michaelpai <mpai@thoughtworks.com>

    michaelpai <mpai@thoughtworks.com> 6e674477b4fba01a19cec4e70ab55b8ccf050f0e m

    [Michael|Deluan] ER-136 - Finished implementing the UI for IV fluid orders.

    • omod/src/main/webapp/resources/html/tabletapp/templates/patient/newIvFluidOrderDetails.html (version 6e674477b4fba01a19cec4e70ab55b8ccf050f0e)
    • omod/src/main/webapp/resources/scripts/tabletapp/constants.js (version 6e674477b4fba01a19cec4e70ab55b8ccf050f0e)
    • omod/src/main/webapp/resources/scripts/tabletapp/iv-fluid-orders.js (version 6e674477b4fba01a19cec4e70ab55b8ccf050f0e)
  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> bc0fa8e330eb2bd69a4163cb7b3e9e22676c0fd0 m

    ER-136 - Commented out the IvFluidOrder Subclass Handler, as it is crashing when trying to display the prescriptions on the tablet

    • omod/src/main/java/org/openmrs/module/ebolaexample/rest/IvFluidOrderSubclassHandler.java (version bc0fa8e330eb2bd69a4163cb7b3e9e22676c0fd0)
  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> d153575f9fdc3d8b54bde83a289ecf728ac7a96b m

    ER-136 - (incomplete) step 3 (IV Fluid Order Details)

    • omod/src/main/webapp/resources/html/tabletapp/templates/patient/newIvFluidOrder.html (version d153575f9fdc3d8b54bde83a289ecf728ac7a96b)
    • omod/src/main/webapp/resources/html/tabletapp/templates/patient/newIvFluidOrderDetails.html (version d153575f9fdc3d8b54bde83a289ecf728ac7a96b)
    • omod/src/main/webapp/resources/scripts/tabletapp/app.js (version d153575f9fdc3d8b54bde83a289ecf728ac7a96b)
    • omod/src/main/webapp/resources/scripts/tabletapp/constants.js (version d153575f9fdc3d8b54bde83a289ecf728ac7a96b)
    • omod/src/main/webapp/resources/scripts/tabletapp/iv-fluid-orders.js (version d153575f9fdc3d8b54bde83a289ecf728ac7a96b)
  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> 981474d6aabb5ccee098a936b7d529ee0f769bff m

    ER-136 - Steps 1 and 2 of IV Fluid Order

    • omod/src/main/webapp/resources/html/tabletapp/index.html (version 981474d6aabb5ccee098a936b7d529ee0f769bff)
    • omod/src/main/webapp/resources/html/tabletapp/templates/patient/newIvFluidOrder.html (version 981474d6aabb5ccee098a936b7d529ee0f769bff)
    • omod/src/main/webapp/resources/html/tabletapp/templates/sidebar.html (version 981474d6aabb5ccee098a936b7d529ee0f769bff)
    • omod/src/main/webapp/resources/scripts/tabletapp/app.js (version 981474d6aabb5ccee098a936b7d529ee0f769bff)
    • omod/src/main/webapp/resources/scripts/tabletapp/constants.js (version 981474d6aabb5ccee098a936b7d529ee0f769bff)
    • omod/src/main/webapp/resources/scripts/tabletapp/iv-fluid-orders.js (version 981474d6aabb5ccee098a936b7d529ee0f769bff)
    • omod/src/main/webapp/resources/scripts/tabletapp/patients.js (version 981474d6aabb5ccee098a936b7d529ee0f769bff)
  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> ab7749729aceb7a3ab886694d5b4af9011c92f1a m

    Merge branch 'master' into iv-fluid-orders

  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> e6de68f198674d24a3bfeea6059bf18d63f6f2c8 m

    Merge branch 'master' into iv-fluid-orders

  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> 2c40a64eb2168efa2e3e6c7debcf8f0b54c5b89e m

    ER-136 - Fixed mappings for hibernate

    • api/src/main/java/org/openmrs/module/ebolaexample/domain/AdministrationType.java (version 2c40a64eb2168efa2e3e6c7debcf8f0b54c5b89e)
    • api/src/main/java/org/openmrs/module/ebolaexample/domain/IvFluidOrder.java (version 2c40a64eb2168efa2e3e6c7debcf8f0b54c5b89e)
    • api/src/main/resources/hibernate/IvFluidOrder.hbm.xml (version 2c40a64eb2168efa2e3e6c7debcf8f0b54c5b89e)
    • api/src/main/resources/liquibase.xml (version 2c40a64eb2168efa2e3e6c7debcf8f0b54c5b89e)
    • api/src/test/java/org/openmrs/module/ebolaexample/domain/IvFluidOrderTest.java (version 2c40a64eb2168efa2e3e6c7debcf8f0b54c5b89e)
    • api/src/test/resources/test-hibernate.cfg.xml (version 2c40a64eb2168efa2e3e6c7debcf8f0b54c5b89e)
    • omod/src/main/java/org/openmrs/module/ebolaexample/rest/IvFluidOrderSubclassHandler.java (version 2c40a64eb2168efa2e3e6c7debcf8f0b54c5b89e)
    • omod/src/main/resources/hibernate/IvFluidOrder.hbm.xml (version 2c40a64eb2168efa2e3e6c7debcf8f0b54c5b89e)
  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> b1ffc3db87179ad20634b076f2b127872ee1d9bc m

    ER-136 - Removed redundant implements clause

    • omod/src/main/java/org/openmrs/module/ebolaexample/rest/IvFluidOrderSubclassHandler.java (version b1ffc3db87179ad20634b076f2b127872ee1d9bc)
  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> 895fd569d471a42c15ddf0de31c45b4e3820688c m

    ER-136 - Added IvFluidOrder domain class and DB table

    • api/src/main/java/org/openmrs/module/ebolaexample/domain/IvFluidOrder.java (version 895fd569d471a42c15ddf0de31c45b4e3820688c)
    • api/src/main/java/org/openmrs/module/ebolaexample/metadata/EbolaMetadata.java (version 895fd569d471a42c15ddf0de31c45b4e3820688c)
    • api/src/main/java/org/openmrs/module/ebolaexample/metadata/OrderTypeDeployHandler.java (version 895fd569d471a42c15ddf0de31c45b4e3820688c)
    • api/src/main/resources/liquibase.xml (version 895fd569d471a42c15ddf0de31c45b4e3820688c)
    • omod/src/main/resources/config.xml (version 895fd569d471a42c15ddf0de31c45b4e3820688c)
    • omod/src/main/resources/hibernate/IvFluidOrder.hbm.xml (version 895fd569d471a42c15ddf0de31c45b4e3820688c)
  • Deluan <deluan@thoughtworks.com>

    Deluan <deluan@thoughtworks.com> 0f89e3485692387c5ff6cec98bff938648bdbe4a m

    ER-136 - Implemented SubclassHandler for resource ivfluidorder

    • omod/src/main/java/org/openmrs/module/ebolaexample/rest/IvFluidOrderSubclassHandler.java (version 0f89e3485692387c5ff6cec98bff938648bdbe4a)