Build #51

Plan branch:

Build: #51 was successful Scheduled with changes by 3 people

Code commits

openmrs-core master

  • Daniel Kayiwa

    Daniel Kayiwa bab6e3e35cf9b96ef3ea3f2c16992b0de9057e44

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

    • api/src/test/java/org/openmrs/validator/VisitValidatorTest.java (version bab6e3e35cf9b96ef3ea3f2c16992b0de9057e44)
  • Daniel Kayiwa

    Daniel Kayiwa af097f2f7d568be31948461c79d22c6df47c2db3

    Merge branch 'TRUNK-3963' of https://github.com/WolfSchlegel/openmrs-core into WolfSchlegel-TRUNK-3963

  • Daniel Kayiwa

    Daniel Kayiwa ae21c2c2749acd5532c0b210d4a6c06a374b07da

    Merge pull request #676 from ShubhamRai/TRUNK-3335
    TRUNK-3335 Retired Provider Attribute Types should not be shown when add...[d31bfa5_BAM_file_list]
    [d31bfa5_BAM_hash]4681fd37fc4c44da524f770865eb37a900355e64
    [d31bfa5_BAM_commiter_name]dkayiwa
    [d31bfa5_BAM_commiter_email]dkayiwa@openmrs.org
    [d31bfa5_BAM_timestamp]1394100398
    [d31bfa5_BAM_commit_message]Merge pull request #724 from aka001/TRUNK--377
    TRUNK-377 Clarify required fields on management interfaces[d31bfa5_BAM_file_list]
    [d31bfa5_BAM_hash]b1f6420ab8f3b5190319657a74f71393612baf19
    [d31bfa5_BAM_commiter_name]Akash Agrawall
    [d31bfa5_BAM_commiter_email]akash.wanted@gmail.com
    [d31bfa5_BAM_timestamp]1394058028
    [d31bfa5_BAM_commit_message]TRUNK-377 Clarify required fields on management interfaces

    • web/src/main/java/org/openmrs/web/controller/ConceptFormController.java (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceForm.jsp (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/src/main/webapp/WEB-INF/view/admin/maintenance/implementationIdForm.jsp (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/src/main/webapp/WEB-INF/view/admin/patients/findDuplicatePatients.jsp (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/src/main/webapp/WEB-INF/view/admin/person/relationshipTypeForm.jsp (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/src/main/webapp/WEB-INF/view/admin/users/alertForm.jsp (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
    • webapp/velocity.log (version ae21c2c2749acd5532c0b210d4a6c06a374b07da)
  • ShubhamRai <thunderking11@gmail.com>

    ShubhamRai <thunderking11@gmail.com> 6ad3b892dfe41fddd3a76362178bf742a8253db3

    TRUNK-3335 Retired Provider Attribute Types should not be shown when adding/editing providers

    • api/src/main/java/org/openmrs/module/ModuleUtil.java (version 6ad3b892dfe41fddd3a76362178bf742a8253db3)
    • api/src/main/java/org/openmrs/validator/BaseCustomizableValidator.java (version 6ad3b892dfe41fddd3a76362178bf742a8253db3)
  • Wolf Schlegel <wolf.schlegel@thoughtworks.com>

    Wolf Schlegel <wolf.schlegel@thoughtworks.com> 749a4950f7098a55699b3b74cabb9326f415a6b7

    Implemented checks for overlapping visits

    • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 749a4950f7098a55699b3b74cabb9326f415a6b7)
    • api/src/main/java/org/openmrs/validator/VisitValidator.java (version 749a4950f7098a55699b3b74cabb9326f415a6b7)
    • api/src/test/java/org/openmrs/api/VisitServiceTest.java (version 749a4950f7098a55699b3b74cabb9326f415a6b7)
    • api/src/test/java/org/openmrs/api/db/PatientDAOTest.java (version 749a4950f7098a55699b3b74cabb9326f415a6b7)
    • api/src/test/java/org/openmrs/api/db/PatientSearchTestHelper.java (version 749a4950f7098a55699b3b74cabb9326f415a6b7)
    • api/src/test/java/org/openmrs/api/db/hibernate/PatientSearchCriteriaTest.java (version 749a4950f7098a55699b3b74cabb9326f415a6b7)
    • api/src/test/java/org/openmrs/util/GlobalPropertiesTestHelper.java (version 749a4950f7098a55699b3b74cabb9326f415a6b7)
    • api/src/test/java/org/openmrs/validator/VisitValidatorTest.java (version 749a4950f7098a55699b3b74cabb9326f415a6b7)
    • api/src/test/resources/org/openmrs/validator/include/VisitValidatorTest.xml (version 749a4950f7098a55699b3b74cabb9326f415a6b7)