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)} +
+
+
+ )} + ))} ); diff --git a/components/case/documents.js b/components/case/documents.js index 646581fb..7a4f5025 100644 --- a/components/case/documents.js +++ b/components/case/documents.js @@ -888,7 +888,7 @@ const DocumentDetails = (props) => { selectedOption, selectedDocumentType ) - .then((data) => data) + // .then((data) => data) .then((data) => { setDocumentDetails(data); setShowSpinnerState(false); @@ -1012,7 +1012,7 @@ const DocumentDetails = (props) => { return docObj; }; - const searchDocumentResultsObj = docDetailsObj(); + //const searchDocumentResultsObj = docDetailsObj(); }, [ incidentid, setDocumentDetails, diff --git a/components/case/events.js b/components/case/events.js index 94f28843..0072ab96 100644 --- a/components/case/events.js +++ b/components/case/events.js @@ -23,7 +23,7 @@ const EventsDetails = (props) => { return obj.hasOwnProperty(property) && obj[property] !== null; } - console.log(eventsArr.length > 0); + //console.log(eventsArr.length > 0); return ( eventsArr.length > 0 && ( diff --git a/pages/api/endpoint/getsearchdocumentdetailspaged_api.js b/pages/api/endpoint/getsearchdocumentdetailspaged_api.js index d748bf9c..208d8a54 100644 --- a/pages/api/endpoint/getsearchdocumentdetailspaged_api.js +++ b/pages/api/endpoint/getsearchdocumentdetailspaged_api.js @@ -121,7 +121,12 @@ export default async function ApiProxy(req, res) { } } - console.log(docTypeQueryString); + // console.log( + // "documentType:", + // documentType, + // "docTypeQueryString:", + // docTypeQueryString + // ); //console.log("has this passed docuemntType:", documentType); //(documentType !="all" && " pinswg_pinswg_isharedocumentlocations eq " + ) @@ -140,7 +145,7 @@ export default async function ApiProxy(req, res) { ? "&$skiptoken=" + ('') : ""); - console.log("docu paged: ", queryUrl); + //console.log("docu paged 1: ", queryUrl); return axios .get(