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";
let messagesObjArr = messagesObj.value;
let todaysDate = new Date();
return (
<>
{messagesObjArr.map((message, index) => (
<div className="govuk-warning-text noticebanner" key={index}>
<strong className="govuk-warning-text__text">
<span className="govuk-visually-hidden">
{t("case:notice-label")}
</span>
</strong>
<div>
<div className=" govuk-body-s">
<h2 className="govuk-heading-s">
{(
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]}
</h2>
</div>
<div className="govuk-body-s">
{(
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}
</div>
<div className="govuk-body-xs govuk-!-margin-bottom-0 ">
{t("case:date-raised")}:{" "}
{formatDates(message.createdon)}
</div>
</div>
</div>
<>
{todaysDate.toISOString() >= message.scheduledstart &&
todaysDate.toISOString() <= message.scheduledend && (
<div
className="govuk-warning-text noticebanner"
key={index}
>
<strong className="govuk-warning-text__text">
<span className="govuk-visually-hidden">
{t("case:notice-label")}
</span>
</strong>
<div>
<div className=" govuk-body-s">
<h2 className="govuk-heading-s">
{(
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]}
</h2>
</div>
<div className="govuk-body-s">
{(
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}
</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,
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,
components/case/events.js
+1 -1
View File
@@ -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 && (
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);
//(documentType !="all" && " pinswg_pinswg_isharedocumentlocations eq " + )
@@ -140,7 +145,7 @@ export default async function ApiProxy(req, res) {
? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />')
: "");
console.log("docu paged: ", queryUrl);
//console.log("docu paged 1: ", queryUrl);
return axios
.get(