Skip to content

Commit aefbb99

Browse files
authored
(fix) O3-5318: Format dates properly in print and edit lab results modals (#2931)
1 parent e8bbaec commit aefbb99

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

packages/esm-patient-orders-app/src/lab-results/print-results/print-modal/print-results-modal.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { capitalize } from 'lodash-es';
44
import { Button, ModalBody, ModalFooter, Checkbox } from '@carbon/react';
55
import { useReactToPrint } from 'react-to-print';
66
import { useTranslation } from 'react-i18next';
7-
import { useSession } from '@openmrs/esm-framework';
7+
import { useSession, formatDatetime, parseDate } from '@openmrs/esm-framework';
88
import { type Order } from '@openmrs/esm-patient-common-lib';
99
import PrintableReport from '../print-preview/print-preview.component';
1010
import styles from './print-results-modal.scss';
@@ -104,7 +104,9 @@ const PrintResultsModal: React.FC<PrintResultsModalProps> = ({ orders, closeModa
104104

105105
<div className={styles.facilityDetails}>
106106
<p className={styles.itemLabel}>{capitalize(location)}</p>
107-
<p className={styles.itemLabel}>{firstOrder.dateActivated}</p>
107+
<span className={styles.itemLabel}>
108+
{formatDatetime(parseDate(firstOrder.dateActivated), { mode: 'standard', noToday: true })}
109+
</span>
108110
</div>
109111
</div>
110112
<p className={styles.testDoneHeader}>{capitalize(t('testDone', 'Test done'))}</p>

packages/esm-patient-tests-app/src/edit-test-results/modal/edit-lab-results.modal.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
22
import classNames from 'classnames';
33
import { useTranslation } from 'react-i18next';
44
import { Button, ModalBody, ModalFooter, ModalHeader, RadioButton, RadioButtonGroup } from '@carbon/react';
5-
import { launchWorkspace2, useSession } from '@openmrs/esm-framework';
5+
import { launchWorkspace2, useSession, formatDatetime, parseDate } from '@openmrs/esm-framework';
66
import { type Order } from '@openmrs/esm-patient-common-lib';
77
import styles from './edit-lab-results.scss';
88

@@ -86,7 +86,9 @@ const EditLabResultModal: React.FC<EditLabResultModalProps> = ({
8686
</p>
8787
<p className={styles.itemLabel}>
8888
<span className={styles.labelKey}>{t('dateOrdered', 'Date ordered')}:</span>
89-
<span className={styles.labelValue}>{selectedOrder.dateActivated}</span>
89+
<span className={styles.labelValue}>
90+
{formatDatetime(parseDate(selectedOrder.dateActivated), { mode: 'standard', noToday: true })}
91+
</span>
9092
</p>
9193
</div>
9294
</div>

0 commit comments

Comments
 (0)