Build #173

Plan branch:

Build: #173 was successful Changes by Pawel Muchowski <pmuchowski@soldevelo.com> and Daniel Kayiwa

Code commits

Git

  • Daniel Kayiwa

    Daniel Kayiwa 3a8fb2f1686b1749ebe84198c77db841c1370718

    Merge pull request #1215 from pmuchowski/TRUNK-3963-1.9.x
    TRUNK-3963: Visit validator should prevent or allow overlapping of visit...

  • Pawel Muchowski <pmuchowski@soldevelo.com>

    Pawel Muchowski <pmuchowski@soldevelo.com> d9ce0520e3417ecb31a509bba5137fdd5efd91c7

    TRUNK-3963: Visit validator should prevent or allow overlapping of visits depending on global property
    Conflicts:
            api/src/main/java/org/openmrs/util/OpenmrsConstants.java
            api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
            api/src/test/java/org/openmrs/api/db/hibernate/PatientSearchCriteriaTest.java
            api/src/test/java/org/openmrs/util/GlobalPropertiesTestHelper.java

    Fixing failing tests for: Visit validator should prevent or allow
    overlapping of visits depending on global property - TRUNK-3963
    Conflicts:
            api/src/test/java/org/openmrs/validator/VisitValidatorTest.java

    Putting back commented out code at: Visit validator should prevent or
    allow overlapping of visits depending on global property - TRUNK-3963
    Conflicts:
            api/src/main/java/org/openmrs/util/OpenmrsConstants.java

    TRUNK-3963: Missing messages added

    TRUNK-3963: Visit validator should prevent or allow overlapping of visits depending on global property

    Conflicts:
            api/src/main/java/org/openmrs/util/OpenmrsConstants.java

    • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version d9ce0520e3417ecb31a509bba5137fdd5efd91c7)
    • api/src/main/java/org/openmrs/validator/VisitValidator.java (version d9ce0520e3417ecb31a509bba5137fdd5efd91c7)
    • api/src/test/java/org/openmrs/api/VisitServiceTest.java (version d9ce0520e3417ecb31a509bba5137fdd5efd91c7)
    • api/src/test/java/org/openmrs/util/GlobalPropertiesTestHelper.java (version d9ce0520e3417ecb31a509bba5137fdd5efd91c7)
    • api/src/test/java/org/openmrs/validator/VisitValidatorTest.java (version d9ce0520e3417ecb31a509bba5137fdd5efd91c7)
    • api/src/test/resources/org/openmrs/validator/include/VisitValidatorTest.xml (version d9ce0520e3417ecb31a509bba5137fdd5efd91c7)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version d9ce0520e3417ecb31a509bba5137fdd5efd91c7)