From 23fa42ed78a4f23710c146c96ec4996a46a89939 Mon Sep 17 00:00:00 2001 From: pirupius Date: Mon, 14 Aug 2023 15:35:55 +0300 Subject: [PATCH 1/2] OHRI-1440 add fullWidth meta to support full width patient chart widgets --- .../src/dashboard.meta.tsx | 2 ++ .../esm-cervical-cancer-app/src/routes.json | 2 ++ packages/esm-covid-app/src/dashboard.meta.tsx | 3 +++ packages/esm-covid-app/src/routes.json | 9 +++++--- packages/esm-hiv-app/src/dashboard.meta.tsx | 9 +++++++- packages/esm-hiv-app/src/routes.json | 21 ++++++++++++------- packages/esm-ohri-core-app/src/root.scss | 6 ------ .../esm-ohri-pmtct-app/src/dashboard.meta.tsx | 3 +++ packages/esm-ohri-pmtct-app/src/routes.json | 3 +++ 9 files changed, 41 insertions(+), 17 deletions(-) diff --git a/packages/esm-cervical-cancer-app/src/dashboard.meta.tsx b/packages/esm-cervical-cancer-app/src/dashboard.meta.tsx index de172808c..2c2970de7 100644 --- a/packages/esm-cervical-cancer-app/src/dashboard.meta.tsx +++ b/packages/esm-cervical-cancer-app/src/dashboard.meta.tsx @@ -9,6 +9,7 @@ export const caCxSummaryDashboardMeta = { columns: 1, title: 'CaCx Summary', path: 'cacx-summary', + fullWidth: true, }; export const caCxVisitsDashboardMeta = { @@ -16,4 +17,5 @@ export const caCxVisitsDashboardMeta = { columns: 1, title: 'CaCx Visits', path: 'cacx-visits', + fullWidth: true, }; diff --git a/packages/esm-cervical-cancer-app/src/routes.json b/packages/esm-cervical-cancer-app/src/routes.json index 675adbad5..480c651ab 100644 --- a/packages/esm-cervical-cancer-app/src/routes.json +++ b/packages/esm-cervical-cancer-app/src/routes.json @@ -24,6 +24,7 @@ "meta": { "path": "cacx-summary", "slot": "cacx-summary-slot", + "fullWidth": true, "columns": 1 } }, @@ -39,6 +40,7 @@ "meta": { "path": "cacx-visits", "slot": "cacx-visits-slot", + "fullWidth": true, "columns": 1 } }, diff --git a/packages/esm-covid-app/src/dashboard.meta.tsx b/packages/esm-covid-app/src/dashboard.meta.tsx index 480cd20fc..750486d6d 100644 --- a/packages/esm-covid-app/src/dashboard.meta.tsx +++ b/packages/esm-covid-app/src/dashboard.meta.tsx @@ -12,6 +12,7 @@ export const covidAssessmentsDashboardMeta = { columns: 1, title: 'Covid Assessments', path: 'covid-assessments', + fullWidth: true, }; export const covidLabTestsDashboardMeta = { @@ -19,6 +20,7 @@ export const covidLabTestsDashboardMeta = { columns: 1, title: 'Lab Test', path: 'lab-test', + fullWidth: true, }; export const covidVaccinationsDashboardMeta = { @@ -26,6 +28,7 @@ export const covidVaccinationsDashboardMeta = { columns: 1, title: 'Covid Vaccinations', path: 'covid-vaccinations', + fullWidth: true, }; // Clinical Dashboards diff --git a/packages/esm-covid-app/src/routes.json b/packages/esm-covid-app/src/routes.json index 4cc67ae38..2ad33c20c 100644 --- a/packages/esm-covid-app/src/routes.json +++ b/packages/esm-covid-app/src/routes.json @@ -73,7 +73,8 @@ "meta": { "slot": "covid-assessments-dashboard-slot", "columns": 1, - "path": "covid-assessments" + "path": "covid-assessments", + "fullWidth": true } }, { @@ -88,7 +89,8 @@ "meta": { "slot": "covid-lab-dashboard-slot", "columns": 1, - "path": "lab-test" + "path": "lab-test", + "fullWidth": true } }, { @@ -103,7 +105,8 @@ "meta": { "slot": "covid-vaccinations-dashboard-slot", "columns": 1, - "path": "covid-vaccinations" + "path": "covid-vaccinations", + "fullWidth": true } }, { diff --git a/packages/esm-hiv-app/src/dashboard.meta.tsx b/packages/esm-hiv-app/src/dashboard.meta.tsx index 303e0f102..1614c1fbf 100644 --- a/packages/esm-hiv-app/src/dashboard.meta.tsx +++ b/packages/esm-hiv-app/src/dashboard.meta.tsx @@ -8,11 +8,11 @@ export const hivPreventionDashboardMeta = { }; export const htsSummaryDashboardMeta = { - name: 'hts-summary', slot: 'hts-summary-dashboard-slot', columns: 1, title: 'HIV Testing Services', path: 'hiv-testing-services', + fullWidth: true, }; export const hivCareAndTreatmentDashboardDMeta = { @@ -26,6 +26,7 @@ export const hivPatientSummaryDashboardMeta = { columns: 1, title: 'HIV Patient Summary', path: 'hiv-patient-summary', + fullWidth: true, }; export const programManagementDashboardMeta = { @@ -33,6 +34,7 @@ export const programManagementDashboardMeta = { columns: 1, title: 'Program Management', path: 'program-management', + fullWidth: true, }; export const clinicalVisitsDashboardMeta = { @@ -40,6 +42,7 @@ export const clinicalVisitsDashboardMeta = { columns: 1, title: 'Clinical Visits', path: 'clinical-visits', + fullWidth: true, }; export const generalCounsellingDashboardMeta = { @@ -47,6 +50,7 @@ export const generalCounsellingDashboardMeta = { columns: 1, title: 'General Counselling', path: 'general-counselling', + fullWidth: true, }; export const partnerNotificationServicesDashboardMeta = { @@ -54,6 +58,7 @@ export const partnerNotificationServicesDashboardMeta = { columns: 1, title: 'Partner Notification', path: 'partner-notification-services', + fullWidth: true, }; export const medicationsDashboardMeta = { @@ -61,6 +66,7 @@ export const medicationsDashboardMeta = { columns: 1, title: 'Medications', path: 'medications', + fullWidth: true, }; export const appointmentsDashboardMeta = { @@ -68,6 +74,7 @@ export const appointmentsDashboardMeta = { columns: 1, title: 'Appointments Summary', path: 'appointments-summary', + fullWidth: true, }; // Clinical Dashboards diff --git a/packages/esm-hiv-app/src/routes.json b/packages/esm-hiv-app/src/routes.json index f7a637a26..019151cad 100644 --- a/packages/esm-hiv-app/src/routes.json +++ b/packages/esm-hiv-app/src/routes.json @@ -155,7 +155,8 @@ "meta": { "slot": "hiv-patient-summary-dashboard-slot", "columns": 1, - "path": "hiv-patient-summary" + "path": "hiv-patient-summary", + "fullWidth": true } }, { @@ -170,7 +171,8 @@ "meta": { "slot": "program-management-summary-slot", "columns": 1, - "path": "program-management" + "path": "program-management", + "fullWidth": true } }, { @@ -185,7 +187,8 @@ "meta": { "slot": "clinical-visits-summary-slot", "columns": 1, - "path": "clinical-visits" + "path": "clinical-visits", + "fullWidth": true } }, { @@ -200,7 +203,8 @@ "meta": { "slot": "general-counselling-summary-slot", "columns": 1, - "path": "general-counselling" + "path": "general-counselling", + "fullWidth": true } }, { @@ -215,7 +219,8 @@ "meta": { "slot": "adherence-counselling-summary-slot", "columns": 1, - "path": "adherence-counselling" + "path": "adherence-counselling", + "fullWidth": true } }, { @@ -230,7 +235,8 @@ "meta": { "slot": "partner-notification-services-slot", "columns": 1, - "path": "partner-notification-services" + "path": "partner-notification-services", + "fullWidth": true } }, { @@ -251,7 +257,8 @@ "meta": { "slot": "hts-summary-dashboard-slot", "columns": 1, - "path": "hiv-testing-services" + "path": "hiv-testing-services", + "fullWidth": true } }, { diff --git a/packages/esm-ohri-core-app/src/root.scss b/packages/esm-ohri-core-app/src/root.scss index bbef5cec9..c5a7e47e7 100644 --- a/packages/esm-ohri-core-app/src/root.scss +++ b/packages/esm-ohri-core-app/src/root.scss @@ -126,9 +126,3 @@ div[class*='-esm-patient-vitals__vitals-header__warning-icon___GHya2'] { div[class*='-esm-patient-vitals__vitals-header__row'] { flex: 1 !important; } - -// Patient chart overrides - -div[class*='-esm-patient-chart__patient-chart__chartReview'] { - max-width: 100% !important; -} diff --git a/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx b/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx index 13d6a54eb..1078c0eb6 100644 --- a/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx +++ b/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx @@ -12,6 +12,7 @@ export const mchSummaryDashboardMeta = { columns: 1, title: 'MNCH Summary', path: 'mnch-summary', + fullWidth: true, }; export const maternalVisitsDashboardMeta = { @@ -19,6 +20,7 @@ export const maternalVisitsDashboardMeta = { columns: 1, title: 'Maternal Visits', path: 'maternal-visits', + fullWidth: true, patientExpression: 'calculateAge(patient.birthDate) > 10', }; @@ -27,6 +29,7 @@ export const childVisitsDashboardMeta = { columns: 1, title: 'Child Visits', path: 'child-visits', + fullWidth: true, patientExpression: 'calculateAge(patient.birthDate) <= 10', }; diff --git a/packages/esm-ohri-pmtct-app/src/routes.json b/packages/esm-ohri-pmtct-app/src/routes.json index 3e648d5de..ab016f04a 100644 --- a/packages/esm-ohri-pmtct-app/src/routes.json +++ b/packages/esm-ohri-pmtct-app/src/routes.json @@ -19,6 +19,7 @@ "meta": { "path": "mnch-summary", "slot": "mch-summary-slot", + "fullWidth": true, "columns": 1 } }, @@ -37,6 +38,7 @@ "meta": { "path": "maternal-visits", "slot": "maternal-visits-summary-slot", + "fullWidth": true, "columns": 1 } }, @@ -52,6 +54,7 @@ "meta": { "path": "child-visits", "slot": "child-visits-summary-slot", + "fullWidth": true, "columns": 1 } }, From ce76c6c0c805c8d9d0e709f6dc9a8bafafacbd3a Mon Sep 17 00:00:00 2001 From: pirupius Date: Fri, 18 Aug 2023 12:48:33 +0300 Subject: [PATCH 2/2] changes after PR refactor --- .../src/dashboard.meta.tsx | 4 ++-- packages/esm-cervical-cancer-app/src/routes.json | 4 ++-- packages/esm-covid-app/src/dashboard.meta.tsx | 6 +++--- packages/esm-covid-app/src/routes.json | 6 +++--- packages/esm-hiv-app/src/dashboard.meta.tsx | 16 ++++++++-------- packages/esm-hiv-app/src/routes.json | 14 +++++++------- .../esm-ohri-pmtct-app/src/dashboard.meta.tsx | 6 +++--- packages/esm-ohri-pmtct-app/src/routes.json | 6 +++--- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/packages/esm-cervical-cancer-app/src/dashboard.meta.tsx b/packages/esm-cervical-cancer-app/src/dashboard.meta.tsx index 2c2970de7..6ae63aee3 100644 --- a/packages/esm-cervical-cancer-app/src/dashboard.meta.tsx +++ b/packages/esm-cervical-cancer-app/src/dashboard.meta.tsx @@ -9,7 +9,7 @@ export const caCxSummaryDashboardMeta = { columns: 1, title: 'CaCx Summary', path: 'cacx-summary', - fullWidth: true, + layoutMode: 'anchored', }; export const caCxVisitsDashboardMeta = { @@ -17,5 +17,5 @@ export const caCxVisitsDashboardMeta = { columns: 1, title: 'CaCx Visits', path: 'cacx-visits', - fullWidth: true, + layoutMode: 'anchored', }; diff --git a/packages/esm-cervical-cancer-app/src/routes.json b/packages/esm-cervical-cancer-app/src/routes.json index 480c651ab..67fea8297 100644 --- a/packages/esm-cervical-cancer-app/src/routes.json +++ b/packages/esm-cervical-cancer-app/src/routes.json @@ -24,7 +24,7 @@ "meta": { "path": "cacx-summary", "slot": "cacx-summary-slot", - "fullWidth": true, + "layoutMode": "anchored", "columns": 1 } }, @@ -40,7 +40,7 @@ "meta": { "path": "cacx-visits", "slot": "cacx-visits-slot", - "fullWidth": true, + "layoutMode": "anchored", "columns": 1 } }, diff --git a/packages/esm-covid-app/src/dashboard.meta.tsx b/packages/esm-covid-app/src/dashboard.meta.tsx index 750486d6d..769a7e59c 100644 --- a/packages/esm-covid-app/src/dashboard.meta.tsx +++ b/packages/esm-covid-app/src/dashboard.meta.tsx @@ -12,7 +12,7 @@ export const covidAssessmentsDashboardMeta = { columns: 1, title: 'Covid Assessments', path: 'covid-assessments', - fullWidth: true, + layoutMode: 'anchored', }; export const covidLabTestsDashboardMeta = { @@ -20,7 +20,7 @@ export const covidLabTestsDashboardMeta = { columns: 1, title: 'Lab Test', path: 'lab-test', - fullWidth: true, + layoutMode: 'anchored', }; export const covidVaccinationsDashboardMeta = { @@ -28,7 +28,7 @@ export const covidVaccinationsDashboardMeta = { columns: 1, title: 'Covid Vaccinations', path: 'covid-vaccinations', - fullWidth: true, + layoutMode: 'anchored', }; // Clinical Dashboards diff --git a/packages/esm-covid-app/src/routes.json b/packages/esm-covid-app/src/routes.json index 2ad33c20c..c6de315f1 100644 --- a/packages/esm-covid-app/src/routes.json +++ b/packages/esm-covid-app/src/routes.json @@ -74,7 +74,7 @@ "slot": "covid-assessments-dashboard-slot", "columns": 1, "path": "covid-assessments", - "fullWidth": true + "layoutMode": "anchored" } }, { @@ -90,7 +90,7 @@ "slot": "covid-lab-dashboard-slot", "columns": 1, "path": "lab-test", - "fullWidth": true + "layoutMode": "anchored" } }, { @@ -106,7 +106,7 @@ "slot": "covid-vaccinations-dashboard-slot", "columns": 1, "path": "covid-vaccinations", - "fullWidth": true + "layoutMode": "anchored" } }, { diff --git a/packages/esm-hiv-app/src/dashboard.meta.tsx b/packages/esm-hiv-app/src/dashboard.meta.tsx index 1614c1fbf..cdbf0abc8 100644 --- a/packages/esm-hiv-app/src/dashboard.meta.tsx +++ b/packages/esm-hiv-app/src/dashboard.meta.tsx @@ -12,7 +12,7 @@ export const htsSummaryDashboardMeta = { columns: 1, title: 'HIV Testing Services', path: 'hiv-testing-services', - fullWidth: true, + layoutMode: 'anchored', }; export const hivCareAndTreatmentDashboardDMeta = { @@ -26,7 +26,7 @@ export const hivPatientSummaryDashboardMeta = { columns: 1, title: 'HIV Patient Summary', path: 'hiv-patient-summary', - fullWidth: true, + layoutMode: 'anchored', }; export const programManagementDashboardMeta = { @@ -34,7 +34,7 @@ export const programManagementDashboardMeta = { columns: 1, title: 'Program Management', path: 'program-management', - fullWidth: true, + layoutMode: 'anchored', }; export const clinicalVisitsDashboardMeta = { @@ -42,7 +42,7 @@ export const clinicalVisitsDashboardMeta = { columns: 1, title: 'Clinical Visits', path: 'clinical-visits', - fullWidth: true, + layoutMode: 'anchored', }; export const generalCounsellingDashboardMeta = { @@ -50,7 +50,7 @@ export const generalCounsellingDashboardMeta = { columns: 1, title: 'General Counselling', path: 'general-counselling', - fullWidth: true, + layoutMode: 'anchored', }; export const partnerNotificationServicesDashboardMeta = { @@ -58,7 +58,7 @@ export const partnerNotificationServicesDashboardMeta = { columns: 1, title: 'Partner Notification', path: 'partner-notification-services', - fullWidth: true, + layoutMode: 'anchored', }; export const medicationsDashboardMeta = { @@ -66,7 +66,7 @@ export const medicationsDashboardMeta = { columns: 1, title: 'Medications', path: 'medications', - fullWidth: true, + layoutMode: 'anchored', }; export const appointmentsDashboardMeta = { @@ -74,7 +74,7 @@ export const appointmentsDashboardMeta = { columns: 1, title: 'Appointments Summary', path: 'appointments-summary', - fullWidth: true, + layoutMode: 'anchored', }; // Clinical Dashboards diff --git a/packages/esm-hiv-app/src/routes.json b/packages/esm-hiv-app/src/routes.json index 019151cad..de547b7ed 100644 --- a/packages/esm-hiv-app/src/routes.json +++ b/packages/esm-hiv-app/src/routes.json @@ -156,7 +156,7 @@ "slot": "hiv-patient-summary-dashboard-slot", "columns": 1, "path": "hiv-patient-summary", - "fullWidth": true + "layoutMode": "anchored" } }, { @@ -172,7 +172,7 @@ "slot": "program-management-summary-slot", "columns": 1, "path": "program-management", - "fullWidth": true + "layoutMode": "anchored" } }, { @@ -188,7 +188,7 @@ "slot": "clinical-visits-summary-slot", "columns": 1, "path": "clinical-visits", - "fullWidth": true + "layoutMode": "anchored" } }, { @@ -204,7 +204,7 @@ "slot": "general-counselling-summary-slot", "columns": 1, "path": "general-counselling", - "fullWidth": true + "layoutMode": "anchored" } }, { @@ -220,7 +220,7 @@ "slot": "adherence-counselling-summary-slot", "columns": 1, "path": "adherence-counselling", - "fullWidth": true + "layoutMode": "anchored" } }, { @@ -236,7 +236,7 @@ "slot": "partner-notification-services-slot", "columns": 1, "path": "partner-notification-services", - "fullWidth": true + "layoutMode": "anchored" } }, { @@ -258,7 +258,7 @@ "slot": "hts-summary-dashboard-slot", "columns": 1, "path": "hiv-testing-services", - "fullWidth": true + "layoutMode": "anchored" } }, { diff --git a/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx b/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx index 1078c0eb6..a324ee6e3 100644 --- a/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx +++ b/packages/esm-ohri-pmtct-app/src/dashboard.meta.tsx @@ -12,7 +12,7 @@ export const mchSummaryDashboardMeta = { columns: 1, title: 'MNCH Summary', path: 'mnch-summary', - fullWidth: true, + layoutMode: 'anchored', }; export const maternalVisitsDashboardMeta = { @@ -20,7 +20,7 @@ export const maternalVisitsDashboardMeta = { columns: 1, title: 'Maternal Visits', path: 'maternal-visits', - fullWidth: true, + layoutMode: 'anchored', patientExpression: 'calculateAge(patient.birthDate) > 10', }; @@ -29,7 +29,7 @@ export const childVisitsDashboardMeta = { columns: 1, title: 'Child Visits', path: 'child-visits', - fullWidth: true, + layoutMode: 'anchored', patientExpression: 'calculateAge(patient.birthDate) <= 10', }; diff --git a/packages/esm-ohri-pmtct-app/src/routes.json b/packages/esm-ohri-pmtct-app/src/routes.json index ab016f04a..6597cc222 100644 --- a/packages/esm-ohri-pmtct-app/src/routes.json +++ b/packages/esm-ohri-pmtct-app/src/routes.json @@ -19,7 +19,7 @@ "meta": { "path": "mnch-summary", "slot": "mch-summary-slot", - "fullWidth": true, + "layoutMode": "anchored", "columns": 1 } }, @@ -38,7 +38,7 @@ "meta": { "path": "maternal-visits", "slot": "maternal-visits-summary-slot", - "fullWidth": true, + "layoutMode": "anchored", "columns": 1 } }, @@ -54,7 +54,7 @@ "meta": { "path": "child-visits", "slot": "child-visits-summary-slot", - "fullWidth": true, + "layoutMode": "anchored", "columns": 1 } },