diff --git a/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx b/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx index 504ff78ccd5..93d8c430717 100644 --- a/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx +++ b/src/components/Medicine/MedicationAdministration/AdministrationTab.tsx @@ -258,15 +258,30 @@ const MedicationRow: React.FC = ({ return (
onEditAdministration(medication, admin)} > -
+
+
+
+ {admin.note && ( + + )} +
+
+
+ {new Date( admin.occurrence_period_start, ).toLocaleTimeString("en-US", { @@ -274,11 +289,11 @@ const MedicationRow: React.FC = ({ minute: "2-digit", hour12: true, })} -
-
- {admin.occurrence_period_end && ( - <> - {"- "} + + {admin.occurrence_period_end && ( + <> + {"-"} + {new Date( admin.occurrence_period_end, ).toLocaleTimeString("en-US", { @@ -286,19 +301,10 @@ const MedicationRow: React.FC = ({ minute: "2-digit", hour12: true, })} - - )} -
+ + + )}
- {admin.note && ( - - )}
); })}