From 1085e0f083125a466170df5470eb3ad33d2e4285 Mon Sep 17 00:00:00 2001 From: Rithvik Nishad Date: Fri, 29 Dec 2023 23:47:55 +0530 Subject: [PATCH] fix resp. rate from being 0 instead of null when unset (#6949) * fix resp. rate from being 0 instead of null * fix relative time alignment --- src/CAREUI/display/RecordMeta.tsx | 8 +++++--- src/Components/Patient/DailyRounds.tsx | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/CAREUI/display/RecordMeta.tsx b/src/CAREUI/display/RecordMeta.tsx index d4d32e437c8..5e1e117f9d6 100644 --- a/src/CAREUI/display/RecordMeta.tsx +++ b/src/CAREUI/display/RecordMeta.tsx @@ -1,7 +1,8 @@ import CareIcon from "../icons/CareIcon"; import { - formatDateTime, + formatDate, formatName, + formatTime, isUserOnline, relativeTime, } from "../../Utils/utils"; @@ -37,8 +38,9 @@ const RecordMeta = ({ let child = (
{relativeTime(time)} - - {formatDateTime(time)} + + {formatTime(time)}
+ {formatDate(time)} {user && !inlineUser && ( by diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx index 4def8ed74eb..06431457b0e 100644 --- a/src/Components/Patient/DailyRounds.tsx +++ b/src/Components/Patient/DailyRounds.tsx @@ -296,9 +296,9 @@ export const DailyRounds = (props: any) => { } : undefined, pulse: state.form.pulse, - resp: Number(state.form.resp), + resp: state.form.resp, temperature: state.form.temperature, - rhythm: Number(state.form.rhythm) || 0, + rhythm: state.form.rhythm || 0, rhythm_detail: state.form.rhythm_detail, ventilator_spo2: state.form.ventilator_spo2, consciousness_level: state.form.consciousness_level,