@kenyaemr/esm-care-panel-app 5.4.1-pre.1957 → 5.4.1-pre.1964

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"care-panel-patient-summary","component":"carePanelPatientSummary","slot":"patient-chart-care-panel-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"care-panel-summary-dashboard-link","component":"carePanelSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":3,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-care-panel-dashboard-slot","layoutMode":"anchored","path":"Care panel"}},{"name":"delete-regimen-confirmation-dialog","component":"deleteRegimenConfirmationDialog"},{"name":"hiv-patient-visit-summary-dashboard-link","component":"hivPatientSummaryDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-patient-summary-slot","path":"HIV Patient Summary","layoutMode":"anchored"}},{"name":"hiv-patient-visit-summary","slot":"patient-chart-hiv-patient-summary-slot","component":"hivPatientSummary","order":3,"online":true,"offline":false},{"name":"patient-diagnoses","component":"patientDiagnoses","online":true,"offline":true},{"name":"patient-conditions","component":"patientConditions","online":true,"offline":true},{"name":"dispensing-patient-vitals","component":"dispensingPaentientVitals","online":true,"offline":true}],"workspaces":[{"name":"patient-regimen-workspace","title":"Patient Regimen","component":"regimenFormWorkspace","type":"form","canMaximize":true,"canHide":true,"width":"wider"}],"version":"5.4.1-pre.1957"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"care-panel-patient-summary","component":"carePanelPatientSummary","slot":"patient-chart-care-panel-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"care-panel-summary-dashboard-link","component":"carePanelSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":3,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-care-panel-dashboard-slot","layoutMode":"anchored","path":"Care panel"}},{"name":"delete-regimen-confirmation-dialog","component":"deleteRegimenConfirmationDialog"},{"name":"hiv-patient-visit-summary-dashboard-link","component":"hivPatientSummaryDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-patient-summary-slot","path":"HIV Patient Summary","layoutMode":"anchored"}},{"name":"hiv-patient-visit-summary","slot":"patient-chart-hiv-patient-summary-slot","component":"hivPatientSummary","order":3,"online":true,"offline":false},{"name":"dispensing-patient-vitals","component":"dispensingPaentientVitals","slot":"dispensing-condition-and-diagnoses","order":1,"online":true,"offline":true}],"workspaces":[{"name":"patient-regimen-workspace","title":"Patient Regimen","component":"regimenFormWorkspace","type":"form","canMaximize":true,"canHide":true,"width":"wider"}],"version":"5.4.1-pre.1964"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-care-panel-app",
-  "version": "5.4.1-pre.1957",
+  "version": "5.4.1-pre.1964",
   "description": "Patient care panels microfrontend for the OpenMRS SPA",
   "browser": "dist/kenyaemr-esm-care-panel-app.js",
   "main": "src/index.ts",

package/src/dispensing-patient-details/patient-info.scss

@@ -0,0 +1,9 @@
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@carbon/colors';
+
+.container {
+  margin: layout.$spacing-03 0 layout.$spacing-03 0;
+  background-color: colors.$white;
+  border: 1px solid colors.$gray-20;
+}

package/src/dispensing-patient-details/patient-vitals.component.tsx

@@ -1,6 +1,7 @@
-import { Layer } from '@carbon/react';
+import { Tile } from '@carbon/react';
 import React from 'react';
 import { usePatientVitals } from './dispensing-patient-vitals.resources';
