Merge branch 'main' into new-discharge

palladiumkenya · Nov 12, 2024 · 545aac8 · 545aac8
2 parents bd079af + 8c2c1a2
commit 545aac8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/packages/esm-patient-clinical-view-app/src/hooks/usePeers.ts b/packages/esm-patient-clinical-view-app/src/hooks/usePeers.ts
@@ -42,9 +42,9 @@ function getPeer(relationship: Relationship, config: ConfigObject, person: 'pers
     relationshipType: relationship.relationshipType.bIsToA,
     patientUuid: relationship[person].uuid,
     gender: relationship[person].gender,
-    startDate: !relationship.startDate ? null : formatDate(parseDate(relationship.startDate)),
+    startDate: !relationship.startDate ? null : relationship.startDate,
     age: relationship[person].age,
-    endDate: !relationship.endDate ? null : formatDate(parseDate(relationship.endDate)),
+    endDate: !relationship.endDate ? null : relationship.endDate,
   } as Peer;
 }
 

diff --git a/...m-patient-clinical-view-app/src/peer-calendar/metrics/peer-calendar-metrics.component.tsx b/...m-patient-clinical-view-app/src/peer-calendar/metrics/peer-calendar-metrics.component.tsx
@@ -52,12 +52,12 @@ const PeerCalendarMetricsHeader: React.FC<PeerCalendarMetricsHeaderProps> = ({
         <MetricsCard title={t('total', 'Total')} header={t('totalPeers', 'Total Peers')} value={peers.length} />
         <MetricsCard
           title={t('pending', 'Pending')}
-          header={t('pendingPeers', 'Pending Peers')}
+          header={t('pendingDocumentations', 'Pending Documentation')}
           value={peers.length - completedPeers.length}
         />
         <MetricsCard
           title={t('completed', 'Completed')}
-          header={t('completedPeers', 'Completed Peers')}
+          header={t('completedDocumentations', 'Completed Documentation')}
           value={completedPeers.length}
         />
       </Layer>

diff --git a/.../esm-patient-clinical-view-app/src/peer-calendar/table/peer-calendar-table.components.tsx b/.../esm-patient-clinical-view-app/src/peer-calendar/table/peer-calendar-table.components.tsx
@@ -1,5 +1,5 @@
 import { DataTableSkeleton } from '@carbon/react';
-import { ConfigurableLink, useSession } from '@openmrs/esm-framework';
+import { ConfigurableLink, formatDate, parseDate, useSession } from '@openmrs/esm-framework';
 import { ErrorState } from '@openmrs/esm-patient-common-lib';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -89,8 +89,14 @@ const PeerCalendarTable: React.FC<PeerCalendarTableProps> = ({
             ),
             age: peer.age ?? '--',
             contact: peer.contact ?? '--',
-            startDate: peer.patientUuid === peerEducatorUuid ? '--' : peer.startDate ?? '--',
-            endDate: peer.patientUuid === peerEducatorUuid ? '--' : peer.endDate ?? '--',
+            startDate:
+              peer.patientUuid === peerEducatorUuid
+                ? '--'
+                : peer.startDate
+                ? formatDate(parseDate(peer.startDate))
+                : '--',
+            endDate:
+              peer.patientUuid === peerEducatorUuid ? '--' : peer.endDate ? formatDate(parseDate(peer.endDate)) : '--',
             status: (
               <PeerCompletionStatus
                 peer={peer}

diff --git a/packages/esm-patient-clinical-view-app/translations/en.json b/packages/esm-patient-clinical-view-app/translations/en.json
@@ -39,7 +39,7 @@
   "clinicalEncounter": "Clinical Encounter",
   "clinicalViews": "Clinical views",
   "completed": "Completed",
-  "completedPeers": "Completed Peers",
+  "completedDocumentations": "Completed Documentation",
   "contact": "Contact",
   "contactCreated": "Contact created",
   "contacted": "Contacted",
@@ -130,7 +130,7 @@
   "partographData": "Vital Components",
   "peerCalendar": "Peer Calendar",
   "pending": "Pending",
-  "pendingPeers": "Pending Peers",
+  "pendingDocumentations": "Pending Documentation",
   "placeOfDelivery": "Place of Delivery",
   "pnsAproach": "PNS Aproach",
   "populationType": "Population type",