diff --git a/api/pom.xml b/api/pom.xml index ac78399eb..bdcdab281 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -174,15 +174,15 @@ patientflags-api-metadata - - org.openmrs.module - registrationcore-api - - - - org.openmrs.module - registrationapp-api - + + + + + + + + + org.openmrs.module diff --git a/api/src/main/resources/openmrs-distro.properties b/api/src/main/resources/openmrs-distro.properties index 62e601980..796851f0f 100644 --- a/api/src/main/resources/openmrs-distro.properties +++ b/api/src/main/resources/openmrs-distro.properties @@ -6,7 +6,7 @@ omod.metadatadeploy=${metadatadeployVersion} omod.reportingrest=${reportingRestVersion} omod.serialization.xstream.type=omod omod.serialization.xstream=${serializationxstreamVersion} -omod.registrationapp=${registrationappVersion} +#omod.registrationapp=${registrationappVersion} omod.event.groupId=org.openmrs omod.event=${eventVersion} omod.uilibrary=${uilibraryVersion} @@ -27,18 +27,18 @@ omod.referenceapplication=${referenceapplicationVersion} omod.htmlformentry=${htmlformentryVersion} omod.appframework=${appframeworkVersion} omod.referencemetadata=${referencemetadataVersion} -omod.coreapps=${coreappsVersion} +#omod.coreapps=${coreappsVersion} omod.reportingcompatibility=${reportingCompatibilityVersion} omod.reporting=${reportingVersion} omod.reportingui=${reportingUIVersion} omod.adminui=${adminuiVersion} -omod.registrationcore=${registrationcoreVersion} +#omod.registrationcore=${registrationcoreVersion} war.openmrs=${openMRSVersion} omod.webservices.rest=${webservices.restModuleVersion} omod.calculation=${calculationVersion} version=${project.parent.version} omod.uicommons=${uicommonsVersion} -omod.xforms=${xformsVersion} +#omod.xforms=${xformsVersion} omod.uiframework=${uiframeworkVersion} omod.metadatasharing=${metadatasharingVersion} omod.dataintegrity=${dataintegrityVersion} diff --git a/api/src/test/java/org/openmrs/module/ugandaemr/UgandaEMRServiceTest.java b/api/src/test/java/org/openmrs/module/ugandaemr/UgandaEMRServiceTest.java new file mode 100644 index 000000000..f50a36e60 --- /dev/null +++ b/api/src/test/java/org/openmrs/module/ugandaemr/UgandaEMRServiceTest.java @@ -0,0 +1,98 @@ +package org.openmrs.module.ugandaemr; + +import org.junit.Test; + +/** + * Test for generating the UIC task for patients without the UIC + */ +import java.util.Date; +import java.util.List; + + +import org.junit.Before; +import org.openmrs.*; +import org.openmrs.api.AdministrationService; +import org.openmrs.api.PatientService; +import org.openmrs.api.VisitService; +import org.openmrs.api.context.Context; +import org.openmrs.module.ugandaemr.api.UgandaEMRService; +import org.openmrs.test.BaseModuleContextSensitiveTest; + + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; + + +public class UgandaEMRServiceTest extends BaseModuleContextSensitiveTest { + + protected static final String UGANDAEMR_STANDARD_DATASET_XML = "org/openmrs/module/ugandaemr/include/standardTestDataset.xml"; + + + protected UgandaEMRService ugandaemrService; + protected PatientService patientService; + protected VisitService visitService; + protected AdministrationService administrationService; + + @Before + public void setup() throws Exception { + executeDataSet(UGANDAEMR_STANDARD_DATASET_XML); + ugandaemrService = Context.getService(UgandaEMRService.class); + patientService = Context.getPatientService(); + visitService = Context.getVisitService(); + administrationService = Context.getAdministrationService(); + } + + @Test + public void generateAndSaveUICForPatientsWithOut_shouldGenerateUICForPatientWithoutUIC() { + + List listBeforeGeneration = administrationService.executeSQL("select * from patient inner join patient_identifier pi on (patient.patient_id = pi.patient_id) inner join patient_identifier_type pit on (pi.identifier_type = pit.patient_identifier_type_id) where pit.uuid='877169c4-92c6-4cc9-bf45-1ab95faea242'", true); + + assertEquals(0, listBeforeGeneration.size()); + + ugandaemrService.generateAndSaveUICForPatientsWithOut(); + + List listAfterGeneration = administrationService.executeSQL("select * from patient inner join patient_identifier pi on (patient.patient_id = pi.patient_id) inner join patient_identifier_type pit on (pi.identifier_type = pit.patient_identifier_type_id) where pit.uuid='877169c4-92c6-4cc9-bf45-1ab95faea242'", true); + + assertNotEquals(0, listAfterGeneration.size()); + } + + @Test + public void generatePatientUIC_shouldGenerateUIC() { + Patient patient = patientService.getPatient(10003); + + String uniqueIdentifierCode = null; + uniqueIdentifierCode = ugandaemrService.generatePatientUIC(patient); + + assertEquals("XX-0117-1-01140411011213", uniqueIdentifierCode); + + } + + @Test + public void stopActiveOutPatientVisits_shouldCompleteAllVisitOfSetTypeInGlobalProperty() { + + assertTrue(visitService.getActiveVisitsByPatient(patientService.getPatient(10110)).size() > 0); + + ugandaemrService.stopActiveOutPatientVisits(); + + assertTrue(visitService.getActiveVisitsByPatient(patientService.getPatient(10110)).size() == 0); + + } + + @Test + public void isTransferredIn_ShouldReturnFalseWhenPatientIsNotTransferIn() { + Patient patient = patientService.getPatient(10008); + assertFalse(ugandaemrService.isTransferredIn(patient, new Date())); + + } + + @Test + public void isTransferredOut_ShouldReturnFalseWhenPatientIsNotTransferredOut() { + Context.getPatientService(); + Patient patient = patientService.getPatient(10008); + assertFalse(ugandaemrService.isTransferredIn(patient, new Date())); + } + + +} \ No newline at end of file diff --git a/api/src/test/resources/TestingApplicationContext.xml b/api/src/test/resources/TestingApplicationContext.xml new file mode 100644 index 000000000..e45a166c3 --- /dev/null +++ b/api/src/test/resources/TestingApplicationContext.xml @@ -0,0 +1,27 @@ + + + + + + + + classpath:hibernate.cfg.xml + classpath:test-hibernate.cfg.xml + + + + + + + + org.openmrs + + + + + diff --git a/api/src/test/resources/test-hibernate.cfg.xml b/api/src/test/resources/test-hibernate.cfg.xml new file mode 100644 index 000000000..099d4ba62 --- /dev/null +++ b/api/src/test/resources/test-hibernate.cfg.xml @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/omod/pom.xml b/omod/pom.xml index 6a8365603..04afef431 100644 --- a/omod/pom.xml +++ b/omod/pom.xml @@ -178,10 +178,10 @@ referenceapplication-omod - - org.openmrs.module - registrationapp-api - + + + + org.openmrs.module @@ -231,10 +231,10 @@ org.openmrs.module ugandaemrfingerprint-omod - - org.openmrs.module - coreapps-omod - + + + + org.openmrs.module patientqueueing-api diff --git a/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/CheckInFragmentController.java b/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/CheckInFragmentController.java index 9a8fe2ba7..5bb63f7a1 100644 --- a/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/CheckInFragmentController.java +++ b/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/CheckInFragmentController.java @@ -14,7 +14,7 @@ import org.openmrs.api.PatientService; import org.openmrs.api.context.Context; import org.openmrs.module.appui.UiSessionContext; -import org.openmrs.module.coreapps.fragment.controller.visit.QuickVisitFragmentController; +//import org.openmrs.module.coreapps.fragment.controller.visit.QuickVisitFragmentController; import org.openmrs.module.emrapi.adt.AdtService; import org.openmrs.module.patientqueueing.api.PatientQueueingService; import org.openmrs.module.patientqueueing.model.PatientQueue; @@ -74,7 +74,7 @@ public SimpleObject post(@SpringBean("patientService") PatientService patientSer //patientQueue.setComment(visitComment); } - createVisitForToday(patient, uiUtils, uiSessionContext, request); +// createVisitForToday(patient, uiUtils, uiSessionContext, request); patientQueue.setLocationFrom(currentLocation); patientQueue.setPatient(patient); @@ -96,34 +96,34 @@ private VisitType getFacilityVisitType() { return Context.getVisitService().getVisitTypeByUuid("7b0f5697-27e3-40c4-8bae-f4049abfb4ed"); } - private void createVisitForToday(Patient patient, UiUtils uiUtils, UiSessionContext uiSessionContext, HttpServletRequest request) { - - List visitList = Context.getVisitService().getActiveVisitsByPatient(patient); - - if (visitList.isEmpty()) { - QuickVisitFragmentController quickVisitFragmentController = new QuickVisitFragmentController(); - quickVisitFragmentController.create((AdtService) Context.getService(AdtService.class), Context.getVisitService(), patient, Context.getLocationService().getLocationByUuid("629d78e9-93e5-43b0-ad8a-48313fd99117"), uiUtils, getFacilityVisitType(), uiSessionContext, request); - } else { - Visit todayVisit = null; - for (Visit visit : visitList) { - Date largestEncounterDate = OpenmrsUtil.getLastMomentOfDay(visit.getStartDatetime()); - for (Encounter encounter : visit.getEncounters()) { - if (encounter.getEncounterDatetime().after(largestEncounterDate)) { - largestEncounterDate = encounter.getEncounterDatetime(); - } - } - - if (!visit.getStartDatetime().after(OpenmrsUtil.firstSecondOfDay(new Date()))) { - Context.getVisitService().endVisit(visit, largestEncounterDate); - } else { - todayVisit = visit; - } - } - - if (todayVisit == null) { - QuickVisitFragmentController quickVisitFragmentController = new QuickVisitFragmentController(); - quickVisitFragmentController.create((AdtService) Context.getService(AdtService.class), Context.getVisitService(), patient, Context.getLocationService().getLocationByUuid("629d78e9-93e5-43b0-ad8a-48313fd99117"), uiUtils, getFacilityVisitType(), uiSessionContext, request); - } - } - } +// private void createVisitForToday(Patient patient, UiUtils uiUtils, UiSessionContext uiSessionContext, HttpServletRequest request) { +// +// List visitList = Context.getVisitService().getActiveVisitsByPatient(patient); +// +// if (visitList.isEmpty()) { +// QuickVisitFragmentController quickVisitFragmentController = new QuickVisitFragmentController(); +// quickVisitFragmentController.create((AdtService) Context.getService(AdtService.class), Context.getVisitService(), patient, Context.getLocationService().getLocationByUuid("629d78e9-93e5-43b0-ad8a-48313fd99117"), uiUtils, getFacilityVisitType(), uiSessionContext, request); +// } else { +// Visit todayVisit = null; +// for (Visit visit : visitList) { +// Date largestEncounterDate = OpenmrsUtil.getLastMomentOfDay(visit.getStartDatetime()); +// for (Encounter encounter : visit.getEncounters()) { +// if (encounter.getEncounterDatetime().after(largestEncounterDate)) { +// largestEncounterDate = encounter.getEncounterDatetime(); +// } +// } +// +// if (!visit.getStartDatetime().after(OpenmrsUtil.firstSecondOfDay(new Date()))) { +// Context.getVisitService().endVisit(visit, largestEncounterDate); +// } else { +// todayVisit = visit; +// } +// } +// +// if (todayVisit == null) { +// QuickVisitFragmentController quickVisitFragmentController = new QuickVisitFragmentController(); +// quickVisitFragmentController.create((AdtService) Context.getService(AdtService.class), Context.getVisitService(), patient, Context.getLocationService().getLocationByUuid("629d78e9-93e5-43b0-ad8a-48313fd99117"), uiUtils, getFacilityVisitType(), uiSessionContext, request); +// } +// } +// } } diff --git a/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/patientsearch/PatientSearchWidgetFragmentController.java b/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/patientsearch/PatientSearchWidgetFragmentController.java index f0a00535a..f030c2bad 100644 --- a/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/patientsearch/PatientSearchWidgetFragmentController.java +++ b/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/patientsearch/PatientSearchWidgetFragmentController.java @@ -7,7 +7,7 @@ import org.openmrs.module.appframework.domain.Extension; import org.openmrs.module.appframework.service.AppFrameworkService; import org.openmrs.module.appui.UiSessionContext; -import org.openmrs.module.coreapps.CoreAppsConstants; +//import org.openmrs.module.coreapps.CoreAppsConstants; import org.openmrs.module.emrapi.utils.GeneralUtils; import org.openmrs.module.ugandaemrfingerprint.core.FingerPrintConstant; import org.openmrs.module.ugandaemrfingerprint.remoteserver.FingerPrintGlobalProperties; @@ -45,11 +45,11 @@ public void controller(FragmentModel model, UiSessionContext sessionContext, model.addAttribute("minSearchCharacters", administrationService.getGlobalProperty(OpenmrsConstants.GLOBAL_PROPERTY_MIN_SEARCH_CHARACTERS, "1")); - model.addAttribute("searchDelayShort", - administrationService.getGlobalProperty(CoreAppsConstants.GP_SEARCH_DELAY_SHORT, "300")); - - model.addAttribute("searchDelayLong", - administrationService.getGlobalProperty(CoreAppsConstants.GP_SEARCH_DELAY_LONG, "1000")); +// model.addAttribute("searchDelayShort", +// administrationService.getGlobalProperty(CoreAppsConstants.GP_SEARCH_DELAY_SHORT, "300")); +// +// model.addAttribute("searchDelayLong", +// administrationService.getGlobalProperty(CoreAppsConstants.GP_SEARCH_DELAY_LONG, "1000")); model.addAttribute("dateFormatJS", "DD MMM YYYY"); // TODO really should be driven by global property, but currently we only have a property for the java date format model.addAttribute("locale", Context.getLocale().getLanguage()); diff --git a/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/patientsearch/covid/PatientSearchWidgetFragmentController.java b/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/patientsearch/covid/PatientSearchWidgetFragmentController.java index d07e664f7..612044ca1 100644 --- a/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/patientsearch/covid/PatientSearchWidgetFragmentController.java +++ b/omod/src/main/java/org/openmrs/module/ugandaemr/fragment/controller/patientsearch/covid/PatientSearchWidgetFragmentController.java @@ -7,7 +7,7 @@ import org.openmrs.module.appframework.domain.Extension; import org.openmrs.module.appframework.service.AppFrameworkService; import org.openmrs.module.appui.UiSessionContext; -import org.openmrs.module.coreapps.CoreAppsConstants; +//import org.openmrs.module.coreapps.CoreAppsConstants; import org.openmrs.module.emrapi.utils.GeneralUtils; import org.openmrs.ui.framework.UiFrameworkConstants; import org.openmrs.ui.framework.annotation.FragmentParam; @@ -46,11 +46,11 @@ public void controller(FragmentModel model, UiSessionContext sessionContext, Htt model.addAttribute("minSearchCharacters", administrationService.getGlobalProperty(OpenmrsConstants.GLOBAL_PROPERTY_MIN_SEARCH_CHARACTERS, "1")); - model.addAttribute("searchDelayShort", - administrationService.getGlobalProperty(CoreAppsConstants.GP_SEARCH_DELAY_SHORT, "300")); - - model.addAttribute("searchDelayLong", - administrationService.getGlobalProperty(CoreAppsConstants.GP_SEARCH_DELAY_LONG, "1000")); +// model.addAttribute("searchDelayShort", +// administrationService.getGlobalProperty(CoreAppsConstants.GP_SEARCH_DELAY_SHORT, "300")); +// +// model.addAttribute("searchDelayLong", +// administrationService.getGlobalProperty(CoreAppsConstants.GP_SEARCH_DELAY_LONG, "1000")); model.addAttribute("dateFormatJS", "DD MMM YYYY"); // TODO really should be driven by global property, but currently we only have a property for the java date format model.addAttribute("locale", Context.getLocale().getLanguage()); diff --git a/omod/src/main/java/org/openmrs/module/ugandaemr/page/controller/findpatient/FindPatientPageController.java b/omod/src/main/java/org/openmrs/module/ugandaemr/page/controller/findpatient/FindPatientPageController.java index 875de99ef..20925eb0b 100644 --- a/omod/src/main/java/org/openmrs/module/ugandaemr/page/controller/findpatient/FindPatientPageController.java +++ b/omod/src/main/java/org/openmrs/module/ugandaemr/page/controller/findpatient/FindPatientPageController.java @@ -4,7 +4,7 @@ import org.apache.commons.logging.LogFactory; import org.openmrs.module.appframework.domain.AppDescriptor; import org.openmrs.module.appui.UiSessionContext; -import org.openmrs.module.coreapps.helper.BreadcrumbHelper; +//import org.openmrs.module.coreapps.helper.BreadcrumbHelper; import org.openmrs.module.ugandaemrfingerprint.core.FingerPrintConstant; import org.openmrs.module.ugandaemrfingerprint.remoteserver.FingerPrintGlobalProperties; import org.openmrs.ui.framework.UiUtils; @@ -41,6 +41,6 @@ public void get(PageModel model, @RequestParam("app") AppDescriptor app, UiSessi model.addAttribute("registrationAppLink", app.getConfig().get("registrationAppLink").getTextValue()); } model.put("fingerSocketPrintIpAddress", fingerPrintGlobalProperties.getGlobalProperty(FingerPrintConstant.GP_DEVICE_SOCKET_IP)); - BreadcrumbHelper.addBreadcrumbsIfDefinedInApp(app, model, ui); +// BreadcrumbHelper.addBreadcrumbsIfDefinedInApp(app, model, ui); } } diff --git a/omod/src/main/java/org/openmrs/module/ugandaemr/page/controller/findpatient/covid/FindPatientPageController.java b/omod/src/main/java/org/openmrs/module/ugandaemr/page/controller/findpatient/covid/FindPatientPageController.java deleted file mode 100644 index 1c6562e60..000000000 --- a/omod/src/main/java/org/openmrs/module/ugandaemr/page/controller/findpatient/covid/FindPatientPageController.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.openmrs.module.ugandaemr.page.controller.findpatient.covid; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.openmrs.api.AdministrationService; -import org.openmrs.api.context.Context; -import org.openmrs.module.appframework.domain.AppDescriptor; -import org.openmrs.module.appui.UiSessionContext; -import org.openmrs.module.coreapps.helper.BreadcrumbHelper; -import org.openmrs.ui.framework.UiUtils; -import org.openmrs.ui.framework.page.PageModel; -import org.springframework.web.bind.annotation.RequestParam; - -/** - * - */ -public class FindPatientPageController { - - protected final Log log = LogFactory.getLog(FindPatientPageController.class); - - /** - * This page is built to be shared across multiple apps. To use it, you must pass an "app" - * request parameter, which must be the id of an existing app that is an instance of - * coreapps.template.findPatient - * - * @param model - * @param app - * @param sessionContext - */ - public void get(PageModel model, @RequestParam("app") AppDescriptor app, UiSessionContext sessionContext, UiUtils ui) { - AdministrationService fingerPrintGlobalProperties = Context.getAdministrationService(); - model.addAttribute("afterSelectedUrl", app.getConfig().get("afterSelectedUrl").getTextValue()); - model.addAttribute("heading", app.getConfig().get("heading").getTextValue()); - model.addAttribute("label", app.getConfig().get("label").getTextValue()); - model.addAttribute("showLastViewedPatients", app.getConfig().get("showLastViewedPatients").getBooleanValue()); - - if (app.getConfig().get("registrationAppLink") == null) { - model.addAttribute("registrationAppLink", ""); - } else { - model.addAttribute("registrationAppLink", app.getConfig().get("registrationAppLink").getTextValue()); - } - model.put("fingerSocketPrintIpAddress", - fingerPrintGlobalProperties.getGlobalProperty("ugandaemrfingerprint.socketIPAddress")); - BreadcrumbHelper.addBreadcrumbsIfDefinedInApp(app, model, ui); - } -} diff --git a/omod/src/main/resources/apps/patient_summary_app.json b/omod/src/main/resources/apps/patient_summary_app.json index c6bbecd5e..6f2be5540 100644 --- a/omod/src/main/resources/apps/patient_summary_app.json +++ b/omod/src/main/resources/apps/patient_summary_app.json @@ -1,4 +1,5 @@ -[{ +[ + { "id": "ugandaemr.registrationSummary.patientinformation", "label": "Demographics", "icon": "icon-user", diff --git a/omod/src/main/resources/apps/patientdashboard_extension.json b/omod/src/main/resources/apps/patientdashboard_extension.json index 9e95e4b71..839ea5b0a 100644 --- a/omod/src/main/resources/apps/patientdashboard_extension.json +++ b/omod/src/main/resources/apps/patientdashboard_extension.json @@ -39,17 +39,6 @@ "order": 10, "requiredPrivilege": "App: ugandaemr.patientDashbord" }, - { - "id": "ugandaemr.registrationSummary.registrationSummaryLink", - "extensionPointId": "patientDashboard.overallActions", - "type": "link", - "label": "Goto Patient Registration Summary", - "url": "coreapps/clinicianfacing/patient.page?patientId={{patient.uuid}}", - "url": "registrationapp/registrationSummary.page?patientId={{patient.uuid}}&appId=ugandaemr.registrationapp.registerPatient", - "icon": "icon-file-alt", - "order": 15, - "requiredPrivilege": "App: registrationapp.registrationSummary" - }, { "id": "${project.parent.groupId}.${project.parent.artifactId}.patientDashboard.secondColumnFragments.nextAppointment", "extensionPointId": "patientDashboard.secondColumnFragments", diff --git a/omod/src/main/resources/apps/ugandaemr_homepage_app.json b/omod/src/main/resources/apps/ugandaemr_homepage_app.json index 6ed897b21..e9e4a2bc9 100644 --- a/omod/src/main/resources/apps/ugandaemr_homepage_app.json +++ b/omod/src/main/resources/apps/ugandaemr_homepage_app.json @@ -143,26 +143,26 @@ } ] }, - { - "id": "ugandaemr.findPatient", - "instanceOf": "coreapps.template.findPatient", - "description": "Basic patient search that goes to the patient dashboard", - "order": 0, - "extensions": [ - { - "id": "ugandaemr.findPatientLink", - "extensionPointId": "org.openmrs.referenceapplication.homepageLink", - "type": "link", - "label": "coreapps.findPatient.app.label", - "url": "ugandaemr/findpatient/findPatient.page?app=ugandaemr.findPatient", - "icon": "icon-search", - "requiredPrivilege": "App: ugandaemrpoc.findPatient" - } - ], - "config": { - "registrationAppLink": "registrationapp/registerPatient.page?appId=ugandaemr.registrationapp.registerPatient" - } - }, +// { +// "id": "ugandaemr.findPatient", +// "instanceOf": "coreapps.template.findPatient", +// "description": "Basic patient search that goes to the patient dashboard", +// "order": 0, +// "extensions": [ +// { +// "id": "ugandaemr.findPatientLink", +// "extensionPointId": "org.openmrs.referenceapplication.homepageLink", +// "type": "link", +// "label": "coreapps.findPatient.app.label", +// "url": "ugandaemr/findpatient/findPatient.page?app=ugandaemr.findPatient", +// "icon": "icon-search", +// "requiredPrivilege": "App: ugandaemrpoc.findPatient" +// } +// ], +// "config": { +// "registrationAppLink": "registrationapp/registerPatient.page?appId=ugandaemr.registrationapp.registerPatient" +// } +// }, { "id": "ugandaemr.referenceapplication.legacyAdmin", "extensions": [ @@ -252,26 +252,26 @@ } ] }, - { - "id": "covid.findPatient", - "instanceOf": "coreapps.template.findPatient", - "description": "Basic patient search that goes to the patient dashboard", - "order": 2, - "extensions": [ - { - "id": "covid.findPatientLink", - "extensionPointId": "org.openmrs.referenceapplication.homepageLink", - "type": "link", - "label": "Find Covid Patient", - "url": "ugandaemr/findpatient/covid/findPatient.page?app=covid.findPatient", - "icon": "icon-search", - "requiredPrivilege": "App: ugandaemrpoc.findPatient" - } - ], - "config": { - "registrationAppLink": "registrationapp/registerPatient.page?appId=ugandaemr.registrationapp.registerPatient" - } - }, +// { +// "id": "covid.findPatient", +// "instanceOf": "coreapps.template.findPatient", +// "description": "Basic patient search that goes to the patient dashboard", +// "order": 2, +// "extensions": [ +// { +// "id": "covid.findPatientLink", +// "extensionPointId": "org.openmrs.referenceapplication.homepageLink", +// "type": "link", +// "label": "Find Covid Patient", +// "url": "ugandaemr/findpatient/covid/findPatient.page?app=covid.findPatient", +// "icon": "icon-search", +// "requiredPrivilege": "App: ugandaemrpoc.findPatient" +// } +// ], +// "config": { +// "registrationAppLink": "registrationapp/registerPatient.page?appId=ugandaemr.registrationapp.registerPatient" +// } +// }, { "id": "ugandaemr.cohortTypeConfigs", "description": "DSD SubGroup Registration", diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml index 324842eba..8b00b7634 100644 --- a/omod/src/main/resources/config.xml +++ b/omod/src/main/resources/config.xml @@ -75,12 +75,12 @@ org.openmrs.module.referenceapplication - - org.openmrs.module.registrationapp - - - org.openmrs.module.registrationcore - + + + + + + org.openmrs.module.uiframework diff --git a/pom.xml b/pom.xml index 9b933e7d9..0873b8dc5 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ 1.6.0 6.0.0 1.3.0 - 1.39.0 + 1.3.0 1.8.0 1.3.8 @@ -111,8 +111,7 @@ 2.13.0 2.13.0 2.12.0 - 1.24.0 - 1.11.0 + 1.14.0 1.25.0 2.0.9 @@ -121,7 +120,7 @@ 2.19.0 3.24.0 2.0.7 - 4.3.12 + 1.3.2 1.3.13 1.14.0 @@ -389,19 +388,19 @@ provided - - org.openmrs.module - registrationcore-api - ${registrationcoreVersion} - provided - + + + + + + - - org.openmrs.module - registrationapp-api - ${registrationappVersion} - provided - + + + + + + org.openmrs.module @@ -459,18 +458,18 @@ ${junitParamsVersion} test - - org.openmrs.module - coreapps-api - ${coreappsVersion} - provided - - - org.openmrs.module - coreapps-omod - ${coreappsVersion} - provided - + + + + + + + + + + + + org.openmrs.module