Build #177

Plan branch:

Build: #177 was successful Scheduled with changes by 4 people

Code commits

openmrs-core master

  • Rafal Korytkowski

    Rafal Korytkowski 08e0bc1ddac0499972d491103d72c313aef77128

    TRUNK-4389 Added orderType check

    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 08e0bc1ddac0499972d491103d72c313aef77128)
    • api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version 08e0bc1ddac0499972d491103d72c313aef77128)
    • api/src/test/java/org/openmrs/OrderTest.java (version 08e0bc1ddac0499972d491103d72c313aef77128)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 08e0bc1ddac0499972d491103d72c313aef77128)
  • Daniel Kayiwa

    Daniel Kayiwa ebd30d3b2bee221c764d5ee88f061212915c40ef

    Merge pull request #978 from akolodziejski/TRUNK-4406
    TRUNK-4406: Remove duplicate keys from message resource files

  • Rafal Korytkowski

    Rafal Korytkowski 648a64ea6a36778dd19407386a53eb1e6784282e

    Fixed tests when running with sonar

    • api/src/test/java/org/openmrs/OrderTest.java (version 648a64ea6a36778dd19407386a53eb1e6784282e)
  • Rafal Korytkowski

    Rafal Korytkowski 108d2bfd4d619ed861a36709bb2775763ed6b9ab

    TRUNK-4389 Fixed tests and formatting

    • api/src/main/java/org/openmrs/OrderType.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
    • api/src/main/java/org/openmrs/api/OrderService.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
    • api/src/main/java/org/openmrs/module/Module.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
    • api/src/main/java/org/openmrs/util/DoubleRange.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
  • Rafal Korytkowski

    Rafal Korytkowski 1343c372d8bb2f0b57968e694346e71b1a223ae1

    TRUNK-4389: Added DRUG_ORDER_TYPE_UUID & TEST_ORDER_TYPE_UUID constants to OrderType class, Added unit test method saveOrder_shouldSetOrderTypeOfDrugOrderToDrugOrderIfNotSetAndConceptNotMapped to OrderServiceTest, Added unit tests and code to set order type of drug/test order to drug/test order respectively if not set and concept not mapped in saveOrder() method
    (cherry picked from commit cdb90e75c2fae11492fba94121c05ea3968143f5)

    • api/src/main/java/org/openmrs/OrderType.java (version 1343c372d8bb2f0b57968e694346e71b1a223ae1)
    • api/src/main/java/org/openmrs/api/OrderService.java (version 1343c372d8bb2f0b57968e694346e71b1a223ae1)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 1343c372d8bb2f0b57968e694346e71b1a223ae1)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 1343c372d8bb2f0b57968e694346e71b1a223ae1)
  • Rafal Korytkowski

    Rafal Korytkowski 312c26b5ea90296a0cbfae20e4dd40d2c749e7f7

    Merge pull request #972 from vinayvenu/TRUNK-4414
    TRUNK-4414 - Ensure message correctly reflects validation error

  • Arkadiusz Kolodziejski <arkadiusz.kolodziejski@gmail.com>

    Arkadiusz Kolodziejski <arkadiusz.kolodziejski@gmail.com> f6528709e0ce21205bc9418f7f5ed401f3361055

    TRUNK-4406: Remove duplicate keys from message resource files
    TRUNK-4406: Remove duplicate keys from message resource files - hindi

    TRUNK-4406: Remove duplicate keys from message resource files hi

    TRUNK-3064: Create unit test for duplicate messages

    • webapp/src/main/webapp/WEB-INF/messages.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
    • webapp/src/main/webapp/WEB-INF/messages_es.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
    • webapp/src/main/webapp/WEB-INF/messages_fa.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
    • webapp/src/main/webapp/WEB-INF/messages_hi.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
    • webapp/src/main/webapp/WEB-INF/messages_it.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
    • webapp/src/main/webapp/WEB-INF/messages_kh.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
  • Vinay Venu <vinayv@thoughtworks.com>

    Vinay Venu <vinayv@thoughtworks.com> f607e0ebf115450fbde1c953d6734ff8e317d358

    TRUNK-4414 - Ensure message correctly reflects validation error

    • webapp/src/main/webapp/WEB-INF/messages.properties (version f607e0ebf115450fbde1c953d6734ff8e317d358)