+import styles from './patient-info.scss';
 
 type PatientVitalsProps = {
   patientUuid: string;
@@ -9,18 +10,18 @@ type PatientVitalsProps = {
 const DispensingPatientVitals: React.FC<PatientVitalsProps> = ({ encounterUuid, patientUuid }) => {
   const { vitals, error, isLoading } = usePatientVitals(patientUuid, encounterUuid);
 
-  if (isLoading || error) {
+  if (isLoading || error || !vitals.length) {
     return null;
   }
   return (
-    <Layer>
+    <Tile className={styles.container}>
       {vitals.map((vital) => (
         <div>
           <strong>{vital?.display}: </strong>
           <span>{vital?.value}</span>
         </div>
       ))}
-    </Layer>
+    </Tile>
   );
 };
 

package/src/index.ts

@@ -8,8 +8,6 @@ import deleteRegimenConfirmationDialogComponent from './regimen-editor/delete-re
 import regimenFormComponent from './regimen-editor/regimen-form.component';
 import CarePanelDashboard from './care-panel-dashboard/care-panel-dashboard.component';
 import PatientSummary from './patient-summary/patient-summary.component';
-import PatientDiagnoses from './dispensing-patient-details/diagnoses.component';
-import PatientConditions from './dispensing-patient-details/conditions.component';
 import DispensingPatientVitals from './dispensing-patient-details/patient-vitals.component';
 
 const moduleName = '@kenyaemr/esm-care-panel-app';
@@ -49,7 +47,4 @@ export const hivPatientSummaryDashboardLink = getSyncLifecycle(
 export const hivPatientSummary = getSyncLifecycle(PatientSummary, options);
 export const regimenFormWorkspace = getSyncLifecycle(regimenFormComponent, options);
 
-// TODO Clean when community version gets merged
-export const patientDiagnoses = getSyncLifecycle(PatientDiagnoses, options);
-export const patientConditions = getSyncLifecycle(PatientConditions, options);
 export const dispensingPaentientVitals = getSyncLifecycle(DispensingPatientVitals, options);

package/src/routes.json

@@ -51,21 +51,11 @@
       "online": true,
       "offline": false
     },
-    {
-      "name": "patient-diagnoses",
-      "component": "patientDiagnoses",
-      "online": true,
-      "offline": true
-    },
-    {
-      "name": "patient-conditions",
-      "component": "patientConditions",
-      "online": true,
-      "offline": true
-    },
     {
       "name": "dispensing-patient-vitals",
       "component": "dispensingPaentientVitals",
+      "slot": "dispensing-condition-and-diagnoses",
+      "order": 1,
       "online": true,
       "offline": true
     }

package/translations/en.json

@@ -1,6 +1,4 @@
 {
-  "activeConditionsCount_one": "{{ count }} conditions",
-  "activeConditionsCount_other": "{{ count }} conditions",
   "age": "Age",
   "artInterruptionReason": "ART interruptions reason",
   "birthDate": "Birth date",
@@ -24,7 +22,6 @@
   "clinicianSignature": "Clinician signature",
   "clinicName": "Clinic name",
   "clinicsEnrolled": "Clinics enrolled",
-  "conditionsError": "Error loading conditions",
   "currentArtRegimen": "Current Art regimen",
   "currentArtRegimenDate": "Current Art regimen date",
   "currentFeedingOption": "Current feeding option",
@@ -42,9 +39,6 @@
   "deleteRegimen": "Delete Regimen",
   "deleteRegimenModalConfirmationText": "Are you sure you want to delete regimen?",
   "description": "Description",
-  "diagnosesCount_one": "{{ count }} diagnoses",
-  "diagnosesCount_other": "{{ count }} diagnoses",
-  "diagnosesError": "Error loading diagnoses",
   "discard": "Discard",
   "discontinue": "Discontinue",
   "diseaseClassification": "Disease classification",
@@ -77,8 +71,6 @@
   "lastWhoStage": "Last WHO stage",
   "lmp": "LMP",
   "loading": "Loading",
-  "loadingConditions": "Loading active Conditions ...",
-  "loadingDiagnoses": "Loading Diagnoses ...",
   "machineLearning": "Machine Learning",
   "maritalStatus": "Marital status",
   "mflCode": "MFL code",
@@ -90,8 +82,6 @@
   "neverOnArvRegimen": "Never on ARVs",
   "neverOnTbRegimen": "Never on TB regimen",
   "nextAppointmentDate": " Next appointment",
-  "noActiveConditions": "No active Conditions",
-  "noFinalDiagnoses": "No patient final diagnosis for this visit",
   "none": "None",
   "onART": "On ART",
   "oxygenSaturation": "Oxygen saturation",