Merge branch 'main' into new-morgue-functionality

palladiumkenya · Jan 13, 2025 · 833913b · 833913b
2 parents d8efbc5 + 423bcaa
commit 833913b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/packages/esm-billing-app/src/billing-dashboard/clock-out-strip.component.tsx b/packages/esm-billing-app/src/billing-dashboard/clock-out-strip.component.tsx
@@ -32,7 +32,9 @@ export const ClockOutStrip = () => {
       <div className={styles.clockOutInfo}>
         <Alarm />
         <p className={styles.clockInTime}>
-          {t('clockInTime', `Clocked in on ${dayjs(globalActiveSheet.clockIn).format('D MMM YYYY, HH:mm A')}`)}
+          {t('clockInTime', `Clocked in on {{clockInDateTime}}`, {
+            clockInDateTime: dayjs(globalActiveSheet.clockIn).format('D MMM YYYY, HH:mm A'),
+          })}
         </p>
         <span className={styles.middot}>&middot;</span>
         <p className={styles.cashPointName}>{globalActiveSheet.cashPoint.name}</p>

diff --git a/packages/esm-billing-app/translations/en.json b/packages/esm-billing-app/translations/en.json
@@ -70,7 +70,7 @@
   "claimSummary": "Claim Summary",
   "clear": "Clear",
   "clearSearch": "Clear search input",
-  "clockInTime": "",
+  "clockInTime": "Clocked in on {{clockInDateTime}}",
   "close": "Close",
   "create": "Create",
   "createClaimError": "Create Claim error",

diff --git a/packages/esm-care-panel-app/src/iit-risk-score/iit-risk-score.component.tsx b/packages/esm-care-panel-app/src/iit-risk-score/iit-risk-score.component.tsx
@@ -4,6 +4,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import usePatientIITScore from '../hooks/usePatientIITScore';
 import styles from './iit-risk-score.scss';
+import dayjs from 'dayjs';
 
 interface CarePanellIITRiskScoreProps {
   patientUuid: string;
@@ -40,6 +41,10 @@ const CarePanellIITRiskScore: React.FC<CarePanellIITRiskScoreProps> = ({ patient
     );
   }
 
+  const evaluationDate = dayjs(riskScore?.evaluationDate).isValid()
+    ? formatDate(parseDate(riskScore.evaluationDate))
+    : '--';
+
   if (error) {
     return <ErrorState error={error} headerTitle={t('iitRiscScore', 'IIT Risk Score')} />;
   }
@@ -53,7 +58,7 @@ const CarePanellIITRiskScore: React.FC<CarePanellIITRiskScoreProps> = ({ patient
         </Column>
         <Column lg={4} md={4} sm={4} className={styles.riskScoreCardItem}>
           <strong>{t('evaluationDate', 'Evaluation Date')}:</strong>
-          <p>{formatDate(parseDate(riskScore?.evaluationDate))}</p>
+          <p>{evaluationDate}</p>
         </Column>
       </Row>
       <Row style={{ display: 'flex' }}>