From ebed61f75f2178b882f2bce297bb04a5d686a307 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Fri, 7 Mar 2025 11:17:18 +0000 Subject: [PATCH] 14697 Start and due date for notifications --- components/case/caseNoticeBanner.js | 142 ++++++++++++++++------------ 1 file changed, 81 insertions(+), 61 deletions(-) diff --git a/components/case/caseNoticeBanner.js b/components/case/caseNoticeBanner.js index 3ff6dff1..23d63cd2 100644 --- a/components/case/caseNoticeBanner.js +++ b/components/case/caseNoticeBanner.js @@ -15,70 +15,90 @@ export default function CaseNoticeBanner(props) { const bannerOpenCookie = typeof cookie.get("pedwNotice") == "undefined"; let messagesObjArr = messagesObj.value; + let todaysDate = new Date(); + return ( <> {messagesObjArr.map((message, index) => ( -
- - - {t("case:notice-label")} - - -
-
-

- {( - message.subject.match( - new RegExp(">>>", "g") - ) || [] - ).length > 0 - ? router.locale == "cy" - ? message.subject - .split("Banner ")[1] - .split(">>>")[1] - : message.subject - .split("Banner ")[1] - .split(">>>")[0] - : ( - message.subject.match( - new RegExp(";", "g") - ) || [] - ).length > 0 - ? router.locale == "cy" - ? message.subject - .split("Banner ")[1] - .split(";")[1] - : message.subject - .split("Banner ")[1] - .split(";")[0] - : message.subject.split("Banner ")[1]} -

-
-
- {( - message.description.match( - new RegExp(">>>", "g") - ) || [] - ).length > 0 - ? router.locale == "cy" - ? message.description.split(">>>")[1] - : message.description.split(">>>")[0] - : ( - message.description.match( - new RegExp(";", "g") - ) || [] - ).length > 0 - ? router.locale == "cy" - ? message.description.split(";")[1] - : message.description.split(";")[0] - : message.description} -
-
- {t("case:date-raised")}:{" "} - {formatDates(message.createdon)} -
-
-
+ <> + {todaysDate.toISOString() >= message.scheduledstart && + todaysDate.toISOString() <= message.scheduledend && ( +
+ + + {t("case:notice-label")} + + +
+
+

+ {( + message.subject.match( + new RegExp(">>>", "g") + ) || [] + ).length > 0 + ? router.locale == "cy" + ? message.subject + .split("Banner ")[1] + .split(">>>")[1] + : message.subject + .split("Banner ")[1] + .split(">>>")[0] + : ( + message.subject.match( + new RegExp(";", "g") + ) || [] + ).length > 0 + ? router.locale == "cy" + ? message.subject + .split("Banner ")[1] + .split(";")[1] + : message.subject + .split("Banner ")[1] + .split(";")[0] + : message.subject.split( + "Banner " + )[1]} +

+
+
+ {( + message.description.match( + new RegExp(">>>", "g") + ) || [] + ).length > 0 + ? router.locale == "cy" + ? message.description.split( + ">>>" + )[1] + : message.description.split( + ">>>" + )[0] + : ( + message.description.match( + new RegExp(";", "g") + ) || [] + ).length > 0 + ? router.locale == "cy" + ? message.description.split( + ";" + )[1] + : message.description.split( + ";" + )[0] + : message.description} +
+
+ {t("case:date-raised")}:{" "} + {formatDates(message.createdon)} +
+
+
+ )} + ))} );