From 66ddf4cb573b49782608bc282b717abc5754b12a Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 4 Apr 2024 20:06:00 -0500 Subject: [PATCH] CE-1072 return displayValue for DATE_TIME fields (if they're different from the raw value) --- src/qqq/utils/qqq/ValueUtils.tsx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/qqq/utils/qqq/ValueUtils.tsx b/src/qqq/utils/qqq/ValueUtils.tsx index e786336..e5a9c55 100644 --- a/src/qqq/utils/qqq/ValueUtils.tsx +++ b/src/qqq/utils/qqq/ValueUtils.tsx @@ -219,6 +219,16 @@ class ValueUtils if (field.type === QFieldType.DATE_TIME) { + if(displayValue && displayValue != rawValue) + { + ////////////////////////////////////////////////////////////////////////////// + // if the date-time actually has a displayValue set, and it isn't just the // + // raw-value being copied into the display value by whoever called us, then // + // return the display value. // + ////////////////////////////////////////////////////////////////////////////// + return displayValue; + } + if (!rawValue) { return (""); @@ -270,6 +280,7 @@ class ValueUtils { date = new Date(date); } + // @ts-ignore return (`${date.toString("yyyy-MM-dd hh:mm:ss")} ${date.getHours() < 12 ? "AM" : "PM"} ${date.getTimezone()}`); }