21187 implement helper function on summary

This commit is contained in:
2026-01-27 11:58:40 +00:00
parent 49374640e5
commit 1b586da1ae
5 changed files with 453 additions and 481 deletions
+3 -2
View File
@@ -32,7 +32,7 @@ CRMURL_VERSION = "v8.2"
# # //New PreProd
# CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
# CLIENT_SECRET = V288Q~P1lFMvvX9Xnkx2pLixK~GOREH983Owqc1E
# CLIENT_SECRET = VWY8Q~9EtRzGXpd8Xs~5OS1fej2IyVJ8JgTMncw3
# RELAY_ROOT = https://ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net/ar-hc-lz-pedw-ppe-uks-01/
# RELAYURI = "ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net"
# RELAYPATH = "ar-hc-lz-pedw-ppe-uks-01"
@@ -53,7 +53,7 @@ CRMURL_VERSION = "v8.2"
# //New Prod
# CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc
# CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR
# CLIENT_SECRET = ULC8Q~fZiXm0.teVLlZ_7LjxBOj2vIsWSApu2bAq
# RELAY_ROOT = https://ar-ns-lz-pedw-prod-uks-01.servicebus.windows.net/ar-hc-lz-pedw-prod-uks-01/
# RELAYURI = "ar-ns-lz-pedw-prod-uks-01.servicebus.windows.net"
# RELAYPATH = "ar-hc-lz-pedw-prod-uks-01"
@@ -113,6 +113,7 @@ CRMURL_VERSION = "v8.2"
//GOOGLE_TAG_MANAGER = GTM-T78CBC3
GOOGLE_TAG_MANAGER = G-GTWW3JT03Z
SHOWLOGIN = true
SHOWREPRESENTATIONS = true
SHOWFILEUPLOAD = "false"
+34 -33
View File
@@ -140,9 +140,9 @@ let MakeRepresentation = (props) => {
const pad = (num) => String(num).padStart(2, "0");
const dateStr = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(
now.getDate()
now.getDate(),
)}-${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(
now.getSeconds()
now.getSeconds(),
)}`;
const repCap = repCapMap[values.representationCapacity] || "";
@@ -154,7 +154,7 @@ let MakeRepresentation = (props) => {
const namePart = isLPA
? sanitize(values.onBehalfOfLPA || "")
: `${sanitize(values.lastname || "")}_${sanitize(
values.firstname || ""
values.firstname || "",
)}`;
values.repfile_name =
@@ -203,7 +203,7 @@ let MakeRepresentation = (props) => {
if (shouldIncludeInterested) {
capacityOptionsArr.push(
t("myrepresentations:capacity-options-arr-interested")
t("myrepresentations:capacity-options-arr-interested"),
);
}
@@ -263,25 +263,26 @@ let MakeRepresentation = (props) => {
const isDNS = appealType === 846040011;
const isSIPS = appealType === 846040002;
const isIP = true;
// Determine key dates based on appeal type
const startDate = new Date(
isDNS
? detailsObj.pinswg_applicationacceptedasvalid
: detailsObj.pinswg_startdate || detailsObj.pinswg_startdates
: detailsObj.pinswg_startdate || detailsObj.pinswg_startdates,
);
const questionnaireDate = new Date(
isDNS
? detailsObj.pinswg_endofrepresentationperiod
: detailsObj.pinswg_questionnaireduedate
: detailsObj.pinswg_questionnaireduedate,
);
questionnaireDate.setHours(23, 59, 59, 999);
const finalCommentsDate = new Date(
isDNS
? detailsObj.pinswg_endofrepresentationperiod
: detailsObj.pinswg_finalcommentsduedate
: detailsObj.pinswg_finalcommentsduedate,
);
finalCommentsDate.setHours(23, 59, 59, 999);
@@ -289,7 +290,7 @@ let MakeRepresentation = (props) => {
isDNS
? detailsObj.pinswg_endofrepresentationperiod
: detailsObj.pinswg_statementduedate ||
detailsObj.pinswg_statementsduedate
detailsObj.pinswg_statementsduedate,
);
statementDueDate.setHours(23, 59, 59, 999);
@@ -446,7 +447,7 @@ let MakeRepresentation = (props) => {
case "apelydd":
case "apelydd":
case t(
"myrepresentations:capacity-options-arr-appellant"
"myrepresentations:capacity-options-arr-appellant",
).toLowerCase(): {
const Component =
appealType === 846040002
@@ -456,7 +457,7 @@ let MakeRepresentation = (props) => {
<Component
{...commonProps}
appellantApplicantRepresentationArr={buildRepsArr(
detailsObj
detailsObj,
)}
/>
);
@@ -468,7 +469,7 @@ let MakeRepresentation = (props) => {
<RepLPA
{...commonProps}
appellantApplicantRepresentationArr={buildRepsArr(
detailsObj
detailsObj,
)}
setShowQuestionnaireSection={
setShowQuestionnaireSection
@@ -483,7 +484,7 @@ let MakeRepresentation = (props) => {
case "asiant":
case "asiant":
case t(
"myrepresentations:capacity-options-arr-agent"
"myrepresentations:capacity-options-arr-agent",
).toLowerCase(): {
const Component =
appealType === 846040002 ? ConsultationAgent : RepAgent;
@@ -491,7 +492,7 @@ let MakeRepresentation = (props) => {
<Component
{...commonProps}
appellantApplicantRepresentationArr={buildRepsArr(
detailsObj
detailsObj,
)}
/>
);
@@ -499,7 +500,7 @@ let MakeRepresentation = (props) => {
case "interestedparty":
case t(
"myrepresentations:capacity-options-arr-interested"
"myrepresentations:capacity-options-arr-interested",
).toLowerCase(): {
const Component =
appealType === 846040002
@@ -509,7 +510,7 @@ let MakeRepresentation = (props) => {
<Component
{...commonProps}
interestedPersonRepresentationArr={buildRepsArr(
detailsObj
detailsObj,
)}
/>
);
@@ -621,7 +622,7 @@ let MakeRepresentation = (props) => {
const updateRepresentation = async (
values,
sendSavedEmail,
useSaveStatus
useSaveStatus,
) => {
const {
appealType: appealTypeProp,
@@ -724,7 +725,7 @@ let MakeRepresentation = (props) => {
}
return acc;
},
{}
{},
);
// Normalize "Yes"/"No" to booleans
@@ -747,7 +748,7 @@ let MakeRepresentation = (props) => {
templateId,
loggedinUserEmail,
personalisation,
reference
reference,
);
}
};
@@ -838,8 +839,8 @@ let MakeRepresentation = (props) => {
router.query?.state === "edit"
? props.props.currentView.representationCapacity
: isLPA
? "LPA"
: values.representationCapacity;
? "LPA"
: values.representationCapacity;
Object.assign(values, {
...formValues,
@@ -915,7 +916,7 @@ let MakeRepresentation = (props) => {
showQuestionnaireSection < questionnaireCount
) {
setShowQuestionnaireSection(
showQuestionnaireSection + 1
showQuestionnaireSection + 1,
);
updateRepresentation(values, false, false);
} else {
@@ -948,7 +949,7 @@ let MakeRepresentation = (props) => {
generateRepPDF(
values,
props.props.accountDetails.containerID,
currentView.caseReference.currentReference
currentView.caseReference.currentReference,
).then((data) => {
if (data.status === "success") {
values = updateLinks(values);
@@ -967,7 +968,7 @@ let MakeRepresentation = (props) => {
(file) =>
file &&
typeof file === "object" &&
Object.keys(file).length > 0
Object.keys(file).length > 0,
)
.filter((file) => file.name !== undefined);
@@ -1002,7 +1003,7 @@ let MakeRepresentation = (props) => {
dataObj,
[{}],
updatedValues.containerID,
`${props.caseReference}/${dataObj.repfile_name}`
`${props.caseReference}/${dataObj.repfile_name}`,
);
};
@@ -1026,7 +1027,7 @@ let MakeRepresentation = (props) => {
return formatDates(
detailsObj.pinswg_questionnaireduedate ||
detailsObj.pinswg_endofrepresentationperiod ||
detailsObj.pinswg_consultationclose
detailsObj.pinswg_consultationclose,
);
}
return "N/A";
@@ -1039,7 +1040,7 @@ let MakeRepresentation = (props) => {
{formatDates(
detailsObj.pinswg_statementduedate ||
detailsObj.pinswg_statementsduedate ||
detailsObj.pinswg_endofrepresentationperiod
detailsObj.pinswg_endofrepresentationperiod,
)}
</span>
</div>
@@ -1113,10 +1114,10 @@ let MakeRepresentation = (props) => {
<h1 className="govuk-heading-l">
{appealIsConsultation
? t(
"myrepresentations:make-a-consultation-on-label"
"myrepresentations:make-a-consultation-on-label",
)
: t(
"myrepresentations:make-a-representation-on-label"
"myrepresentations:make-a-representation-on-label",
)}{" "}
{currentView.caseReference.currentReference}{" "}
</h1>
@@ -1130,17 +1131,17 @@ let MakeRepresentation = (props) => {
<div className="card-body">
<h2 className="govuk-heading-s">
{t(
"myrepresentations:timetable-title"
"myrepresentations:timetable-title",
)}
</h2>
<div className="govuk-summary-list">
<div className="govuk-body-s">
{appealIsLocalImpact
? t(
"myrepresentations:local-impact-report"
"myrepresentations:local-impact-report",
)
: t(
"myrepresentations:questionnaire-due-label"
"myrepresentations:questionnaire-due-label",
)}
:{" "}
<span className="govuk-body-s">
@@ -1210,11 +1211,11 @@ const selector = formValueSelector("representationForm");
export default connect(
mapStateToProps,
mapDispatchToProps
mapDispatchToProps,
)(
reduxForm({
form: "representationForm",
destroyOnUnmount: false,
enableReinitialize: true,
})(MakeRepresentation)
})(MakeRepresentation),
);
+271 -277
View File
File diff suppressed because it is too large Load Diff
+126 -150
View File
@@ -7,6 +7,7 @@ import transLookup from "../../../data/lookuptranslations.json";
import GoogleMapComponent from "../../mapping/";
import OSPoint from "ospoint";
import { getBilingualText } from "../summary/utils/helpers";
const Pinswg_dnsid = (props) => {
let { t } = useTranslation();
@@ -21,7 +22,7 @@ const Pinswg_dnsid = (props) => {
point = new OSPoint(
detailsObj.pinswg_anticipatedgridreferencenorthingtext,
detailsObj.pinswg_anticipatedgridreferenceeastingtext
detailsObj.pinswg_anticipatedgridreferenceeastingtext,
);
siteCoords = point.toOSGB36();
//console.log(siteCoords);
@@ -53,36 +54,11 @@ const Pinswg_dnsid = (props) => {
{t("case:summary-project-details-label")}
</h2>
<p className="govuk-body">
{detailsObj.pinswg_projectdescription != null
? detailsObj.pinswg_projectdescription.indexOf(
";"
) < 0
? detailsObj.pinswg_projectdescription
: router.locale == "cy"
? detailsObj.pinswg_projectdescription.split(
";"
)[1]
: detailsObj.pinswg_projectdescription.split(
";"
)[0]
: ""}
{getBilingualText(
detailsObj.pinswg_projectdescription,
router.locale,
)}
</p>
{/* <p className="govuk-body">
{detailsObj.pinswg_projectlocation != null
? detailsObj.pinswg_projectlocation.indexOf(
";"
) < 0
? detailsObj.pinswg_projectlocation
: router.locale == "cy"
? detailsObj.pinswg_projectlocation.split(
";"
)[1]
: detailsObj.pinswg_projectlocation.split(
";"
)[0]
: ""}
</p> */}
</div>
{showMap == "true" && (
<div className="govuk-grid-column-one-half">
@@ -136,7 +112,7 @@ const Pinswg_dnsid = (props) => {
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] ||
t(
"case:summary-no-date-entered-label"
"case:summary-no-date-entered-label",
)}
</dd>
</div>
@@ -145,7 +121,7 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-website-label"
"case:summary-case-website-label",
)}
</dt>
<dd className="govuk-summary-list__value">
@@ -164,7 +140,7 @@ const Pinswg_dnsid = (props) => {
rel="noreferrer"
href={
detailsObj.pinswg_webaddress.indexOf(
"https://"
"https://",
)
? "https://" +
detailsObj.pinswg_webaddress
@@ -177,7 +153,7 @@ const Pinswg_dnsid = (props) => {
</a>
) ||
t(
"case:summary-no-date-entered-label"
"case:summary-no-date-entered-label",
)}
</dd>
</div>
@@ -206,7 +182,7 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-eia-required-label"
"case:summary-eia-required-label",
)}
</dt>
<dd className="govuk-summary-list__value">
@@ -217,13 +193,13 @@ const Pinswg_dnsid = (props) => {
"pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy',
transLookup
transLookup,
)
: detailsObj[
"pinswg_eiarequired@OData.Community.Display.V1.FormattedValue"
] ||
t(
"case:summary-to-be-confirmed-label"
"case:summary-to-be-confirmed-label",
)}
</dd>
</div>
@@ -247,7 +223,7 @@ const Pinswg_dnsid = (props) => {
"pinswg_choiceofprocedure@OData.Community.Display.V1.FormattedValue"
] ||
t(
"case:summary-to-be-confirmed-label"
"case:summary-to-be-confirmed-label",
)}
</dd>
</div>
@@ -291,7 +267,7 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-type-of-event-label"
"case:summary-type-of-event-label",
)}
</dt>
<dd className="govuk-summary-list__value">
@@ -314,25 +290,25 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-start-event-date-label"
"case:summary-start-event-date-label",
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_startdateofevent"
"pinswg_startdateofevent",
)
? !_.isEmpty(
detailsObj.pinswg_startdateofevent
detailsObj.pinswg_startdateofevent,
)
? formatDates(
detailsObj.pinswg_startdateofevent
detailsObj.pinswg_startdateofevent,
)
: t(
"case:summary-no-information-to-date-label"
"case:summary-no-information-to-date-label",
)
: t(
"case:summary-no-information-to-date-label"
"case:summary-no-information-to-date-label",
)}
</dd>
</div>
@@ -343,19 +319,19 @@ const Pinswg_dnsid = (props) => {
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_dateeventrequested"
"pinswg_dateeventrequested",
)
? !_.isEmpty(
detailsObj.pinswg_dateeventrequested
detailsObj.pinswg_dateeventrequested,
)
? formatDates(
detailsObj.pinswg_dateeventrequested
detailsObj.pinswg_dateeventrequested,
)
: t(
"case:summary-to-be-confirmed-label"
"case:summary-to-be-confirmed-label",
)
: t(
"case:summary-to-be-confirmed-label"
"case:summary-to-be-confirmed-label",
)}
</dd>
</div>
@@ -379,7 +355,7 @@ const Pinswg_dnsid = (props) => {
"pinswg_decision@OData.Community.Display.V1.FormattedValue"
] ||
t(
"case:summary-no-information-to-date-label"
"case:summary-no-information-to-date-label",
)}
<br />
@@ -394,25 +370,25 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-decision-date-label"
"case:summary-decision-date-label",
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_dateofdecision"
"pinswg_dateofdecision",
)
? !_.isEmpty(
detailsObj.pinswg_dateofdecision
detailsObj.pinswg_dateofdecision,
)
? formatDates(
detailsObj.pinswg_dateofdecision
detailsObj.pinswg_dateofdecision,
)
: t(
"case:summary-no-information-to-date-label"
"case:summary-no-information-to-date-label",
)
: t(
"case:summary-no-information-to-date-label"
"case:summary-no-information-to-date-label",
)}
</dd>
</div>
@@ -420,7 +396,7 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
"case:summary-case-link-status-label",
)}
</dt>
<dd className="govuk-summary-list__value">
@@ -430,13 +406,13 @@ const Pinswg_dnsid = (props) => {
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
"case:summary-case-link-status-linked",
)
: t(
"case:summary-case-link-status-not-linked"
"case:summary-case-link-status-not-linked",
)
: t(
"case:summary-case-link-status-not-linked"
"case:summary-case-link-status-not-linked",
)}
</dd>
</div>
@@ -445,13 +421,13 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-linked-cases-label"
"case:summary-linked-cases-label",
)}
</dt>
<dd className="govuk-summary-list__value">
{linkedCasesList(
props.currentView
.linkedCaseReferences
.linkedCaseReferences,
)}
</dd>
</div>
@@ -515,126 +491,126 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-written-acceptance-of-notice"
"case:summary-written-acceptance-of-notice",
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_writtenacceptanceofnotification"
"pinswg_writtenacceptanceofnotification",
)
? !_.isEmpty(
detailsObj.pinswg_writtenacceptanceofnotification
detailsObj.pinswg_writtenacceptanceofnotification,
)
? formatDates(
detailsObj.pinswg_writtenacceptanceofnotification
detailsObj.pinswg_writtenacceptanceofnotification,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-deadline-for-submission-of-application"
"case:summary-deadline-for-submission-of-application",
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_deadlineforsubmissionofapplication"
"pinswg_deadlineforsubmissionofapplication",
)
? !_.isEmpty(
detailsObj.pinswg_deadlineforsubmissionofapplication
detailsObj.pinswg_deadlineforsubmissionofapplication,
)
? formatDates(
detailsObj.pinswg_deadlineforsubmissionofapplication
detailsObj.pinswg_deadlineforsubmissionofapplication,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-date-of-submission-of-application"
"case:summary-date-of-submission-of-application",
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_dateofsubmissionofapplication"
"pinswg_dateofsubmissionofapplication",
)
? !_.isEmpty(
detailsObj.pinswg_dateofsubmissionofapplication
detailsObj.pinswg_dateofsubmissionofapplication,
)
? formatDates(
detailsObj.pinswg_dateofsubmissionofapplication
detailsObj.pinswg_dateofsubmissionofapplication,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
{_.has(
detailsObj,
"pinswg_applicationacceptedasvalid"
"pinswg_applicationacceptedasvalid",
) &&
!_.isEmpty(
detailsObj.pinswg_applicationrejectedasinvalid
detailsObj.pinswg_applicationrejectedasinvalid,
) && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-application-accepted-as-valid"
"case:summary-application-accepted-as-valid",
)}
</dt>
<dd className="govuk-summary-list__value">
{!_.isEmpty(
detailsObj.pinswg_applicationacceptedasvalid
detailsObj.pinswg_applicationacceptedasvalid,
)
? formatDates(
detailsObj.pinswg_applicationacceptedasvalid
detailsObj.pinswg_applicationacceptedasvalid,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
)}
{_.has(
detailsObj,
"pinswg_applicationrejectedasinvalid"
"pinswg_applicationrejectedasinvalid",
) &&
!_.isEmpty(
detailsObj.pinswg_applicationrejectedasinvalid
detailsObj.pinswg_applicationrejectedasinvalid,
) && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-application-rejected-as-invalid"
"case:summary-application-rejected-as-invalid",
)}
</dt>
<dd className="govuk-summary-list__value">
{!_.isEmpty(
detailsObj.pinswg_applicationrejectedasinvalid
detailsObj.pinswg_applicationrejectedasinvalid,
)
? formatDates(
detailsObj.pinswg_applicationrejectedasinvalid
detailsObj.pinswg_applicationrejectedasinvalid,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
@@ -642,51 +618,51 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-end-of-representation-period"
"case:summary-end-of-representation-period",
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_endofrepresentationperiod"
"pinswg_endofrepresentationperiod",
)
? !_.isEmpty(
detailsObj.pinswg_endofrepresentationperiod
detailsObj.pinswg_endofrepresentationperiod,
)
? formatDates(
detailsObj.pinswg_endofrepresentationperiod
detailsObj.pinswg_endofrepresentationperiod,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
{_.has(
detailsObj,
"pinswg_dateofrequesttovarytheapplication"
"pinswg_dateofrequesttovarytheapplication",
) &&
!_.isEmpty(
detailsObj.pinswg_dateofrequesttovarytheapplication
detailsObj.pinswg_dateofrequesttovarytheapplication,
) && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-date-of-request-to-vary"
"case:summary-date-of-request-to-vary",
)}
</dt>
<dd className="govuk-summary-list__value">
{!_.isEmpty(
detailsObj.pinswg_dateofrequesttovarytheapplication
detailsObj.pinswg_dateofrequesttovarytheapplication,
)
? formatDates(
detailsObj.pinswg_dateofrequesttovarytheapplication
detailsObj.pinswg_dateofrequesttovarytheapplication,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
@@ -694,33 +670,33 @@ const Pinswg_dnsid = (props) => {
{_.has(
detailsObj,
"pinswg_confirmrequesttovaryapplication"
"pinswg_confirmrequesttovaryapplication",
) &&
!_.isEmpty(
detailsObj.pinswg_confirmrequesttovaryapplication
detailsObj.pinswg_confirmrequesttovaryapplication,
) &&
(_.has(
detailsObj,
"pinswg_rejectrequesttovaryapplication"
"pinswg_rejectrequesttovaryapplication",
) &&
_.isEmpty(
detailsObj.pinswg_rejectrequesttovaryapplication
detailsObj.pinswg_rejectrequesttovaryapplication,
) ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-confirm-request-to-vary-application"
"case:summary-confirm-request-to-vary-application",
)}
</dt>
<dd className="govuk-summary-list__value">
{!_.isEmpty(
detailsObj.pinswg_confirmrequesttovaryapplication
detailsObj.pinswg_confirmrequesttovaryapplication,
)
? formatDates(
detailsObj.pinswg_confirmrequesttovaryapplication
detailsObj.pinswg_confirmrequesttovaryapplication,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
@@ -729,33 +705,33 @@ const Pinswg_dnsid = (props) => {
))}
{_.has(
detailsObj,
"pinswg_rejectrequesttovaryapplication"
"pinswg_rejectrequesttovaryapplication",
) &&
!_.isEmpty(
detailsObj.pinswg_rejectrequesttovaryapplication
detailsObj.pinswg_rejectrequesttovaryapplication,
) &&
(_.has(
detailsObj,
"pinswg_confirmrequesttovaryapplication"
"pinswg_confirmrequesttovaryapplication",
) &&
_.isEmpty(
detailsObj.pinswg_confirmrequesttovaryapplication
detailsObj.pinswg_confirmrequesttovaryapplication,
) ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-reject-request-to-vary-application"
"case:summary-reject-request-to-vary-application",
)}
</dt>
<dd className="govuk-summary-list__value">
{!_.isEmpty(
detailsObj.pinswg_rejectrequesttovaryapplication
detailsObj.pinswg_rejectrequesttovaryapplication,
)
? formatDates(
detailsObj.pinswg_rejectrequesttovaryapplication
detailsObj.pinswg_rejectrequesttovaryapplication,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
@@ -764,26 +740,26 @@ const Pinswg_dnsid = (props) => {
))}
{_.has(
detailsObj,
"pinswg_suspensionstartdates"
"pinswg_suspensionstartdates",
) &&
!_.isEmpty(
detailsObj.pinswg_suspensionstartdates
detailsObj.pinswg_suspensionstartdates,
) && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-suspension-start-dates"
"case:summary-suspension-start-dates",
)}
</dt>
<dd className="govuk-summary-list__value">
{!_.isEmpty(
detailsObj.pinswg_suspensionstartdates
detailsObj.pinswg_suspensionstartdates,
)
? formatDates(
detailsObj.pinswg_suspensionstartdates
detailsObj.pinswg_suspensionstartdates,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
@@ -792,25 +768,25 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-suspension-end-dates"
"case:summary-suspension-end-dates",
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_suspensionenddates"
"pinswg_suspensionenddates",
)
? !_.isEmpty(
detailsObj.pinswg_suspensionenddates
detailsObj.pinswg_suspensionenddates,
)
? formatDates(
detailsObj.pinswg_suspensionenddates
detailsObj.pinswg_suspensionenddates,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
@@ -821,19 +797,19 @@ const Pinswg_dnsid = (props) => {
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_reportdueby"
"pinswg_reportdueby",
)
? !_.isEmpty(
detailsObj.pinswg_reportdueby
detailsObj.pinswg_reportdueby,
)
? formatDates(
detailsObj.pinswg_reportdueby
detailsObj.pinswg_reportdueby,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
@@ -863,50 +839,50 @@ const Pinswg_dnsid = (props) => {
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inspector-report-submission-to-welsh-government"
"case:summary-inspector-report-submission-to-welsh-government",
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_inspectorreportsubmittedtowelshgovernment"
"pinswg_inspectorreportsubmittedtowelshgovernment",
)
? !_.isEmpty(
detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment
detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment,
)
? formatDates(
detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment
detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
{_.has(
detailsObj,
"pinswg_withdrawndate"
"pinswg_withdrawndate",
) &&
!_.isEmpty(
detailsObj.pinswg_withdrawndate
detailsObj.pinswg_withdrawndate,
) && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-withdrawn-date"
"case:summary-withdrawn-date",
)}
</dt>
<dd className="govuk-summary-list__value">
{!_.isEmpty(
detailsObj.pinswg_withdrawndate
detailsObj.pinswg_withdrawndate,
)
? formatDates(
detailsObj.pinswg_withdrawndate
detailsObj.pinswg_withdrawndate,
)
: t(
"case:summary-awaiting-information-label"
"case:summary-awaiting-information-label",
)}
</dd>
</div>
+19 -19
View File
@@ -100,7 +100,7 @@ export const getSearchDetails = async (searchResultsObj) => {
searchResultsObj = searchResultsObj.value;
const detailsObj = searchResultsObj.map((searchDetail, index) => {
let formMeta = getFormCollectionByID(
searchDetail.pinswg_appealcasetype
searchDetail.pinswg_appealcasetype,
);
// console.log(
// "------------------- Details: ",
@@ -117,11 +117,11 @@ export const getSearchDetails = async (searchResultsObj) => {
"pinswg_dnses",
searchDetail.title,
"pinswg_dnsid",
searchDetail.incidentid
searchDetail.incidentid,
) || {
"@odata.count": 1,
"value": [{ "title": searchDetail.title }],
}
},
);
} else {
// formMeta?.LogicalCollectionName &&
@@ -131,11 +131,11 @@ export const getSearchDetails = async (searchResultsObj) => {
formMeta.LogicalCollectionName,
searchDetail.title,
formMeta.PrimaryIdAttribute,
searchDetail.incidentid
searchDetail.incidentid,
) || {
"@odata.count": 1,
"value": [{ "title": searchDetail.title }],
}
},
);
}
});
@@ -159,7 +159,7 @@ export const getPartSavedDetails = (searchResultsObj) => {
console.log(searchDetail.title);
} else {
let formMeta = getFormCollectionByID(
searchDetail.pinswg_appealcasetype
searchDetail.pinswg_appealcasetype,
);
// console.log(formMeta);
detailsArr.push(
@@ -167,8 +167,8 @@ export const getPartSavedDetails = (searchResultsObj) => {
formMeta.LogicalCollectionName,
searchDetail.title,
formMeta.PrimaryIdAttribute,
searchDetail.incidentid
)
searchDetail.incidentid,
),
);
}
});
@@ -307,7 +307,7 @@ export const getSearchDetailsPaged = async (searchResultsObj) => {
formMeta.LogicalCollectionName, // appealTypeName
null, // caseReference is no longer used in batch
formMeta.PrimaryIdAttribute, // primaryIdAttribute
incidentIDs // pass array of incidentIDs
incidentIDs, // pass array of incidentIDs
);
allDetails.push(...details);
@@ -323,7 +323,7 @@ export const getProgressObj = (
formObjXML,
titleList,
mandatoryFieldsData,
props
props,
) => {
const parser = new DOMParser();
const BuildFormObj = (formObjXML) => {
@@ -336,7 +336,7 @@ export const getProgressObj = (
"//tabs/tab[" +
(index + 1) +
"]//rows/row/control[not(@parentField)]/..",
doc
doc,
);
return BuildRowObj(sectionXML, titleList[key].value);
@@ -376,7 +376,7 @@ export const getProgressObj = (
0) ||
(_.has(props.props.form.appealForm, "values") &&
Object.keys(
props.props.form.appealForm.values
props.props.form.appealForm.values,
).filter((k) => k.startsWith("pinswg_fileUpload"))
.length > 0)
: rowCount == formObj[key].fieldsTotal,
@@ -401,17 +401,17 @@ export const getProgressObj = (
var parentFieldShowOnValue = xpath.select(
"//@parentFieldShowOnValue",
doc
doc,
);
var requiredDocumentValue = xpath.select(
"//@requiredDocumentValue",
doc
doc,
);
var requiredDocumentLabel = xpath.select(
"//@requiredDocumentLabel",
doc
doc,
);
var hint = xpath.select("//label/@hint", doc);
@@ -616,7 +616,7 @@ export const getDetailsProxy = (resultsObj, detailsType) => {
? searchDetail.ticketnumber
: searchDetail[
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]
],
);
} else {
detailsArr.push(
@@ -627,8 +627,8 @@ export const getDetailsProxy = (resultsObj, detailsType) => {
? searchDetail.ticketnumber
: searchDetail[
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]
)
],
),
);
}
});
@@ -700,7 +700,7 @@ export const updateLinks = (jsonObj) => {
// Before the URL
if (match.index > lastIndex) {
newNodeContent.push(
currentText.slice(lastIndex, match.index)
currentText.slice(lastIndex, match.index),
);
}