Merge pull request #1854 from UCSF-IGHS/hk-split-hiv-app

README.md

@@ -16,7 +16,8 @@ OpenMRS HIV Reference Implementation (OHRI) packages built on top of OpenMRS Fro
 - [esm-ohri-core-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-ohri-core-app) (OHRI Core App)
 - [esm-commons-lib](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-commons-lib) (Common Libraries)
 - [esm-form-render-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-form-render-app) (Form Render App)
-- [esm-hiv-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-hiv-app) (HIV App)
+- [esm-hiv-care-treatment-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-hiv-care-treatment-app) (HIV Care And Treatment App)
+- [esm-hiv-prevention-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-hiv-prevention-app) (HIV Prevention App)
 - [esm-covid-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-covid-app) (COVID-19 App)
 - [esm-cervical-cancer-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-cervical-cancer-app) (Cervical Cancer App)
 - [esm-ohri-pmtct-app](https://github.com/UCSF-IGHS/openmrs-esm-ohri/tree/master/packages/esm-ohri-pmtct-app) (PMTCT App)
@@ -63,8 +64,11 @@ yarn start:core
 # To start covid esm
 yarn start:covid
 
-# To start hiv esm
-yarn start:hiv
+# To start hiv care and treatment esm
+yarn start:hct
+
+# To start hiv prevention esm
+yarn start:hp
 
 # To start cervical-cancer esm
 yarn start:cervical-cancer

__mocks__/encounter-tile.mock.ts

@@ -1,5 +1,3 @@
-import { getObsFromEncounter } from '@ohri/openmrs-esm-ohri-commons-lib';
-
 export const headerTitle = 'HIV Monitoring';
 
 export const patientUuid = 'b280078a-c0ce-443b-9997-3c66c63ec2f8';

frontend/spa-build-config.json

@@ -33,7 +33,8 @@
     "@openmrs/esm-fast-data-entry-app": "next",
     "@openmrs/esm-cohort-builder-app": "next",
     "@ohri/openmrs-esm-ohri-core-app": "next",
-    "@ohri/openmrs-esm-ohri-hiv-app": "next",
+    "@ohri/openmrs-esm-ohri-hiv-care-treatment-app": "next",
+    "@ohri/openmrs-esm-ohri-hiv-prevention-app": "next",
     "@ohri/openmrs-esm-ohri-covid-app": "next",
     "@ohri/openmrs-esm-ohri-pmtct": "next",
     "@ohri/openmrs-esm-ohri-tb-app": "next",

package.json

@@ -16,7 +16,8 @@
     "start": "openmrs develop --backend https://openmrs-dev.globalhealthapp.net --sources 'packages/esm-*-app/'",
     "start:core": "openmrs develop --backend https://openmrs-dev.globalhealthapp.net --sources packages/esm-ohri-core-app",
     "start:covid": "openmrs develop --backend https://openmrs-dev.globalhealthapp.net --sources packages/esm-covid-app",
-    "start:hiv": "openmrs develop --backend https://openmrs-dev.globalhealthapp.net --sources packages/esm-hiv-app",
+    "start:hct": "openmrs develop --backend https://openmrs-dev.globalhealthapp.net --sources packages/esm-hiv-care-treatment-app",
+    "start:hp": "openmrs develop --backend https://openmrs-dev.globalhealthapp.net --sources packages/esm-hiv-prevention-app",
     "start:cervical-cancer": "openmrs develop --backend https://openmrs-dev.globalhealthapp.net --sources packages/esm-cervical-cancer-app",
     "start:pmtct": "openmrs develop --backend https://ohri-namibia-dev.globalhealthapp.net --sources 'packages/esm-ohri-pmtct-app/'",
     "start:form-render": "openmrs develop --backend https://openmrs-dev.globalhealthapp.net --sources packages/esm-form-render-app",

packages/esm-cervical-cancer-app/translations/en.json

@@ -1,15 +1,13 @@
 {
   "actions": "Actions",
-  "cacxAppointments": "CaCx Appointments",
   "cacxRegistration": "CaCx Registration",
-  "cacxScreening": "CaCx Screening",
   "cacxSummary": "CaCx Summary",
   "cacxTreatment": "CaCx Treatment",
-  "colopsyResult": "Screening Results",
   "editForm": "Edit Form",
   "eligibleforScreening": "Eligible for CaCx Screening",
   "previouslyScreened": "Previously Screened for CaCx",
   "screeningMethod": "Screening Method",
+  "screeningResult": "Screening Results",
   "viewDetails": "View details",
   "visitDate": "Visit Date"
 }

packages/esm-commons-lib/src/utils/encounter-list-utils.ts

@@ -44,7 +44,7 @@ export function getObsFromEncounter(encounter, obsConcept, isDate?: Boolean, isT
   const obs = findObs(encounter, obsConcept);
 
   if (isTrueFalseConcept) {
-    if (obs.value.uuid == 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3') {
+    if (obs?.value?.uuid == 'cf82933b-3f3f-45e7-a5ab-5d31aaee3da3') {
       return 'Yes';
     } else {
       return 'No';

packages/esm-commons-lib/translations/en.json

@@ -1,27 +1,35 @@
 {
   "activeLoadingIndicator": "Active loading indicator",
-  "activeVisit": "Active Visit",
   "add": "Add",
-  "addList": "Add to list",
   "addPatientToListOption": "Add Patient to list",
-  "addToListModal": "Add to list",
   "age": "Age",
-  "covidOutcomeUnknown": "COVID: Unknown Status",
+  "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
+  "deleteEncounter": "Delete",
   "editEncounter": "Edit",
   "emptyStateText": "There are no {displayText.toLowerCase()} to display{displayText.toLowerCase() != 'patients' ? ' for this patient' : ''}",
+  "encounterDeleted": "Encounter deleted",
   "error": "Error",
   "errorCopy": "Sorry, there was a problem displaying this information. You can try to reload this page, or contact the site administrator and quote the error code above.",
+  "failedDeleting": "couldn't be deleted",
   "gender": "Gender",
   "hivPositive": "HIV Positive",
   "moveToListSideNav": "Move to list",
   "name": "Name",
-  "new": "New",
+  "nextPage": "Next page",
+  "noMatchingPatients": "No matching patients to display",
   "noPatientSidenav": "There are no patients in this list.",
+  "noPatientsInList": "There are no patients in this list",
   "patientAddedSuccess": "Patient was successfully removed from all lists",
   "patientAddedToCohortSuccess": "",
   "patientList": "patient list",
+  "previousPage": "Previous page",
   "record": "Record",
+  "removeFromList": "Remove from list",
+  "removePatientFromListConfirmation": "Are you sure you want to remove {{patientName}} from this list?",
   "searchClientList": "Search client list",
+  "searchThisList": "Search this list",
   "startHTSSession": "Start HTS Session",
+  "successfullyDeleted": "successfully deleted",
   "viewEncounter": "View"
 }

packages/esm-covid-app/translations/en.json

@@ -1,43 +1,65 @@
 {
+  "actions": "Actions",
+  "addEditOutcome": "Add/Edit Outcome",
+  "addEditResult": "Add/Edit Lab Result",
+  "age": "Age",
+  "Age": "Age",
   "allCTClients": "All COVID-19 Clients",
   "assessmentDate": "Assessment date",
+  "AssessmentDate": "AssessmentDate Date",
+  "assessments": "Assessments",
+  "cancelLabOrder": "Cancel Lab Order",
+  "cases": "Cases",
+  "collectSample": "Collect Sample",
+  "covid_Assessments_Display": "COVID Assessment",
+  "covid_Assessments_Header": "COVID Assessment",
+  "covid_Outcomes_display": "COVID Outcomes",
+  "covid_Outcomes_header": "COVID Outcomes",
+  "covid_Vaccinations_display": "Vaccinations",
+  "covid_Vaccinations_header": "Vaccinations",
   "covidLabResults": "Lab Results",
-  "dateOfLastTest": "Date of last test",
+  "dateOfAssessment": "Date of Assessment",
+  "dateOfOrder": "Date of Order",
+  "dateOfTestResult": "Date of Test Result",
+  "editassessmentCase": "Edit Case",
   "editAssessmentForm": "Edit case assessment form",
-  "encounterDate": "Encounter Date",
   "finalResults": "Final result",
+  "fowardLabreference": "Fowarded to Reference Lab",
+  "labTests": "Lab Tests",
   "lastDoseAdministered": "Last Dose Administered",
+  "name": "Name",
   "noPatientList": "There are no patients in this list.",
   "outcome": "Outcome",
-  "Age": "Age",
-  "AssessmentDate": "AssessmentDate Date",
   "outcomeDate": "Outcome Date",
-  "Name": "Name",
-  "Presentation": "Presentation",
-  "Sex": "Sex",
-  "patientStatus": "Patient status",
+  "outcomes": "Outcomes",
+  "outcomeStatus": "Outcome Status",
+  "pendingLabOrders": "Pending Lab Orders",
   "pendingLabResults": "Pending lab results",
   "peopleTestedPositive": "People tested positive",
   "peopleVaccinated": "People vaccinated",
   "PeopleWithCovidOutcome": "People with covid outcome",
+  "presentation": "Presentation",
   "reasonsForTesting": "Reasons for testing",
-  "result": "Result",
   "returnVisitDate": "Return Visit Date",
-  "sarsCovidTestType": "SARS-Cov2 test type",
   "scheduledVaccination": "Scheduled Vaccination",
   "searchClientList": "Search client list",
-  "summaryAssessments": "Assessments",
-  "summaryCases": "Cases",
-  "summaryOutcomes": "Outcomes",
-  "summaryVaccinations": "Vaccinations",
+  "sex": "Sex",
+  "status": "Status",
+  "symptomatic": "Presentation",
   "testDate": "Test Date",
+  "testResult": "Test Result",
   "testsConducted": "Completed assessments",
   "testType": "Test Type",
+  "vaccinationDate": "Vaccination Date",
   "vaccinationLastVaccineAdmin": "Last Vaccine Administered",
   "vaccinationLastVaccineDoseAdmin": "Last Vaccine Dose Administered",
   "vaccinationName": "Name",
-  "vaccinationStatus": "Vaccination Status",
+  "vaccinations": "Vaccinations",
   "vaccine": "Vaccine",
-  "outcomeStatus": "Outcome Status",
-  "vaccineAdministered": "Vaccine Administered"
+  "vaccineAdministered": "Vaccine Administered",
+  "vaccineDose": "Vaccine Dose",
+  "vaccineSeries": "Vaccine Series",
+  "viewAssessment": "View Case",
+  "viewAssessmentcase": "View Assessment",
+  "viewDetails": "View Details"
 }

packages/esm-form-render-app/translations/en.json

@@ -1,4 +1,6 @@
 {
+  "encounterUuid": "Encounter Uuid",
+  "encounterUuidEntry": "Enter Encounter Uuid",
   "finalSchema": "Final Schema",
   "formIntent": "Form Intent",
   "formRender": "Form Render",