Trunk 2136 #528
Closed
Trunk 2136 #528
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ervice Checking results of test & added extra tests to check regular method behaviour Removing stray includes from bas merge - TRUNK-3812 Follow up to address review changes
…ervice Checking results of test & added extra tests to check regular method behaviour Removing stray includes from bas merge - TRUNK-3812 Follow up to address review changes applying auto format changes
…updating an existing attribute (cherry picked from commit e763091)
…ated privileges (cherry picked from commit b9b88eb) Conflicts: api/src/main/java/org/openmrs/api/context/Daemon.java
(cherry picked from commit 30d6267)
(cherry picked from commit c55a44b)
(cherry picked from commit f6d1c19)
…ictionary correctly Follow to ensure we dont add the proposal several times - TRUNK-3593 Fixed issues where the synonym and other data dont get saved - TRUNK-3593 Follow up to get make sure duplicate synonyms and obs are not created - TRUNK-3593 Made some minor fixes due to merge errors - TRUNK-3593 Improved the alert message when a synonym is added - TRUNK-3593
Fixed failing unit test - TRUNK-3593
BaseWebContextSensitivetest - TRUNK-3593
…n names (cherry picked from commit 81d0750) Conflicts: api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
(cherry picked from commit 91116b9)
…ry exception when writing warnings to file (cherry picked from commit 8b9b742)
…n invokin Encounter.addObs (cherry picked from commit 41f320b)
log in attempts - TRUNK-3982
to OpenMRS core - TRUNK-3947
TRUNK-4141 Using batch-fetch to load Obs and ObsGroup
TRUNK-4105: Add index for code column on the concept_reference_term tabl...
message after installing - TRUNK-4019
ModuleActivator.started()/.contextRefreshed() not called when module is stopped/restarted or newly uploaded - TRUNK-4134
need to be set to retired. I changed the argument from being empty to false. This will allow only the providerAddributeTypes which are not retired to be displayed.(cherry picked from commit 7de58a7)
…arger than 50 chars(cherry picked from commit e6b5558)
…arger than 50 chars(cherry picked from commit 8d8e5e1)
…yed with the class="retired" if they are selected on the location. If they are not selected, they will be not presented. (cherry picked from commit 03eba15)
requires location - TRUNK-4056
requires location - TRUNK-4056
(cherry picked from commit 358de98) manually added missing imports
Conflicts: .gitignore api/pom.xml api/src/main/java/org/openmrs/BaseOpenmrsObject.java api/src/main/java/org/openmrs/Drug.java api/src/main/java/org/openmrs/Encounter.java api/src/main/java/org/openmrs/Obs.java api/src/main/java/org/openmrs/Order.java api/src/main/java/org/openmrs/OrderType.java api/src/main/java/org/openmrs/TestOrder.java api/src/main/java/org/openmrs/annotation/DisableHandlers.java api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java api/src/main/java/org/openmrs/aop/LoggingAdvice.java api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java api/src/main/java/org/openmrs/api/AdministrationService.java api/src/main/java/org/openmrs/api/ConceptService.java api/src/main/java/org/openmrs/api/EncounterService.java api/src/main/java/org/openmrs/api/FormService.java api/src/main/java/org/openmrs/api/LocationService.java api/src/main/java/org/openmrs/api/OrderService.java api/src/main/java/org/openmrs/api/PatientService.java api/src/main/java/org/openmrs/api/PatientSetService.java api/src/main/java/org/openmrs/api/ProviderService.java api/src/main/java/org/openmrs/api/UserService.java api/src/main/java/org/openmrs/api/context/Daemon.java api/src/main/java/org/openmrs/api/db/PatientDAO.java api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java api/src/main/java/org/openmrs/api/db/hibernate/HibernatePersonDAO.java api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java api/src/main/java/org/openmrs/migration/MigrationHelper.java api/src/main/java/org/openmrs/module/ModuleConstants.java api/src/main/java/org/openmrs/module/ModuleFactory.java api/src/main/java/org/openmrs/module/UpdateFileParser.java api/src/main/java/org/openmrs/notification/Note.java api/src/main/java/org/openmrs/util/DatabaseUpdater.java api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java api/src/main/java/org/openmrs/util/OpenmrsConstants.java api/src/main/java/org/openmrs/util/OpenmrsUtil.java api/src/main/java/org/openmrs/util/PrivilegeConstants.java api/src/main/java/org/openmrs/util/databasechange/SourceMySqldiffFile.java api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java api/src/main/java/org/openmrs/validator/ConceptValidator.java api/src/main/java/org/openmrs/validator/DrugOrderValidator.java api/src/main/java/org/openmrs/validator/EncounterRoleValidator.java api/src/main/java/org/openmrs/validator/PatientProgramValidator.java api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java api/src/main/java/org/openmrs/validator/ProgramValidator.java api/src/main/java/org/openmrs/validator/UserValidator.java api/src/main/resources/hibernate.cfg.xml api/src/main/resources/liquibase-update-to-latest.xml api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml api/src/test/java/org/openmrs/EncounterTest.java api/src/test/java/org/openmrs/ObsTest.java api/src/test/java/org/openmrs/PatientProgramTest.java api/src/test/java/org/openmrs/ProviderTest.java api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java api/src/test/java/org/openmrs/api/AdministrationServiceTest.java api/src/test/java/org/openmrs/api/ConceptServiceTest.java api/src/test/java/org/openmrs/api/EncounterServiceTest.java api/src/test/java/org/openmrs/api/OrderServiceTest.java api/src/test/java/org/openmrs/api/PatientServiceTest.java api/src/test/java/org/openmrs/api/PersonServiceTest.java api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java api/src/test/java/org/openmrs/api/ProviderServiceTest.java api/src/test/java/org/openmrs/api/UserServiceTest.java api/src/test/java/org/openmrs/api/VisitServiceTest.java api/src/test/java/org/openmrs/api/context/DaemonTest.java api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java api/src/test/java/org/openmrs/api/db/PatientDAOTest.java api/src/test/java/org/openmrs/api/db/UserDAOTest.java api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java api/src/test/java/org/openmrs/module/ModuleUtilTest.java api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java api/src/test/java/org/openmrs/validator/PatientIdentifierValidatorTest.java api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml api/src/test/resources/org/openmrs/api/include/OrderServiceTest-deleteObsThatReference.xml api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml api/src/test/resources/org/openmrs/include/standardTestDataset.xml api/src/test/resources/org/openmrs/module/include/test1-1.0-SNAPSHOT.omod api/src/test/resources/org/openmrs/module/include/test1-2.0-SNAPSHOT.omod api/src/test/resources/org/openmrs/module/include/test2-1.0-SNAPSHOT.omod api/src/test/resources/org/openmrs/module/include/test3-1.0-SNAPSHOT.omod api/src/test/resources/org/openmrs/module/include/test3-2.0-SNAPSHOT.omod api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml pom.xml test/pom.xml tools/pom.xml web/pom.xml web/src/main/java/org/openmrs/module/web/WebModuleUtil.java web/src/main/java/org/openmrs/web/Listener.java web/src/main/java/org/openmrs/web/WebDaemon.java web/src/main/java/org/openmrs/web/controller/ConceptFormController.java web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java web/src/main/java/org/openmrs/web/dwr/DWROrderService.java web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java web/src/main/java/org/openmrs/web/taglib/FormatTag.java web/src/main/java/org/openmrs/web/taglib/RequireTag.java web/src/main/resources/openmrs-servlet.xml web/src/main/resources/org/openmrs/web/filter/initialization/installmethod.vm web/src/test/java/org/openmrs/module/web/WebModuleUtilTest.java web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java web/src/test/java/org/openmrs/web/WebUtilTest.java web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java webapp/pom.xml webapp/src/main/resources/liquibase-demo-data.zip webapp/src/main/webapp/WEB-INF/messages.properties webapp/src/main/webapp/WEB-INF/messages_fa.properties webapp/src/main/webapp/WEB-INF/messages_hi.properties webapp/src/main/webapp/WEB-INF/messages_pt.properties webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld webapp/src/main/webapp/WEB-INF/template/gutter.jsp webapp/src/main/webapp/WEB-INF/template/headerFull.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptProposalForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptStopWordForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterRoleForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/encounters/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeList.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/formList.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/formResources.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7InArchiveMigration.jsp webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7SourceForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/hl7/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/index.jsp webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp webapp/src/main/webapp/WEB-INF/view/admin/locations/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/locations/locationAttributeType.jsp webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/locations/locationTagEdit.jsp webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/maintenance/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/modules/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/modules/moduleList.jsp webapp/src/main/webapp/WEB-INF/view/admin/observations/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/orderListByPatient.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/orderTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/include/editPatientIdentifier.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/mergePatientsForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/addPerson.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/include/editPersonInfo.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/include/showPersonInfo.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/personAttributeTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/programs/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/provider/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/provider/providerAttributeTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/provider/providerForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/scheduler/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerList.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/alertForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/changePasswordForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/privilegeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/visits/configureVisits.jsp webapp/src/main/webapp/WEB-INF/view/admin/visits/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/visits/visitAttributeTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/visits/visitTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp webapp/src/main/webapp/WEB-INF/view/portlets/customMostRecentObs.jsp webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientDemographics.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientEncounters.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientGraphs.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp webapp/src/main/webapp/WEB-INF/view/portlets/personRelationships.jsp webapp/src/main/webapp/WEB-INF/view/portlets/welcome.jsp webapp/src/main/webapp/WEB-INF/view/scripts/calendar/calendar.js webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js webapp/src/main/webapp/WEB-INF/web.xml webapp/src/main/webapp/dictionary/conceptForm.js webapp/src/main/webapp/errorhandler.jsp webapp/src/main/webapp/openmrs.css webapp/src/main/webapp/openmrs.js
Conflicts: .gitignore api/pom.xml api/src/main/java/org/openmrs/BaseOpenmrsObject.java api/src/main/java/org/openmrs/Drug.java api/src/main/java/org/openmrs/Encounter.java api/src/main/java/org/openmrs/Obs.java api/src/main/java/org/openmrs/Order.java api/src/main/java/org/openmrs/OrderType.java api/src/main/java/org/openmrs/TestOrder.java api/src/main/java/org/openmrs/annotation/DisableHandlers.java api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java api/src/main/java/org/openmrs/aop/LoggingAdvice.java api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java api/src/main/java/org/openmrs/api/AdministrationService.java api/src/main/java/org/openmrs/api/ConceptService.java api/src/main/java/org/openmrs/api/EncounterService.java api/src/main/java/org/openmrs/api/FormService.java api/src/main/java/org/openmrs/api/LocationService.java api/src/main/java/org/openmrs/api/OrderService.java api/src/main/java/org/openmrs/api/PatientService.java api/src/main/java/org/openmrs/api/PatientSetService.java api/src/main/java/org/openmrs/api/ProviderService.java api/src/main/java/org/openmrs/api/UserService.java api/src/main/java/org/openmrs/api/context/Daemon.java api/src/main/java/org/openmrs/api/db/PatientDAO.java api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java api/src/main/java/org/openmrs/api/db/hibernate/HibernatePersonDAO.java api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java api/src/main/java/org/openmrs/migration/MigrationHelper.java api/src/main/java/org/openmrs/module/ModuleConstants.java api/src/main/java/org/openmrs/module/ModuleFactory.java api/src/main/java/org/openmrs/module/UpdateFileParser.java api/src/main/java/org/openmrs/notification/Note.java api/src/main/java/org/openmrs/util/DatabaseUpdater.java api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java api/src/main/java/org/openmrs/util/OpenmrsConstants.java api/src/main/java/org/openmrs/util/OpenmrsUtil.java api/src/main/java/org/openmrs/util/PrivilegeConstants.java api/src/main/java/org/openmrs/util/databasechange/SourceMySqldiffFile.java api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java api/src/main/java/org/openmrs/validator/ConceptValidator.java api/src/main/java/org/openmrs/validator/DrugOrderValidator.java api/src/main/java/org/openmrs/validator/EncounterRoleValidator.java api/src/main/java/org/openmrs/validator/PatientProgramValidator.java api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java api/src/main/java/org/openmrs/validator/ProgramValidator.java api/src/main/java/org/openmrs/validator/UserValidator.java api/src/main/resources/hibernate.cfg.xml api/src/main/resources/liquibase-update-to-latest.xml api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml api/src/test/java/org/openmrs/EncounterTest.java api/src/test/java/org/openmrs/ObsTest.java api/src/test/java/org/openmrs/PatientProgramTest.java api/src/test/java/org/openmrs/ProviderTest.java api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java api/src/test/java/org/openmrs/api/AdministrationServiceTest.java api/src/test/java/org/openmrs/api/ConceptServiceTest.java api/src/test/java/org/openmrs/api/EncounterServiceTest.java api/src/test/java/org/openmrs/api/OrderServiceTest.java api/src/test/java/org/openmrs/api/PatientServiceTest.java api/src/test/java/org/openmrs/api/PersonServiceTest.java api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java api/src/test/java/org/openmrs/api/ProviderServiceTest.java api/src/test/java/org/openmrs/api/UserServiceTest.java api/src/test/java/org/openmrs/api/VisitServiceTest.java api/src/test/java/org/openmrs/api/context/DaemonTest.java api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java api/src/test/java/org/openmrs/api/db/PatientDAOTest.java api/src/test/java/org/openmrs/api/db/UserDAOTest.java api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java api/src/test/java/org/openmrs/module/ModuleUtilTest.java api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java api/src/test/java/org/openmrs/validator/PatientIdentifierValidatorTest.java api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml api/src/test/resources/org/openmrs/api/include/OrderServiceTest-deleteObsThatReference.xml api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml api/src/test/resources/org/openmrs/include/standardTestDataset.xml api/src/test/resources/org/openmrs/module/include/test1-1.0-SNAPSHOT.omod api/src/test/resources/org/openmrs/module/include/test1-2.0-SNAPSHOT.omod api/src/test/resources/org/openmrs/module/include/test2-1.0-SNAPSHOT.omod api/src/test/resources/org/openmrs/module/include/test3-1.0-SNAPSHOT.omod api/src/test/resources/org/openmrs/module/include/test3-2.0-SNAPSHOT.omod api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml pom.xml test/pom.xml tools/pom.xml web/pom.xml web/src/main/java/org/openmrs/module/web/WebModuleUtil.java web/src/main/java/org/openmrs/web/Listener.java web/src/main/java/org/openmrs/web/WebDaemon.java web/src/main/java/org/openmrs/web/controller/ConceptFormController.java web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java web/src/main/java/org/openmrs/web/dwr/DWROrderService.java web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java web/src/main/java/org/openmrs/web/taglib/FormatTag.java web/src/main/java/org/openmrs/web/taglib/RequireTag.java web/src/main/resources/openmrs-servlet.xml web/src/main/resources/org/openmrs/web/filter/initialization/installmethod.vm web/src/test/java/org/openmrs/module/web/WebModuleUtilTest.java web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java web/src/test/java/org/openmrs/web/WebUtilTest.java web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java webapp/pom.xml webapp/src/main/resources/liquibase-demo-data.zip webapp/src/main/webapp/WEB-INF/messages.properties webapp/src/main/webapp/WEB-INF/messages_fa.properties webapp/src/main/webapp/WEB-INF/messages_hi.properties webapp/src/main/webapp/WEB-INF/messages_pt.properties webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld webapp/src/main/webapp/WEB-INF/template/gutter.jsp webapp/src/main/webapp/WEB-INF/template/headerFull.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptProposalForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptStopWordForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterRoleForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/encounters/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeList.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/formList.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/formResources.jsp webapp/src/main/webapp/WEB-INF/view/admin/forms/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7InArchiveMigration.jsp webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7SourceForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/hl7/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/index.jsp webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp webapp/src/main/webapp/WEB-INF/view/admin/locations/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/locations/locationAttributeType.jsp webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/locations/locationTagEdit.jsp webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/maintenance/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/modules/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/modules/moduleList.jsp webapp/src/main/webapp/WEB-INF/view/admin/observations/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/orderListByPatient.jsp webapp/src/main/webapp/WEB-INF/view/admin/orders/orderTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/include/editPatientIdentifier.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/mergePatientsForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/addPerson.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/include/editPersonInfo.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/include/showPersonInfo.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/personAttributeTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/programs/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/provider/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/provider/providerAttributeTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/provider/providerForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/scheduler/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerList.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/alertForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/changePasswordForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/privilegeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/visits/configureVisits.jsp webapp/src/main/webapp/WEB-INF/view/admin/visits/localHeader.jsp webapp/src/main/webapp/WEB-INF/view/admin/visits/visitAttributeTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp webapp/src/main/webapp/WEB-INF/view/admin/visits/visitTypeForm.jsp webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp webapp/src/main/webapp/WEB-INF/view/portlets/customMostRecentObs.jsp webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientDemographics.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientEncounters.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientGraphs.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp webapp/src/main/webapp/WEB-INF/view/portlets/personRelationships.jsp webapp/src/main/webapp/WEB-INF/view/portlets/welcome.jsp webapp/src/main/webapp/WEB-INF/view/scripts/calendar/calendar.js webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js webapp/src/main/webapp/WEB-INF/web.xml webapp/src/main/webapp/dictionary/conceptForm.js webapp/src/main/webapp/errorhandler.jsp webapp/src/main/webapp/openmrs.css webapp/src/main/webapp/openmrs.js
RandilaP
pushed a commit
to RandilaP/openmrs-core
that referenced
this pull request
Jul 31, 2023
This supports React 18 using createRoot instead of ReactDOM.render
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is more precise than the previous pull. please check it