diff --git a/packages/esm-ohri-pmtct-app/src/api.resource.ts b/packages/esm-ohri-pmtct-app/src/api.resource.ts index f7cff4191..df7e0509f 100644 --- a/packages/esm-ohri-pmtct-app/src/api.resource.ts +++ b/packages/esm-ohri-pmtct-app/src/api.resource.ts @@ -1,6 +1,6 @@ import { openmrsFetch, getConfig } from '@openmrs/esm-framework'; -import { type Patient, type PatientIdentifier, type Relationship } from './types'; import { fetchPatientRelationships } from '@ohri/openmrs-esm-ohri-commons-lib'; +import { Patient, PatientIdentifier, Relationship } from './types'; const BASE_WS_API_URL = '/ws/rest/v1/'; const config = await getConfig('@ohri/openmrs-esm-ohri-pmtct-app'); diff --git a/packages/esm-ohri-pmtct-app/src/home.component.tsx b/packages/esm-ohri-pmtct-app/src/home.component.tsx index 00094614b..1ccf3d4d9 100644 --- a/packages/esm-ohri-pmtct-app/src/home.component.tsx +++ b/packages/esm-ohri-pmtct-app/src/home.component.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { OHRIWelcomeSection } from '@ohri/openmrs-esm-ohri-commons-lib'; -import MaternalChildSummaryTiles from './pmtct/summary-tabs/maternal-child-summary-tiles.component'; -import MotherChildSummary from './pmtct/summary-tabs/mother-child-summary-tabs.component'; +import MaternalChildSummaryTiles from './pmtct/home-dashboard/maternal-child-summary-tiles.component'; +import MotherChildSummary from './pmtct/home-dashboard/mother-child-summary-tabs.component'; const Home: React.FC = () => { return ( diff --git a/packages/esm-ohri-pmtct-app/src/index.ts b/packages/esm-ohri-pmtct-app/src/index.ts index 2dce511f5..16710798b 100644 --- a/packages/esm-ohri-pmtct-app/src/index.ts +++ b/packages/esm-ohri-pmtct-app/src/index.ts @@ -1,6 +1,6 @@ import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework'; -import MaternalHealthList from './pmtct/maternal-health/maternal-health.component'; -import ChildHealthList from './pmtct/child-health/child-health.component'; +import MaternalHealthList from './pmtct/patient-chart/maternal-health/maternal-health.component'; +import ChildHealthList from './pmtct/patient-chart/child-health/child-health.component'; import { mchSummaryDashboardMeta, maternalVisitsDashboardMeta, @@ -64,7 +64,7 @@ export const mchSummaryDashboardLink = getSyncLifecycle( options, ); -export const mchSummaryDashboard = getAsyncLifecycle(() => import('./pmtct/mch-summary/mch-summary.component'), { +export const mchSummaryDashboard = getAsyncLifecycle(() => import('./pmtct/patient-chart/mch-summary/mch-summary.component'), { featureName: 'mch-summary', moduleName, }); diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/child-health/child-health-config.json b/packages/esm-ohri-pmtct-app/src/pmtct/child-health/child-health-config.json deleted file mode 100644 index 8873bd098..000000000 --- a/packages/esm-ohri-pmtct-app/src/pmtct/child-health/child-health-config.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "menuId": "childHealth", - "tabDefinitions": [ - { - "tabName": "Infant Postnatal Visit", - "headerTitle": "Infant Postnatal Visit", - "displayText": "Infant Postnatal Visit", - "encounterType": "infantPostnatalEncounterType", - "columns": [ - { - "id": "pTrackerId", - "title": "PTracker Id", - "concept": "pTrackerIdConcept" - }, - { - "id": "mothersName", - "title": "Mothers Name", - "type": "mothersName" - }, - { - "id": "artProphylaxisStatus", - "title": "ART Prophylaxis Status", - "concept": "artProphylaxisStatus" - }, - { - "id": "linkedToArt", - "title": "Linked to ART", - "concept": "linkedToArt" - }, - { - "id": "breastfeedingStatus", - "title": "Breastfeeding status", - "concept": "breastfeedingStatus" - }, - { - "id": "outcomeStatus", - "title": "Outcome Status", - "concept": "outcomeStatus" - }, - { - "id": "nextVisitDate", - "isDate": true, - "title": "Next visit date", - "concept": "nextVisitDateConcept" - }, - { - "id": "actions", - "title": "Actions", - "actionOptions": [ - { - "formName": "infantPostnatalFormName", - "package": "pmtct", - "label": "View Details", - "mode": "view" - }, - { - "formName": "infantPostnatalFormName", - "package": "pmtct", - "label": "Edit Form", - "mode": "edit" - } - ] - } - ], - "launchOptions": { - "displayText": "Add", - "moduleName": "@ohri/openmrs-esm-ohri-pmtct-app" - }, - "formList": [ - { - "name": "infantPostnatalFormName", - "uuid": "infantPostnatalFormUuid" - } - ] - } - ] - } \ No newline at end of file diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/common.scss b/packages/esm-ohri-pmtct-app/src/pmtct/common.scss deleted file mode 100644 index 733dbee41..000000000 --- a/packages/esm-ohri-pmtct-app/src/pmtct/common.scss +++ /dev/null @@ -1,10 +0,0 @@ -@use '@carbon/styles/scss/spacing'; -@import '../root.scss'; - -.tabContainer div[role='tabpanel'] { - padding: 0 !important; -} - -.tabContainer li button { - width: 100% !important; -} diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/summary-tabs/maternal-child-summary-tiles.component.tsx b/packages/esm-ohri-pmtct-app/src/pmtct/home-dashboard/maternal-child-summary-tiles.component.tsx similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/summary-tabs/maternal-child-summary-tiles.component.tsx rename to packages/esm-ohri-pmtct-app/src/pmtct/home-dashboard/maternal-child-summary-tiles.component.tsx diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/summary-tabs/mother-child-summary-tabs.component.tsx b/packages/esm-ohri-pmtct-app/src/pmtct/home-dashboard/mother-child-summary-tabs.component.tsx similarity index 90% rename from packages/esm-ohri-pmtct-app/src/pmtct/summary-tabs/mother-child-summary-tabs.component.tsx rename to packages/esm-ohri-pmtct-app/src/pmtct/home-dashboard/mother-child-summary-tabs.component.tsx index d0bcd40ea..9ba28772b 100644 --- a/packages/esm-ohri-pmtct-app/src/pmtct/summary-tabs/mother-child-summary-tabs.component.tsx +++ b/packages/esm-ohri-pmtct-app/src/pmtct/home-dashboard/mother-child-summary-tabs.component.tsx @@ -2,8 +2,7 @@ import React from 'react'; import { Tabs, Tab, TabPanels, TabPanel, TabList } from '@carbon/react'; import { useTranslation } from 'react-i18next'; import { PatientList } from '@ohri/openmrs-esm-ohri-commons-lib'; - -import styles from '../summary-tabs/ohri-patient-tabs.scss'; +import styles from './ohri-patient-tabs.scss'; const MotherChildSummary: React.FC = () => { const { t } = useTranslation(); diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/home-dashboard/ohri-patient-tabs.scss b/packages/esm-ohri-pmtct-app/src/pmtct/home-dashboard/ohri-patient-tabs.scss new file mode 100644 index 000000000..b1abc6e71 --- /dev/null +++ b/packages/esm-ohri-pmtct-app/src/pmtct/home-dashboard/ohri-patient-tabs.scss @@ -0,0 +1,56 @@ +@use '@carbon/styles/scss/spacing'; +@import '../../root.scss'; + +.widgetContainer { + background-color: $ui-background; +} + +.widgetHeaderContainer { + display: flex; + justify-content: space-between; + align-items: center; + padding: spacing.$spacing-04 0 spacing.$spacing-04 spacing.$spacing-05; +} + +.widgetHeaderContainer > h4:after { + content: ''; + display: block; + width: 2rem; + padding-top: 0.188rem; + border-bottom: 0.375rem solid var(--brand-01); +} + +.toggleButtons { + width: fit-content; + margin: 0 spacing.$spacing-03; +} + +.searchField { + width: 100%; + max-width: 250px; + border: 0px !important; +} + +.searchBox { + width: 100%; + display: flex; + justify-content: right; +} + +.container { + margin-top: 16px; + margin-left: inherit; + width: 100%; + overflow-y: hidden; +} + +.tabContainer{ + margin-top: 16px; + padding-left: 1rem; + background-color: #ffffff; + +} + +.tabContainer li button{ + width: 100% !important; +} diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/mother-previous-visit.json b/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/mother-previous-visit.json deleted file mode 100644 index baa1a444d..000000000 --- a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/mother-previous-visit.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "menuId": "motherPreviousVisitSummary", - "tabDefinitions": [ - { - "tabName": "Visits", - "headerTitle": "Visits", - "displayText": "Visits", - "encounterType": "mchEncounterTypeEncounterType", - "columns": [ - { - "id": "visitType", - "title": "Visit Type", - "type": "visitType" - }, - { - "id": "visitDate", - "isDate": true, - "title": "Visit Date", - "concept": "visitDate" - }, - { - "id": "facility", - "title": "Facility", - "type": "location" - }, - { - "id": "nextFollowUpDate", - "isDate": true, - "title": "Next follow-up date", - "concept": "followUpDateConcept" - }, - { - "id": "actions", - "title": "Actions", - "actionOptions": [], - "conditionalActionOptions": [ - { - "formName": "antenatalFormName", - "package": "pmtct", - "label": "View details", - "mode": "view", - "dependantEncounter": "antenatalEncounterType" - }, - { - "formName": "labourAndDeliveryFormName", - "package": "pmtct", - "label": "View details", - "mode": "view", - "dependantEncounter": "laborAndDeliveryEncounterType" - }, - { - "formName": "motherPostnatalFormName", - "package": "pmtct", - "label": "View details", - "mode": "view", - "dependantEncounter": "covidTestStatusConcept_UUID" - } - ] - } - ], - "launchOptions": { - "displayText": "Add", - "moduleName": "@ohri/openmrs-esm-ohri-pmtct-app" - }, - "formList": [ - { - "name": "antenatalFormName", - "uuid": "antenatalFormUuid" - }, - { - "name": "labourAndDeliveryFormName", - "uuid": "labourAndDeliveryFormUuid" - }, - { - "name": "motherPostnatalFormName", - "uuid": "motherPostnatalFormUuid" - } - ] - } - ] - } \ No newline at end of file diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/child-health/child-health-config.json b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/child-health/child-health-config.json new file mode 100644 index 000000000..a4546af80 --- /dev/null +++ b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/child-health/child-health-config.json @@ -0,0 +1,77 @@ +{ + "menuId": "childHealth", + "tabDefinitions": [ + { + "tabName": "Infant Postnatal Visit", + "headerTitle": "Infant Postnatal Visit", + "displayText": "Infant Postnatal Visit", + "encounterType": "infantPostnatalEncounterType", + "columns": [ + { + "id": "pTrackerId", + "title": "PTracker Id", + "concept": "pTrackerIdConcept" + }, + { + "id": "mothersName", + "title": "Mothers Name", + "type": "mothersName" + }, + { + "id": "artProphylaxisStatus", + "title": "ART Prophylaxis Status", + "concept": "artProphylaxisStatus" + }, + { + "id": "linkedToArt", + "title": "Linked to ART", + "concept": "linkedToArt" + }, + { + "id": "breastfeedingStatus", + "title": "Breastfeeding status", + "concept": "breastfeedingStatus" + }, + { + "id": "outcomeStatus", + "title": "Outcome Status", + "concept": "outcomeStatus" + }, + { + "id": "nextVisitDate", + "isDate": true, + "title": "Next visit date", + "concept": "nextVisitDateConcept" + }, + { + "id": "actions", + "title": "Actions", + "actionOptions": [ + { + "formName": "infantPostnatalFormName", + "package": "pmtct", + "label": "View Details", + "mode": "view" + }, + { + "formName": "infantPostnatalFormName", + "package": "pmtct", + "label": "Edit Form", + "mode": "edit" + } + ] + } + ], + "launchOptions": { + "displayText": "Add", + "moduleName": "@ohri/openmrs-esm-ohri-pmtct-app" + }, + "formList": [ + { + "name": "infantPostnatalFormName", + "uuid": "infantPostnatalFormUuid" + } + ] + } + ] +} \ No newline at end of file diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/child-health/child-health.component.tsx b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/child-health/child-health.component.tsx similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/child-health/child-health.component.tsx rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/child-health/child-health.component.tsx diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/common.scss b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/common.scss new file mode 100644 index 000000000..c18064deb --- /dev/null +++ b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/common.scss @@ -0,0 +1,39 @@ +@use '@carbon/styles/scss/spacing'; +@import '../../root.scss'; + +.widgetContainer { + background-color: $ui-background; +} + +.widgetHeaderContainer { + display: flex; + justify-content: space-between; + align-items: center; + padding: spacing.$spacing-04 0 spacing.$spacing-04 spacing.$spacing-05; +} + +.widgetHeaderContainer > h4:after { + content: ''; + display: block; + width: 2rem; + padding-top: 0.188rem; + border-bottom: 0.375rem solid var(--brand-01); +} + +.toggleButtons { + width: fit-content; + margin: 0 spacing.$spacing-03; +} + +.tabContainer div[role='tabpanel'] { + padding: 0 !important; +} + +.tabContainer li button { + width: 100% !important; + } + + + .hivStatusTag { + min-width: 80px; + } diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/maternal-health/maternal-health-config.json b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/maternal-health/maternal-health-config.json similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/maternal-health/maternal-health-config.json rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/maternal-health/maternal-health-config.json diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/maternal-health/maternal-health.component.tsx b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/maternal-health/maternal-health.component.tsx similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/maternal-health/maternal-health.component.tsx rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/maternal-health/maternal-health.component.tsx diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/mch-summary.component.tsx b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/mch-summary.component.tsx similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/mch-summary.component.tsx rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/mch-summary.component.tsx diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/appointments-config.json b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/appointments-config.json similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/appointments-config.json rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/appointments-config.json diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/arv-therapy-config.json b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/arv-therapy-config.json similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/arv-therapy-config.json rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/arv-therapy-config.json diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/current-pregnancy.component.tsx b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/current-pregnancy.component.tsx similarity index 99% rename from packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/current-pregnancy.component.tsx rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/current-pregnancy.component.tsx index 4b6724ad1..c5b0ab446 100644 --- a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/current-pregnancy.component.tsx +++ b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/current-pregnancy.component.tsx @@ -14,11 +14,11 @@ import { import dayjs from 'dayjs'; import { Link } from '@carbon/react'; import { navigate, useConfig } from '@openmrs/esm-framework'; -import { fetchPatientIdentifiers, fetchChildLatestFinalOutcome } from '../../../api.resource'; import recentPregnancyConfigSchema from './recent-pregnancy-config.json'; import appointmentSummaryConfigSchema from './appointments-config.json'; import arvTherapyColumnsConfigSchema from './arv-therapy-config.json'; import motherPreviousVisitConfigSchema from './mother-previous-visit.json'; +import { fetchChildLatestFinalOutcome, fetchPatientIdentifiers } from '../../../../api.resource'; interface pregnancyOutcomeProps { id: string; diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/hiv-exposed-family-summary-config.json b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/hiv-exposed-family-summary-config.json similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/hiv-exposed-family-summary-config.json rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/hiv-exposed-family-summary-config.json diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/hiv-exposed-infant-summary-config.json b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/hiv-exposed-infant-summary-config.json similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/hiv-exposed-infant-summary-config.json rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/hiv-exposed-infant-summary-config.json diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/hiv-exposed-infant.component.tsx b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/hiv-exposed-infant.component.tsx similarity index 98% rename from packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/hiv-exposed-infant.component.tsx rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/hiv-exposed-infant.component.tsx index 741a31153..78bb9fddd 100644 --- a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/hiv-exposed-infant.component.tsx +++ b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/hiv-exposed-infant.component.tsx @@ -16,7 +16,7 @@ import { type familyItemProps } from './current-pregnancy.component'; import hivExposedInfantSummary from './hiv-exposed-infant-summary-config.json'; import hivExposedFamilySummary from './hiv-exposed-family-summary-config.json'; import hivExposedInfantConfigSchema from './infant-summary-config.json'; -import { fetchPatientIdentifiers } from '../../../api.resource'; +import { fetchPatientIdentifiers } from '../../../../api.resource'; const HivExposedInfant: React.FC<{ patientUuid: string; diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/infant-summary-config.json b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/infant-summary-config.json similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/infant-summary-config.json rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/infant-summary-config.json diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/mother-previous-visit.json b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/mother-previous-visit.json new file mode 100644 index 000000000..59b2cd29b --- /dev/null +++ b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/mother-previous-visit.json @@ -0,0 +1,81 @@ +{ + "menuId": "motherPreviousVisitSummary", + "tabDefinitions": [ + { + "tabName": "Visits", + "headerTitle": "Visits", + "displayText": "Visits", + "encounterType": "mchEncounterType", + "columns": [ + { + "id": "visitType", + "title": "Visit Type", + "type": "visitType" + }, + { + "id": "visitDate", + "isDate": true, + "title": "Visit Date", + "concept": "visitDate" + }, + { + "id": "facility", + "title": "Facility", + "type": "location" + }, + { + "id": "nextFollowUpDate", + "isDate": true, + "title": "Next follow-up date", + "concept": "followUpDateConcept" + }, + { + "id": "actions", + "title": "Actions", + "actionOptions": [], + "conditionalActionOptions": [ + { + "formName": "antenatalFormName", + "package": "pmtct", + "label": "View details", + "mode": "view", + "dependantEncounter": "antenatalEncounterType" + }, + { + "formName": "labourAndDeliveryFormName", + "package": "pmtct", + "label": "View details", + "mode": "view", + "dependantEncounter": "laborAndDeliveryEncounterType" + }, + { + "formName": "motherPostnatalFormName", + "package": "pmtct", + "label": "View details", + "mode": "view", + "dependantEncounter": "covidTestStatusConcept_UUID" + } + ] + } + ], + "launchOptions": { + "displayText": "Add", + "moduleName": "@ohri/openmrs-esm-ohri-pmtct-app" + }, + "formList": [ + { + "name": "antenatalFormName", + "uuid": "antenatalFormUuid" + }, + { + "name": "labourAndDeliveryFormName", + "uuid": "labourAndDeliveryFormUuid" + }, + { + "name": "motherPostnatalFormName", + "uuid": "motherPostnatalFormUuid" + } + ] + } + ] +} \ No newline at end of file diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/recent-pregnancy-config.json b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/recent-pregnancy-config.json similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/mch-summary/tabs/recent-pregnancy-config.json rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/mch-summary/tabs/recent-pregnancy-config.json diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/medications/medications.components.tsx b/packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/medications/medications.components.tsx similarity index 100% rename from packages/esm-ohri-pmtct-app/src/pmtct/medications/medications.components.tsx rename to packages/esm-ohri-pmtct-app/src/pmtct/patient-chart/medications/medications.components.tsx diff --git a/packages/esm-ohri-pmtct-app/src/pmtct/summary-tabs/ohri-patient-tabs.scss b/packages/esm-ohri-pmtct-app/src/pmtct/summary-tabs/ohri-patient-tabs.scss deleted file mode 100644 index c150958b8..000000000 --- a/packages/esm-ohri-pmtct-app/src/pmtct/summary-tabs/ohri-patient-tabs.scss +++ /dev/null @@ -1,13 +0,0 @@ -@use '@carbon/styles/scss/spacing'; -@import '../../root.scss'; - -.tabContainer{ - margin-top: 16px; - padding-left: 1rem; - background-color: #ffffff; - -} - -.tabContainer li button{ - width: 100% !important; -} diff --git a/packages/esm-ohri-pmtct-app/src/post-submission-actions/art-linkage-action.ts b/packages/esm-ohri-pmtct-app/src/post-submission-actions/art-linkage-action.ts index 9410eece6..124b0a0ee 100644 --- a/packages/esm-ohri-pmtct-app/src/post-submission-actions/art-linkage-action.ts +++ b/packages/esm-ohri-pmtct-app/src/post-submission-actions/art-linkage-action.ts @@ -1,7 +1,7 @@ import { type PostSubmissionAction } from '@openmrs/openmrs-form-engine-lib'; import { getConfig } from '@openmrs/esm-framework'; -import { fetchPatientIdentifiers, saveIdentifier } from '../api.resource'; import { type PatientIdentifier } from '../types'; +import { fetchPatientIdentifiers, saveIdentifier } from '../api.resource'; const ArtSubmissionAction: PostSubmissionAction = { applyAction: async function ({ patient, encounters, sessionMode }) { diff --git a/packages/esm-ohri-pmtct-app/src/post-submission-actions/current-ptracker-action.ts b/packages/esm-ohri-pmtct-app/src/post-submission-actions/current-ptracker-action.ts index 74294c284..17717fcfb 100644 --- a/packages/esm-ohri-pmtct-app/src/post-submission-actions/current-ptracker-action.ts +++ b/packages/esm-ohri-pmtct-app/src/post-submission-actions/current-ptracker-action.ts @@ -1,6 +1,6 @@ import { type PostSubmissionAction } from '@openmrs/openmrs-form-engine-lib'; import { fetchPatientIdentifiers, saveIdentifier } from '../api.resource'; -import { type PatientIdentifier } from '../types'; +import { PatientIdentifier } from '../types'; import { getConfig } from '@openmrs/esm-framework'; export const PTrackerSubmissionAction: PostSubmissionAction = { diff --git a/packages/esm-ohri-pmtct-app/src/post-submission-actions/mother-child-linkage-action.ts b/packages/esm-ohri-pmtct-app/src/post-submission-actions/mother-child-linkage-action.ts index e2ba6adc8..8f786d85e 100644 --- a/packages/esm-ohri-pmtct-app/src/post-submission-actions/mother-child-linkage-action.ts +++ b/packages/esm-ohri-pmtct-app/src/post-submission-actions/mother-child-linkage-action.ts @@ -1,6 +1,6 @@ -import { type PostSubmissionAction } from '@openmrs/openmrs-form-engine-lib'; +import { PostSubmissionAction } from '@openmrs/openmrs-form-engine-lib'; import { generateIdentifier, savePatients, saveRelationship } from '../api.resource'; -import { type Patient, type PatientIdentifier } from '../types'; +import { Patient, PatientIdentifier } from '../types'; import { findObsByConcept, findChildObsInTree, getObsValueCoded } from '../utils/obs-encounter-utils'; import { updatePatientPtracker } from './current-ptracker-action'; import { getConfig } from '@openmrs/esm-framework'; diff --git a/packages/esm-ohri-pmtct-app/src/utils/pmtct-helpers.ts b/packages/esm-ohri-pmtct-app/src/utils/pmtct-helpers.ts index eaea59bcb..87d36bf2e 100644 --- a/packages/esm-ohri-pmtct-app/src/utils/pmtct-helpers.ts +++ b/packages/esm-ohri-pmtct-app/src/utils/pmtct-helpers.ts @@ -1,4 +1,4 @@ -import { getIdentifierInfo } from '../api.resource'; +import { getIdentifierInfo } from "../api.resource"; export const generateInfantPTrackerId = (fieldId: string, motherPtrackerId: string): string | undefined => { if (!fieldId || !motherPtrackerId) return; diff --git a/packages/esm-opd-app/src/routes.json b/packages/esm-opd-app/src/routes.json index a2c331b41..c3ff2c011 100644 --- a/packages/esm-opd-app/src/routes.json +++ b/packages/esm-opd-app/src/routes.json @@ -32,7 +32,5 @@ "slot": "opd-summary-slot", "component": "opdSummaryDashboard" } - - ] }