robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged PR 1472: SIPS Sprint 2 070325

Browse Source 
Related work items: #14656, #14697
This commit is contained in:
Robert Bond
2025-03-10 09:25:27 +00:00
parent d9a18f008d f6fdc79ae3
commit 07f3769d84
4 changed files with 91 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/case/caseNoticeBanner.js
+81 -61
View File
@@ -15,70 +15,90 @@ export default function CaseNoticeBanner(props) {
const bannerOpenCookie = typeof cookie.get("pedwNotice") == "undefined"; const bannerOpenCookie = typeof cookie.get("pedwNotice") == "undefined";
let messagesObjArr = messagesObj.value; let messagesObjArr = messagesObj.value;
let todaysDate = new Date();
return ( return (
<> <>
{messagesObjArr.map((message, index) => ( {messagesObjArr.map((message, index) => (
<div className="govuk-warning-text noticebanner" key={index}> <>
<strong className="govuk-warning-text__text"> {todaysDate.toISOString() >= message.scheduledstart &&
<span className="govuk-visually-hidden"> todaysDate.toISOString() <= message.scheduledend && (
{t("case:notice-label")} <div
</span> className="govuk-warning-text noticebanner"
</strong> key={index}
<div> >
<div className=" govuk-body-s"> <strong className="govuk-warning-text__text">
<h2 className="govuk-heading-s"> <span className="govuk-visually-hidden">
{( {t("case:notice-label")}
message.subject.match( </span>
new RegExp(">>>", "g") </strong>
) || [] <div>
).length > 0 <div className=" govuk-body-s">
? router.locale == "cy" <h2 className="govuk-heading-s">
? message.subject {(
.split("Banner ")[1] message.subject.match(
.split(">>>")[1] new RegExp(">>>", "g")
: message.subject ) || []
.split("Banner ")[1] ).length > 0
.split(">>>")[0] ? router.locale == "cy"
: ( ? message.subject
message.subject.match( .split("Banner ")[1]
new RegExp(";", "g") .split(">>>")[1]
) || [] : message.subject
).length > 0 .split("Banner ")[1]
? router.locale == "cy" .split(">>>")[0]
? message.subject : (
.split("Banner ")[1] message.subject.match(
.split(";")[1] new RegExp(";", "g")
: message.subject ) || []
.split("Banner ")[1] ).length > 0
.split(";")[0] ? router.locale == "cy"
: message.subject.split("Banner ")[1]} ? message.subject
</h2> .split("Banner ")[1]
</div> .split(";")[1]
<div className="govuk-body-s"> : message.subject
{( .split("Banner ")[1]
message.description.match( .split(";")[0]
new RegExp(">>>", "g") : message.subject.split(
) || [] "Banner "
).length > 0 )[1]}
? router.locale == "cy" </h2>
? message.description.split(">>>")[1] </div>
: message.description.split(">>>")[0] <div className="govuk-body-s">
: ( {(
message.description.match( message.description.match(
new RegExp(";", "g") new RegExp(">>>", "g")
) || [] ) || []
).length > 0 ).length > 0
? router.locale == "cy" ? router.locale == "cy"
? message.description.split(";")[1] ? message.description.split(
: message.description.split(";")[0] ">>>"
: message.description} )[1]
</div> : message.description.split(
<div className="govuk-body-xs govuk-!-margin-bottom-0 "> ">>>"
{t("case:date-raised")}:{" "} )[0]
{formatDates(message.createdon)} : (
</div> message.description.match(
</div> new RegExp(";", "g")
</div> ) || []
).length > 0
? router.locale == "cy"
? message.description.split(
";"
)[1]
: message.description.split(
";"
)[0]
: message.description}
</div>
<div className="govuk-body-xs govuk-!-margin-bottom-0 ">
{t("case:date-raised")}:{" "}
{formatDates(message.createdon)}
</div>
</div>
</div>
)}
</>
))} ))}
</> </>
); );
components/case/documents.js
+2 -2
View File
@@ -888,7 +888,7 @@ const DocumentDetails = (props) => {
selectedOption, selectedOption,
selectedDocumentType selectedDocumentType
) )
.then((data) => data) // .then((data) => data)
.then((data) => { .then((data) => {
setDocumentDetails(data); setDocumentDetails(data);
setShowSpinnerState(false); setShowSpinnerState(false);
@@ -1012,7 +1012,7 @@ const DocumentDetails = (props) => {
return docObj; return docObj;
}; };
const searchDocumentResultsObj = docDetailsObj(); //const searchDocumentResultsObj = docDetailsObj();
}, [ }, [
incidentid, incidentid,
setDocumentDetails, setDocumentDetails,
components/case/events.js
+1 -1
View File
@@ -23,7 +23,7 @@ const EventsDetails = (props) => {
return obj.hasOwnProperty(property) && obj[property] !== null; return obj.hasOwnProperty(property) && obj[property] !== null;
} }
console.log(eventsArr.length > 0); //console.log(eventsArr.length > 0);
return ( return (
eventsArr.length > 0 && ( eventsArr.length > 0 && (
pages/api/endpoint/getsearchdocumentdetailspaged_api.js
+7 -2
View File
@@ -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); //console.log("has this passed docuemntType:", documentType);
//(documentType !="all" && " pinswg_pinswg_isharedocumentlocations eq " + ) //(documentType !="all" && " pinswg_pinswg_isharedocumentlocations eq " + )
@@ -140,7 +145,7 @@ export default async function ApiProxy(req, res) {
? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />') ? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />')
: ""); : "");
console.log("docu paged: ", queryUrl); //console.log("docu paged 1: ", queryUrl);
return axios return axios
.get( .get(