diff --git a/components/case/summaryTypes/pinswg_commonlandid.js b/components/case/summaryTypes/pinswg_commonlandid.js index 98bdc6ec..4bee1976 100644 --- a/components/case/summaryTypes/pinswg_commonlandid.js +++ b/components/case/summaryTypes/pinswg_commonlandid.js @@ -188,6 +188,26 @@ const Pinswg_commonlandid = (props) => { ) : ( "" )} +
+
+ {t( + "case:summary-case-relevant-authoritylabel" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_relevantauthorityname + + '")].value_cy' + ) + : detailsObj.pinswg_relevantauthorityname || + t( + "case:summary-no-date-entered-label" + )} +
+
diff --git a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js index cf3fbca1..f49d2767 100644 --- a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js +++ b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js @@ -170,6 +170,26 @@ const Pinswg_compulsorypurchaseordersid = (props) => { ) : ( "" )} +
+
+ {t( + "case:summary-case-relevant-authoritylabel" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_relevantauthorityname + + '")].value_cy' + ) + : detailsObj.pinswg_relevantauthorityname || + t( + "case:summary-no-date-entered-label" + )} +
+
diff --git a/components/case/summaryTypes/pinswg_dnsid.js b/components/case/summaryTypes/pinswg_dnsid.js index e8ee01d2..56dac0a0 100644 --- a/components/case/summaryTypes/pinswg_dnsid.js +++ b/components/case/summaryTypes/pinswg_dnsid.js @@ -11,247 +11,791 @@ const Pinswg_dnsid = (props) => { const router = useRouter(); const { locale } = router; return ( -
-
-
-
-
-

- {t("case:summary-case-details-label")} -

+ <> +
+
+
+

+ {t("case:summary-project-details-label")} +

+

+ {router.locale == "cy" + ? detailsObj.pinswg_projectdescription.split( + ";" + )[1] + : detailsObj.pinswg_projectdescription.split( + ";" + )[0]} +

-
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-case-officer-label")} -
-
- {" "} - {/* {casesObj.caseDetails.caseOfficer || +

+ {" "} + {router.locale == "cy" + ? detailsObj.pinswg_projectlocation.split( + ";" + )[1] + : detailsObj.pinswg_projectlocation.split( + ";" + )[0]} +

+
+
+
+
+
+
+
+
+

+ {t("case:summary-case-details-label")} +

+ +
+
+
+ {t("case:summary-case-type-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-lpa-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
+
+
+ {t( + "case:summary-case-officer-label" + )} +
+
+ {" "} + {/* {casesObj.caseDetails.caseOfficer || ""} */} - {_.has(casesObj, "_ownerid_value") - ? casesObj[ - "_ownerid_value@OData.Community.Display.V1.FormattedValue" - ] - : ""} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} + {_.has(casesObj, "_ownerid_value") + ? casesObj[ + "_ownerid_value@OData.Community.Display.V1.FormattedValue" + ] + : ""} +
+
+
+
+ {t("case:summary-procedure-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
+
+
+ {t("case:summary-status-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-date-entered-label" + )} -
- {/* +
+ {/* {casesObj.caseDetails .outcome_document || ""} */} -
-
-
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- {casesObj.numberofchildincidents > 0 ? ( + +
{t( - "case:summary-linked-cases-label" + "case:summary-case-link-status-label" )}
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} + {_.has(casesObj, [ + "numberofchildincidents", + ]) + ? casesObj.numberofchildincidents > + 0 + ? t( + "case:summary-case-link-status-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + )}
- ) : ( - "" - )} - + {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t( + "case:summary-linked-cases-label" + )} +
+
+ {linkedCasesList( + props.currentView + .linkedCaseReferences + )} +
+
+ ) : ( + "" + )} +
+
+ {t( + "case:summary-case-recommendation-label" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_recommendation + + '")].value_cy' + ) + : detailsObj.pinswg_recommendation || + t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-case-website-label" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_webaddress + + '")].value_cy' + ) + : detailsObj.pinswg_webaddress || + t( + "case:summary-no-date-entered-label" + )} +
+
+ +
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( +
+
+
+

+ {t("case:summary-dates-label")} +

+
+
+
+ {t("case:summary-event-date-label")} +
+
+ {_.has( + detailsObj, + "pinswg_dateeventrequested" + ) + ? !_.isEmpty( detailsObj.pinswg_dateeventrequested ) + ? formatDates( + detailsObj.pinswg_dateeventrequested + ) + : t( + "case:summary-no-date-entered-label" + ) : t( "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( + )} +
+
+
+
+ {t( + "case:summary-decision-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_casedecisiondate" + ) + ? !_.isEmpty( detailsObj.pinswg_casedecisiondate ) + ? formatDates( + detailsObj.pinswg_casedecisiondate + ) + : t( + "case:summary-no-date-entered-label" + ) : t( "case:summary-no-date-entered-label" + )} +
+
+ +
+
+ {t( + "case:summary-application-accepted-as-valid" + )} +
+
+ {_.has( + detailsObj, + "pinswg_applicationacceptedasvalid" + ) + ? !_.isEmpty( + detailsObj.pinswg_applicationacceptedasvalid ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
+ ? formatDates( + detailsObj.pinswg_applicationacceptedasvalid + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-application-rejected-as-invalid" + )} +
+
+ {_.has( + detailsObj, + "pinswg_applicationrejectedasinvalid" + ) + ? !_.isEmpty( + detailsObj.pinswg_applicationrejectedasinvalid + ) + ? formatDates( + detailsObj.pinswg_applicationrejectedasinvalid + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-confirm-request-to-vary-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_confirmrequesttovaryapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_confirmrequesttovaryapplication + ) + ? formatDates( + detailsObj.pinswg_confirmrequesttovaryapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-decisions" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofdecision" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofdecision + ) + ? formatDates( + detailsObj.pinswg_dateofdecision + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-request-to-vary" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofrequesttovarytheapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofrequesttovarytheapplication + ) + ? formatDates( + detailsObj.pinswg_dateofrequesttovarytheapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-submission-of-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofsubmissionofapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofsubmissionofapplication + ) + ? formatDates( + detailsObj.pinswg_dateofsubmissionofapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-project-published-to-website" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateprojectpublishedonwebsite" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateprojectpublishedonwebsite + ) + ? formatDates( + detailsObj.pinswg_dateprojectpublishedonwebsite + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-deadline-for-submission-of-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_deadlineforsubmissionofapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_deadlineforsubmissionofapplication + ) + ? formatDates( + detailsObj.pinswg_deadlineforsubmissionofapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-end-of-representation-period" + )} +
+
+ {_.has( + detailsObj, + "pinswg_endofrepresentationperiod" + ) + ? !_.isEmpty( + detailsObj.pinswg_endofrepresentationperiod + ) + ? formatDates( + detailsObj.pinswg_endofrepresentationperiod + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-inspector-report-submission-to-welsh-government" + )} +
+
+ {_.has( + detailsObj, + "pinswg_inspectorreportsubmittedtowelshgovernment" + ) + ? !_.isEmpty( + detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment + ) + ? formatDates( + detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-procedure-confirmed" + )} +
+
+ {_.has( + detailsObj, + "pinswg_procedureconfirmed" + ) + ? !_.isEmpty( + detailsObj.pinswg_procedureconfirmed + ) + ? formatDates( + detailsObj.pinswg_procedureconfirmed + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-reject-request-to-vary-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_rejectrequesttovaryapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_rejectrequesttovaryapplication + ) + ? formatDates( + detailsObj.pinswg_rejectrequesttovaryapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-report-due-by")} +
+
+ {_.has( + detailsObj, + "pinswg_reportdueby" + ) + ? !_.isEmpty( + detailsObj.pinswg_reportdueby + ) + ? formatDates( + detailsObj.pinswg_reportdueby + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-suspension-dates")} +
+
+ {_.has( + detailsObj, + "pinswg_suspensiondates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensiondates + ) + ? formatDates( + detailsObj.pinswg_suspensiondates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-suspension-end-dates" + )} +
+
+ {_.has( + detailsObj, + "pinswg_suspensionenddates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensionenddates + ) + ? formatDates( + detailsObj.pinswg_suspensionenddates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-suspension-start-dates" + )} +
+
+ {_.has( + detailsObj, + "pinswg_suspensionstartdates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensionstartdates + ) + ? formatDates( + detailsObj.pinswg_suspensionstartdates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-valid-notice-of-intention-to-submit-an-application" + )} +
{" "} +
+ {_.has( + detailsObj, + "pinswg_validnoticeofintentiontosubmitanapplicati" + ) + ? !_.isEmpty( + detailsObj.pinswg_validnoticeofintentiontosubmitanapplicati + ) + ? formatDates( + detailsObj.pinswg_validnoticeofintentiontosubmitanapplicati + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-withdrawn-date")} +
+
+ {_.has( + detailsObj, + "pinswg_withdrawndate" + ) + ? !_.isEmpty( + detailsObj.pinswg_withdrawndate + ) + ? formatDates( + detailsObj.pinswg_withdrawndate + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-written-acceptance-of-notice" + )} +
+
+ {_.has( + detailsObj, + "pinswg_writtenacceptanceofnotification" + ) + ? !_.isEmpty( + detailsObj.pinswg_writtenacceptanceofnotification + ) + ? formatDates( + detailsObj.pinswg_writtenacceptanceofnotification + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
-
+ ); }; diff --git a/components/case/summaryTypes/pinswg_electricityactid.js b/components/case/summaryTypes/pinswg_electricityactid.js index 68a7a70b..ab3d6082 100644 --- a/components/case/summaryTypes/pinswg_electricityactid.js +++ b/components/case/summaryTypes/pinswg_electricityactid.js @@ -11,422 +11,791 @@ const Pinswg_electricityactid = (props) => { const router = useRouter(); const { locale } = router; return ( -
-
-
-
-
-

- {t("case:summary-case-details-label")} -

+ <> +
+
+
+

+ {t("case:summary-project-details-label")} +

+

+ {router.locale == "cy" + ? detailsObj.pinswg_projectdescription.split( + ";" + )[1] + : detailsObj.pinswg_projectdescription.split( + ";" + )[0]} +

-
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-case-officer-label")} -
-
- {" "} - {/* {casesObj.caseDetails.caseOfficer || - ""} */} - {_.has(casesObj, "_ownerid_value") - ? casesObj[ - "_ownerid_value@OData.Community.Display.V1.FormattedValue" - ] - : ""} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} +

+ {" "} + {router.locale == "cy" + ? detailsObj.pinswg_projectlocation.split( + ";" + )[1] + : detailsObj.pinswg_projectlocation.split( + ";" + )[0]} +

+
+
+
+
+
+
+
+
+

+ {t("case:summary-case-details-label")} +

-
- {/* - - {casesObj.caseDetails - .outcome_document || ""} - - */} - -
-
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" +
+
+
+ {t("case:summary-case-type-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' ) - : t( - "case:summary-case-link-status-not-linked" + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-lpa-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- {casesObj.numberofchildincidents > 0 ? ( + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t( - "case:summary-linked-cases-label" + "case:summary-case-officer-label" )}
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} + {" "} + {/* {casesObj.caseDetails.caseOfficer || + ""} */} + {_.has(casesObj, "_ownerid_value") + ? casesObj[ + "_ownerid_value@OData.Community.Display.V1.FormattedValue" + ] + : ""}
- ) : ( - "" - )} - +
+
+ {t("case:summary-procedure-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
+
+
+ {t("case:summary-status-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-date-entered-label" + )} + +
+ {/* + + {casesObj.caseDetails + .outcome_document || ""} + + */} +
+
+
+
+ {t( + "case:summary-case-link-status-label" + )} +
+
+ {_.has(casesObj, [ + "numberofchildincidents", + ]) + ? casesObj.numberofchildincidents > + 0 + ? t( + "case:summary-case-link-status-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + )} +
+
+ {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t( + "case:summary-linked-cases-label" + )} +
+
+ {linkedCasesList( + props.currentView + .linkedCaseReferences + )} +
+
+ ) : ( + "" + )} +
+
+ {t( + "case:summary-case-recommendation-label" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_recommendation + + '")].value_cy' + ) + : detailsObj.pinswg_recommendation || + t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-case-website-label" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_webaddress + + '")].value_cy' + ) + : detailsObj.pinswg_webaddress || + t( + "case:summary-no-date-entered-label" + )} +
+
+ +
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate - ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate - ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-statement-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_statementduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_statementduedate - ) - ? formatDates( - detailsObj.pinswg_statementduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_otherpartiesstatement" - ) - ? !_.isEmpty( - detailsObj.pinswg_otherpartiesstatement - ) - ? formatDates( - detailsObj.pinswg_otherpartiesstatement - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_otherpartiesstatements" - ) - ? !_.isEmpty( - detailsObj.pinswg_otherpartiesstatements - ) - ? formatDates( - detailsObj.pinswg_otherpartiesstatements - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-applicant-final-comments-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_finalcommentsduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_finalcommentsduedate - ) - ? formatDates( - detailsObj.pinswg_finalcommentsduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( - "case:summary-inquiry-evidence-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_proofsofevidencewrittenstatementsofeviden" - ) - ? !_.isEmpty( - detailsObj.pinswg_proofsofevidencewrittenstatementsofeviden - ) - ? formatDates( - detailsObj.pinswg_proofsofevidencewrittenstatementsofeviden - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( +
+
+
+

+ {t("case:summary-dates-label")} +

+
+
+
+ {t("case:summary-event-date-label")} +
+
+ {_.has( + detailsObj, + "pinswg_dateeventrequested" + ) + ? !_.isEmpty( detailsObj.pinswg_dateeventrequested ) + ? formatDates( + detailsObj.pinswg_dateeventrequested + ) + : t( + "case:summary-no-date-entered-label" + ) : t( "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( + )} +
+
+
+
+ {t( + "case:summary-decision-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_casedecisiondate" + ) + ? !_.isEmpty( detailsObj.pinswg_casedecisiondate ) + ? formatDates( + detailsObj.pinswg_casedecisiondate + ) + : t( + "case:summary-no-date-entered-label" + ) : t( "case:summary-no-date-entered-label" + )} +
+
+ +
+
+ {t( + "case:summary-application-accepted-as-valid" + )} +
+
+ {_.has( + detailsObj, + "pinswg_applicationacceptedasvalid" + ) + ? !_.isEmpty( + detailsObj.pinswg_applicationacceptedasvalid ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
+ ? formatDates( + detailsObj.pinswg_applicationacceptedasvalid + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-application-rejected-as-invalid" + )} +
+
+ {_.has( + detailsObj, + "pinswg_applicationrejectedasinvalid" + ) + ? !_.isEmpty( + detailsObj.pinswg_applicationrejectedasinvalid + ) + ? formatDates( + detailsObj.pinswg_applicationrejectedasinvalid + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-confirm-request-to-vary-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_confirmrequesttovaryapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_confirmrequesttovaryapplication + ) + ? formatDates( + detailsObj.pinswg_confirmrequesttovaryapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-decisions" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofdecision" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofdecision + ) + ? formatDates( + detailsObj.pinswg_dateofdecision + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-request-to-vary" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofrequesttovarytheapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofrequesttovarytheapplication + ) + ? formatDates( + detailsObj.pinswg_dateofrequesttovarytheapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-submission-of-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofsubmissionofapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofsubmissionofapplication + ) + ? formatDates( + detailsObj.pinswg_dateofsubmissionofapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-project-published-to-website" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateprojectpublishedonwebsite" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateprojectpublishedonwebsite + ) + ? formatDates( + detailsObj.pinswg_dateprojectpublishedonwebsite + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-deadline-for-submission-of-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_deadlineforsubmissionofapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_deadlineforsubmissionofapplication + ) + ? formatDates( + detailsObj.pinswg_deadlineforsubmissionofapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-end-of-representation-period" + )} +
+
+ {_.has( + detailsObj, + "pinswg_endofrepresentationperiod" + ) + ? !_.isEmpty( + detailsObj.pinswg_endofrepresentationperiod + ) + ? formatDates( + detailsObj.pinswg_endofrepresentationperiod + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-inspector-report-submission-to-welsh-government" + )} +
+
+ {_.has( + detailsObj, + "pinswg_inspectorreportsubmittedtowelshgovernment" + ) + ? !_.isEmpty( + detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment + ) + ? formatDates( + detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-procedure-confirmed" + )} +
+
+ {_.has( + detailsObj, + "pinswg_procedureconfirmed" + ) + ? !_.isEmpty( + detailsObj.pinswg_procedureconfirmed + ) + ? formatDates( + detailsObj.pinswg_procedureconfirmed + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-reject-request-to-vary-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_rejectrequesttovaryapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_rejectrequesttovaryapplication + ) + ? formatDates( + detailsObj.pinswg_rejectrequesttovaryapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-report-due-by")} +
+
+ {_.has( + detailsObj, + "pinswg_reportdueby" + ) + ? !_.isEmpty( + detailsObj.pinswg_reportdueby + ) + ? formatDates( + detailsObj.pinswg_reportdueby + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-suspension-dates")} +
+
+ {_.has( + detailsObj, + "pinswg_suspensiondates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensiondates + ) + ? formatDates( + detailsObj.pinswg_suspensiondates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-suspension-end-dates" + )} +
+
+ {_.has( + detailsObj, + "pinswg_suspensionenddates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensionenddates + ) + ? formatDates( + detailsObj.pinswg_suspensionenddates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-suspension-start-dates" + )} +
+
+ {_.has( + detailsObj, + "pinswg_suspensionstartdates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensionstartdates + ) + ? formatDates( + detailsObj.pinswg_suspensionstartdates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-valid-notice-of-intention-to-submit-an-application" + )} +
{" "} +
+ {_.has( + detailsObj, + "pinswg_validnoticeofintentiontosubmitanapplicati" + ) + ? !_.isEmpty( + detailsObj.pinswg_validnoticeofintentiontosubmitanapplicati + ) + ? formatDates( + detailsObj.pinswg_validnoticeofintentiontosubmitanapplicati + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-withdrawn-date")} +
+
+ {_.has( + detailsObj, + "pinswg_withdrawndate" + ) + ? !_.isEmpty( + detailsObj.pinswg_withdrawndate + ) + ? formatDates( + detailsObj.pinswg_withdrawndate + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-written-acceptance-of-notice" + )} +
+
+ {_.has( + detailsObj, + "pinswg_writtenacceptanceofnotification" + ) + ? !_.isEmpty( + detailsObj.pinswg_writtenacceptanceofnotification + ) + ? formatDates( + detailsObj.pinswg_writtenacceptanceofnotification + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
-
+ ); }; diff --git a/components/case/summaryTypes/pinswg_environmentalpermittingid.js b/components/case/summaryTypes/pinswg_environmentalpermittingid.js index a93b454a..aeb9cbbc 100644 --- a/components/case/summaryTypes/pinswg_environmentalpermittingid.js +++ b/components/case/summaryTypes/pinswg_environmentalpermittingid.js @@ -188,6 +188,26 @@ const Pinswg_environmentalpermittingid = (props) => { ) : ( "" )} +
+
+ {t( + "case:summary-case-relevant-authoritylabel" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_relevantauthorityname + + '")].value_cy' + ) + : detailsObj.pinswg_relevantauthorityname || + t( + "case:summary-no-date-entered-label" + )} +
+
diff --git a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js index 8c0256b0..9f8eef3c 100644 --- a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js +++ b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js @@ -11,422 +11,791 @@ const Pinswg_harbourrevisionorderid = (props) => { const router = useRouter(); const { locale } = router; return ( -
-
-
-
-
-

- {t("case:summary-case-details-label")} -

+ <> +
+
+
+

+ {t("case:summary-project-details-label")} +

+

+ {router.locale == "cy" + ? detailsObj.pinswg_projectdescription.split( + ";" + )[1] + : detailsObj.pinswg_projectdescription.split( + ";" + )[0]} +

-
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-case-officer-label")} -
-
- {" "} - {/* {casesObj.caseDetails.caseOfficer || - ""} */} - {_.has(casesObj, "_ownerid_value") - ? casesObj[ - "_ownerid_value@OData.Community.Display.V1.FormattedValue" - ] - : ""} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} +

+ {" "} + {router.locale == "cy" + ? detailsObj.pinswg_projectlocation.split( + ";" + )[1] + : detailsObj.pinswg_projectlocation.split( + ";" + )[0]} +

+
+
+
+
+
+
+
+
+

+ {t("case:summary-case-details-label")} +

-
- {/* - - {casesObj.caseDetails - .outcome_document || ""} - - */} - -
-
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" +
+
+
+ {t("case:summary-case-type-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' ) - : t( - "case:summary-case-link-status-not-linked" + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-lpa-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- {casesObj.numberofchildincidents > 0 ? ( + : casesObj[ + "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t( - "case:summary-linked-cases-label" + "case:summary-case-officer-label" )}
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} + {" "} + {/* {casesObj.caseDetails.caseOfficer || + ""} */} + {_.has(casesObj, "_ownerid_value") + ? casesObj[ + "_ownerid_value@OData.Community.Display.V1.FormattedValue" + ] + : ""}
- ) : ( - "" - )} - +
+
+ {t("case:summary-procedure-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_procedure@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
+
+
+ {t("case:summary-status-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : casesObj[ + "statuscode@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-decision-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_decision@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-date-entered-label" + )} + +
+ {/* + + {casesObj.caseDetails + .outcome_document || ""} + + */} +
+
+
+
+ {t( + "case:summary-case-link-status-label" + )} +
+
+ {_.has(casesObj, [ + "numberofchildincidents", + ]) + ? casesObj.numberofchildincidents > + 0 + ? t( + "case:summary-case-link-status-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + ) + : t( + "case:summary-case-link-status-not-linked" + )} +
+
+ {casesObj.numberofchildincidents > 0 ? ( +
+
+ {t( + "case:summary-linked-cases-label" + )} +
+
+ {linkedCasesList( + props.currentView + .linkedCaseReferences + )} +
+
+ ) : ( + "" + )} +
+
+ {t( + "case:summary-case-recommendation-label" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_recommendation + + '")].value_cy' + ) + : detailsObj.pinswg_recommendation || + t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-case-website-label" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_webaddress + + '")].value_cy' + ) + : detailsObj.pinswg_webaddress || + t( + "case:summary-no-date-entered-label" + )} +
+
+ +
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate - ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate - ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-statement-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_statementduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_statementduedate - ) - ? formatDates( - detailsObj.pinswg_statementduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_otherpartiesstatement" - ) - ? !_.isEmpty( - detailsObj.pinswg_otherpartiesstatement - ) - ? formatDates( - detailsObj.pinswg_otherpartiesstatement - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_otherpartiesstatements" - ) - ? !_.isEmpty( - detailsObj.pinswg_otherpartiesstatements - ) - ? formatDates( - detailsObj.pinswg_otherpartiesstatements - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-applicant-final-comments-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_finalcommentsduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_finalcommentsduedate - ) - ? formatDates( - detailsObj.pinswg_finalcommentsduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( - "case:summary-inquiry-evidence-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_proofsofevidencewrittenstatementsofeviden" - ) - ? !_.isEmpty( - detailsObj.pinswg_proofsofevidencewrittenstatementsofeviden - ) - ? formatDates( - detailsObj.pinswg_proofsofevidencewrittenstatementsofeviden - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( +
+
+
+

+ {t("case:summary-dates-label")} +

+
+
+
+ {t("case:summary-event-date-label")} +
+
+ {_.has( + detailsObj, + "pinswg_dateeventrequested" + ) + ? !_.isEmpty( detailsObj.pinswg_dateeventrequested ) + ? formatDates( + detailsObj.pinswg_dateeventrequested + ) + : t( + "case:summary-no-date-entered-label" + ) : t( "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( + )} +
+
+
+
+ {t( + "case:summary-decision-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_casedecisiondate" + ) + ? !_.isEmpty( detailsObj.pinswg_casedecisiondate ) + ? formatDates( + detailsObj.pinswg_casedecisiondate + ) + : t( + "case:summary-no-date-entered-label" + ) : t( "case:summary-no-date-entered-label" + )} +
+
+ +
+
+ {t( + "case:summary-application-accepted-as-valid" + )} +
+
+ {_.has( + detailsObj, + "pinswg_applicationacceptedasvalid" + ) + ? !_.isEmpty( + detailsObj.pinswg_applicationacceptedasvalid ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
+ ? formatDates( + detailsObj.pinswg_applicationacceptedasvalid + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-application-rejected-as-invalid" + )} +
+
+ {_.has( + detailsObj, + "pinswg_applicationrejectedasinvalid" + ) + ? !_.isEmpty( + detailsObj.pinswg_applicationrejectedasinvalid + ) + ? formatDates( + detailsObj.pinswg_applicationrejectedasinvalid + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-confirm-request-to-vary-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_confirmrequesttovaryapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_confirmrequesttovaryapplication + ) + ? formatDates( + detailsObj.pinswg_confirmrequesttovaryapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-decisions" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofdecision" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofdecision + ) + ? formatDates( + detailsObj.pinswg_dateofdecision + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-request-to-vary" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofrequesttovarytheapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofrequesttovarytheapplication + ) + ? formatDates( + detailsObj.pinswg_dateofrequesttovarytheapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-submission-of-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofsubmissionofapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofsubmissionofapplication + ) + ? formatDates( + detailsObj.pinswg_dateofsubmissionofapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-project-published-to-website" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateprojectpublishedonwebsite" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateprojectpublishedonwebsite + ) + ? formatDates( + detailsObj.pinswg_dateprojectpublishedonwebsite + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-deadline-for-submission-of-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_deadlineforsubmissionofapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_deadlineforsubmissionofapplication + ) + ? formatDates( + detailsObj.pinswg_deadlineforsubmissionofapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-end-of-representation-period" + )} +
+
+ {_.has( + detailsObj, + "pinswg_endofrepresentationperiod" + ) + ? !_.isEmpty( + detailsObj.pinswg_endofrepresentationperiod + ) + ? formatDates( + detailsObj.pinswg_endofrepresentationperiod + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-inspector-report-submission-to-welsh-government" + )} +
+
+ {_.has( + detailsObj, + "pinswg_inspectorreportsubmittedtowelshgovernment" + ) + ? !_.isEmpty( + detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment + ) + ? formatDates( + detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-procedure-confirmed" + )} +
+
+ {_.has( + detailsObj, + "pinswg_procedureconfirmed" + ) + ? !_.isEmpty( + detailsObj.pinswg_procedureconfirmed + ) + ? formatDates( + detailsObj.pinswg_procedureconfirmed + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-reject-request-to-vary-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_rejectrequesttovaryapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_rejectrequesttovaryapplication + ) + ? formatDates( + detailsObj.pinswg_rejectrequesttovaryapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-report-due-by")} +
+
+ {_.has( + detailsObj, + "pinswg_reportdueby" + ) + ? !_.isEmpty( + detailsObj.pinswg_reportdueby + ) + ? formatDates( + detailsObj.pinswg_reportdueby + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-suspension-dates")} +
+
+ {_.has( + detailsObj, + "pinswg_suspensiondates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensiondates + ) + ? formatDates( + detailsObj.pinswg_suspensiondates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-suspension-end-dates" + )} +
+
+ {_.has( + detailsObj, + "pinswg_suspensionenddates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensionenddates + ) + ? formatDates( + detailsObj.pinswg_suspensionenddates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-suspension-start-dates" + )} +
+
+ {_.has( + detailsObj, + "pinswg_suspensionstartdates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensionstartdates + ) + ? formatDates( + detailsObj.pinswg_suspensionstartdates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-valid-notice-of-intention-to-submit-an-application" + )} +
{" "} +
+ {_.has( + detailsObj, + "pinswg_validnoticeofintentiontosubmitanapplicati" + ) + ? !_.isEmpty( + detailsObj.pinswg_validnoticeofintentiontosubmitanapplicati + ) + ? formatDates( + detailsObj.pinswg_validnoticeofintentiontosubmitanapplicati + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-withdrawn-date")} +
+
+ {_.has( + detailsObj, + "pinswg_withdrawndate" + ) + ? !_.isEmpty( + detailsObj.pinswg_withdrawndate + ) + ? formatDates( + detailsObj.pinswg_withdrawndate + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-written-acceptance-of-notice" + )} +
+
+ {_.has( + detailsObj, + "pinswg_writtenacceptanceofnotification" + ) + ? !_.isEmpty( + detailsObj.pinswg_writtenacceptanceofnotification + ) + ? formatDates( + detailsObj.pinswg_writtenacceptanceofnotification + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
-
+ ); }; diff --git a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js index fd460043..8b91aae1 100644 --- a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js +++ b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js @@ -188,6 +188,26 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { ) : ( "" )} +
+
+ {t( + "case:summary-case-relevant-authoritylabel" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_relevantauthorityname + + '")].value_cy' + ) + : detailsObj.pinswg_relevantauthorityname || + t( + "case:summary-no-date-entered-label" + )} +
+
diff --git a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js index 5674543f..31b64f85 100644 --- a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js +++ b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js @@ -188,6 +188,26 @@ const Pinswg_miscellaneouscasewordid = (props) => { ) : ( "" )} +
+
+ {t( + "case:summary-case-relevant-authoritylabel" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_relevantauthorityname + + '")].value_cy' + ) + : detailsObj.pinswg_relevantauthorityname || + t( + "case:summary-no-date-entered-label" + )} +
+
diff --git a/components/case/summaryTypes/pinswg_rowid.js b/components/case/summaryTypes/pinswg_rowid.js index ebb61f86..786861ae 100644 --- a/components/case/summaryTypes/pinswg_rowid.js +++ b/components/case/summaryTypes/pinswg_rowid.js @@ -188,6 +188,26 @@ const Pinswg_rowid = (props) => { ) : ( "" )} +
+
+ {t( + "case:summary-case-relevant-authoritylabel" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_relevantauthorityname + + '")].value_cy' + ) + : detailsObj.pinswg_relevantauthorityname || + t( + "case:summary-no-date-entered-label" + )} +
+
diff --git a/components/case/summaryTypes/pinswg_transportandworkactid.js b/components/case/summaryTypes/pinswg_transportandworkactid.js index 29bad0f6..cc264083 100644 --- a/components/case/summaryTypes/pinswg_transportandworkactid.js +++ b/components/case/summaryTypes/pinswg_transportandworkactid.js @@ -11,422 +11,645 @@ const Pinswg_transportandworkactid = (props) => { const router = useRouter(); const { locale } = router; return ( -
-
-
-
-
-

- {t("case:summary-case-details-label")} -

+ <> +
+
+
+

+ {t("case:summary-project-details-label")} +

+

+ {router.locale == "cy" + ? detailsObj.pinswg_projectdescription.split( + ";" + )[1] + : detailsObj.pinswg_projectdescription.split( + ";" + )[0]} +

-
-
-
- {t("case:summary-case-type-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-lpa-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-case-officer-label")} -
-
- {" "} - {/* {casesObj.caseDetails.caseOfficer || - ""} */} - {_.has(casesObj, "_ownerid_value") - ? casesObj[ - "_ownerid_value@OData.Community.Display.V1.FormattedValue" - ] - : ""} -
-
-
-
- {t("case:summary-procedure-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : detailsObj[ - "pinswg_procedure@OData.Community.Display.V1.FormattedValue" - ] || ""} -
-
-
-
- {t("case:summary-status-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : casesObj[ - "statuscode@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-decision-label")} -
-
- {router.locale == "cy" - ? jsonpath.query( - transLookup, - '$..[?(@.value=="' + - detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] + - '")].value_cy' - ) - : detailsObj[ - "pinswg_decision@OData.Community.Display.V1.FormattedValue" - ] || - t( - "case:summary-no-date-entered-label" - )} +

+ {" "} + {router.locale == "cy" + ? detailsObj.pinswg_projectlocation.split( + ";" + )[1] + : detailsObj.pinswg_projectlocation.split( + ";" + )[0]} +

+
+
+
+
+
+
+
+
+

+ {t("case:summary-case-details-label")} +

-
- {/* - - {casesObj.caseDetails - .outcome_document || ""} - - */} - -
-
-
- {t( - "case:summary-case-link-status-label" - )} -
-
- {_.has(casesObj, [ - "numberofchildincidents", - ]) - ? casesObj.numberofchildincidents > - 0 - ? t( - "case:summary-case-link-status-linked" +
+
+
+ {t("case:summary-case-type-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' ) - : t( - "case:summary-case-link-status-not-linked" - ) - : t( - "case:summary-case-link-status-not-linked" - )} -
-
- {casesObj.numberofchildincidents > 0 ? ( + : casesObj[ + "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue" + ] || + t( + "case:summary-no-date-entered-label" + )} +
+
+
{t( - "case:summary-linked-cases-label" + "case:summary-case-recommendation-label" )}
- {linkedCasesList( - props.currentView - .linkedCaseReferences - )} + {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_recommendation + + '")].value_cy' + ) + : detailsObj.pinswg_recommendation || + t( + "case:summary-no-date-entered-label" + )}
- ) : ( - "" - )} - +
+
+ {t( + "case:summary-case-website-label" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_webaddress + + '")].value_cy' + ) + : detailsObj.pinswg_webaddress || + t( + "case:summary-no-date-entered-label" + )} +
+
+ +
-
-
-
-
-

- {t("case:summary-dates-label")} -

-
-
-
- {t("case:summary-start-date-label")} -
-
- {_.has(detailsObj, "pinswg_startdate") - ? !_.isEmpty( - detailsObj.pinswg_startdate - ) - ? formatDates( - detailsObj.pinswg_startdate - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_startdates" - ) - ? !_.isEmpty( - detailsObj.pinswg_startdates - ) - ? formatDates( - detailsObj.pinswg_startdates - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-questionnaire-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_questionnaireduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_questionnaireduedate - ) - ? formatDates( - detailsObj.pinswg_questionnaireduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-statement-due-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_statementduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_statementduedate - ) - ? formatDates( - detailsObj.pinswg_statementduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-interested-party-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_otherpartiesstatement" - ) - ? !_.isEmpty( - detailsObj.pinswg_otherpartiesstatement - ) - ? formatDates( - detailsObj.pinswg_otherpartiesstatement - ) - : t( - "case:summary-no-date-entered-label" - ) - : _.has( - detailsObj, - "pinswg_otherpartiesstatements" - ) - ? !_.isEmpty( - detailsObj.pinswg_otherpartiesstatements - ) - ? formatDates( - detailsObj.pinswg_otherpartiesstatements - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t( - "case:summary-applicant-final-comments-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_finalcommentsduedate" - ) - ? !_.isEmpty( - detailsObj.pinswg_finalcommentsduedate - ) - ? formatDates( - detailsObj.pinswg_finalcommentsduedate - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t( - "case:summary-inquiry-evidence-date-label" - )} -
-
- {_.has( - detailsObj, - "pinswg_proofsofevidencewrittenstatementsofeviden" - ) - ? !_.isEmpty( - detailsObj.pinswg_proofsofevidencewrittenstatementsofeviden - ) - ? formatDates( - detailsObj.pinswg_proofsofevidencewrittenstatementsofeviden - ) - : t( - "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
-
- {t("case:summary-event-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_dateeventrequested" - ) - ? !_.isEmpty( - detailsObj.pinswg_dateeventrequested - ) - ? formatDates( +
+
+
+

+ {t("case:summary-dates-label")} +

+
+
+
+ {t("case:summary-event-date-label")} +
+
+ {_.has( + detailsObj, + "pinswg_dateeventrequested" + ) + ? !_.isEmpty( detailsObj.pinswg_dateeventrequested ) + ? formatDates( + detailsObj.pinswg_dateeventrequested + ) + : t( + "case:summary-no-date-entered-label" + ) : t( "case:summary-no-date-entered-label" - ) - : t( - "case:summary-no-date-entered-label" - )} -
-
- -
-
- {t("case:summary-decision-date-label")} -
-
- {_.has( - detailsObj, - "pinswg_casedecisiondate" - ) - ? !_.isEmpty( - detailsObj.pinswg_casedecisiondate - ) - ? formatDates( + )} +
+
+
+
+ {t( + "case:summary-decision-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_casedecisiondate" + ) + ? !_.isEmpty( detailsObj.pinswg_casedecisiondate ) + ? formatDates( + detailsObj.pinswg_casedecisiondate + ) + : t( + "case:summary-no-date-entered-label" + ) : t( "case:summary-no-date-entered-label" + )} +
+
+ +
+
+ {t( + "case:summary-application-accepted-as-valid" + )} +
+
+ {_.has( + detailsObj, + "pinswg_applicationacceptedasvalid" + ) + ? !_.isEmpty( + detailsObj.pinswg_applicationacceptedasvalid ) - : t( - "case:summary-no-date-entered-label" - )} -
-
-
+ ? formatDates( + detailsObj.pinswg_applicationacceptedasvalid + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-application-rejected-as-invalid" + )} +
+
+ {_.has( + detailsObj, + "pinswg_applicationrejectedasinvalid" + ) + ? !_.isEmpty( + detailsObj.pinswg_applicationrejectedasinvalid + ) + ? formatDates( + detailsObj.pinswg_applicationrejectedasinvalid + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-confirm-request-to-vary-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_confirmrequesttovaryapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_confirmrequesttovaryapplication + ) + ? formatDates( + detailsObj.pinswg_confirmrequesttovaryapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-decisions" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofdecision" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofdecision + ) + ? formatDates( + detailsObj.pinswg_dateofdecision + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-request-to-vary" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofrequesttovarytheapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofrequesttovarytheapplication + ) + ? formatDates( + detailsObj.pinswg_dateofrequesttovarytheapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-of-submission-of-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateofsubmissionofapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateofsubmissionofapplication + ) + ? formatDates( + detailsObj.pinswg_dateofsubmissionofapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-date-project-published-to-website" + )} +
+
+ {_.has( + detailsObj, + "pinswg_dateprojectpublishedonwebsite" + ) + ? !_.isEmpty( + detailsObj.pinswg_dateprojectpublishedonwebsite + ) + ? formatDates( + detailsObj.pinswg_dateprojectpublishedonwebsite + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-deadline-for-submission-of-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_deadlineforsubmissionofapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_deadlineforsubmissionofapplication + ) + ? formatDates( + detailsObj.pinswg_deadlineforsubmissionofapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-end-of-representation-period" + )} +
+
+ {_.has( + detailsObj, + "pinswg_endofrepresentationperiod" + ) + ? !_.isEmpty( + detailsObj.pinswg_endofrepresentationperiod + ) + ? formatDates( + detailsObj.pinswg_endofrepresentationperiod + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-inspector-report-submission-to-welsh-government" + )} +
+
+ {_.has( + detailsObj, + "pinswg_inspectorreportsubmittedtowelshgovernment" + ) + ? !_.isEmpty( + detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment + ) + ? formatDates( + detailsObj.pinswg_inspectorreportsubmittedtowelshgovernment + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-procedure-confirmed" + )} +
+
+ {_.has( + detailsObj, + "pinswg_procedureconfirmed" + ) + ? !_.isEmpty( + detailsObj.pinswg_procedureconfirmed + ) + ? formatDates( + detailsObj.pinswg_procedureconfirmed + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-reject-request-to-vary-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_rejectrequesttovaryapplication" + ) + ? !_.isEmpty( + detailsObj.pinswg_rejectrequesttovaryapplication + ) + ? formatDates( + detailsObj.pinswg_rejectrequesttovaryapplication + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-report-due-by")} +
+
+ {_.has( + detailsObj, + "pinswg_reportdueby" + ) + ? !_.isEmpty( + detailsObj.pinswg_reportdueby + ) + ? formatDates( + detailsObj.pinswg_reportdueby + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-suspension-dates")} +
+
+ {_.has( + detailsObj, + "pinswg_suspensiondates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensiondates + ) + ? formatDates( + detailsObj.pinswg_suspensiondates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-suspension-end-dates" + )} +
+
+ {_.has( + detailsObj, + "pinswg_suspensionenddates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensionenddates + ) + ? formatDates( + detailsObj.pinswg_suspensionenddates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-suspension-start-dates" + )} +
+
+ {_.has( + detailsObj, + "pinswg_suspensionstartdates" + ) + ? !_.isEmpty( + detailsObj.pinswg_suspensionstartdates + ) + ? formatDates( + detailsObj.pinswg_suspensionstartdates + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-valid-notice-of-intention-to-submit-an-application" + )} +
{" "} +
+ {_.has( + detailsObj, + "pinswg_validnoticeofintentiontosubmitanapplicati" + ) + ? !_.isEmpty( + detailsObj.pinswg_validnoticeofintentiontosubmitanapplicati + ) + ? formatDates( + detailsObj.pinswg_validnoticeofintentiontosubmitanapplicati + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t("case:summary-withdrawn-date")} +
+
+ {_.has( + detailsObj, + "pinswg_withdrawndate" + ) + ? !_.isEmpty( + detailsObj.pinswg_withdrawndate + ) + ? formatDates( + detailsObj.pinswg_withdrawndate + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
+ {t( + "case:summary-written-acceptance-of-notice" + )} +
+
+ {_.has( + detailsObj, + "pinswg_writtenacceptanceofnotification" + ) + ? !_.isEmpty( + detailsObj.pinswg_writtenacceptanceofnotification + ) + ? formatDates( + detailsObj.pinswg_writtenacceptanceofnotification + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
+
+
-
+ ); }; diff --git a/components/case/summaryTypes/pinswg_wayleaveid.js b/components/case/summaryTypes/pinswg_wayleaveid.js index 734569b1..6025053f 100644 --- a/components/case/summaryTypes/pinswg_wayleaveid.js +++ b/components/case/summaryTypes/pinswg_wayleaveid.js @@ -188,6 +188,26 @@ const Pinswg_wayleaveid = (props) => { ) : ( "" )} +
+
+ {t( + "case:summary-case-relevant-authoritylabel" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj.pinswg_relevantauthorityname + + '")].value_cy' + ) + : detailsObj.pinswg_relevantauthorityname || + t( + "case:summary-no-date-entered-label" + )} +
+
diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js index fcf5a6d6..a4de89b1 100644 --- a/components/search/dnssearchresults.js +++ b/components/search/dnssearchresults.js @@ -99,6 +99,10 @@ const DNSSearchResults = (props) => { item.title, "currentType": "searchResultsObj", + "incidentid": + item.incidentid, + "appealType": + item.pinswg_appealcasetype, }); }} > diff --git a/components/search/pagination.js b/components/search/pagination.js index a2b1297c..2ac43e98 100644 --- a/components/search/pagination.js +++ b/components/search/pagination.js @@ -15,7 +15,7 @@ const PaginationControl = (props) => { const router = useRouter(); const { locale } = router; - const pagesCount = Math.ceil(searchResultsObj["@odata.count"] / 5); + const pagesCount = Math.ceil(searchResultsObj["@odata.count"] / 10); const getRange = (start, end) => { //console.log(start, end); diff --git a/locales/cy/case.json b/locales/cy/case.json index a5d6e3a7..09f99842 100644 --- a/locales/cy/case.json +++ b/locales/cy/case.json @@ -8,6 +8,7 @@ "summary-make-representation-label": "Cyflwyno cynrychiolaeth", "summary-back-button-label": "Ewch yn ôl", "summary-case-details-label": "Manylion yr Achos", + "summary-project-details-label": "Manylion y Prosiect", "summary-case-type-label": "Math o Achos", "summary-lpa-label": "Awdurdod Cynllunio Lleol", "summary-case-summary-label": "Crynodeb o'r Achos", @@ -39,5 +40,26 @@ "documents-heading-label": "Dogfennau", "documents-checking-label": "Gwirio am ddogfennau", "documents-count-label-1": "Mae yna", - "documents-count-label-2": "dogfennau" + "documents-count-label-2": "dogfennau", + "summary-application-accepted-as-valid": "Derbynnir cais fel un dilys", + "summary-application-rejected-as-invalid": "Gwrthodwyd y cais fel Ymfudwr", + "summary-confirm-request-to-vary-application": "Cadarnhewch y cais i amrywio cais", + "summary-date-of-decisions": "Dyddiad penderfyniadau", + "summary-date-of-request-to-vary": "Dyddiad y cais i amrywio", + "summary-date-of-submission-of-application": "Dyddiad cyflwyno'r cais", + "summary-date-project-published-to-website": "Dyddiad Cyhoeddi Prosiect i Wefan", + "summary-deadline-for-submission-of-application": "Dyddiad cau ar gyfer cyflwyno'r cais", + "summary-end-of-representation-period": "Diwedd y cyfnod cynrychiolaeth", + "summary-inspector-report-submission-to-welsh-government": "Cyflwyniad Adroddiad yr Arolygydd i Lywodraeth Cymru", + "summary-procedure-confirmed": "Cadarnhawyd y weithdrefn", + "summary-reject-request-to-vary-application": "Gwrthod cais i amrywio cais", + "summary-report-due-by": "Adroddiad yn ddyledus gan", + "summary-suspension-dates": "Dyddiadau Atal", + "summary-suspension-end-dates": "Dyddiadau Gorffen Atal dros dro", + "summary-suspension-start-dates": "Dyddiadau cychwyn atal dros dro", + "summary-valid-notice-of-intention-to-submit-an-application": "Hysbysiad dilys o fwriad i gyflwyno cais", + "summary-withdrawn-date": "Dyddiad tynnu'n ôl", + "summary-written-acceptance-of-notice": "Derbyniad ysgrifenedig o rybudd", + "summary-case-website-label": "Gwefan", + "summary-case-recommendation-label": "Argymhelliad" } \ No newline at end of file diff --git a/locales/en/case.json b/locales/en/case.json index 2488954e..40cffcc5 100644 --- a/locales/en/case.json +++ b/locales/en/case.json @@ -8,6 +8,7 @@ "summary-make-representation-label": "Make representation", "summary-back-button-label": "Go back", "summary-case-details-label": "Case Details", + "summary-project-details-label": "Project Details", "summary-case-type-label": "Case Type", "summary-lpa-label": "Local Planning Authority", "summary-case-summary-label": "Case Summary", @@ -39,5 +40,26 @@ "documents-heading-label": "Documents", "documents-checking-label": "Checking for documents", "documents-count-label-1": "There are", - "documents-count-label-2": "documents" + "documents-count-label-2": "documents", + "summary-application-accepted-as-valid": "Application Accepted as Valid", + "summary-application-rejected-as-invalid": "Application rejected as Invalid", + "summary-confirm-request-to-vary-application": "Confirm Request to Vary Application", + "summary-date-of-decisions": "Date of Decisions", + "summary-date-of-request-to-vary": "Date of request to Vary", + "summary-date-of-submission-of-application": "Date of submission of Application", + "summary-date-project-published-to-website": "Date Project Published to Website", + "summary-deadline-for-submission-of-application": "Deadline for submission of Application", + "summary-end-of-representation-period": "End of representation Period", + "summary-inspector-report-submission-to-welsh-government": "Inspector Report Submission to Welsh Government", + "summary-procedure-confirmed": "Procedure Confirmed", + "summary-reject-request-to-vary-application": "Reject Request to Vary Application", + "summary-report-due-by": "Report Due By", + "summary-suspension-dates": "Suspension Dates", + "summary-suspension-end-dates": "Suspension End Dates", + "summary-suspension-start-dates": "Suspension Start Dates", + "summary-valid-notice-of-intention-to-submit-an-application": "Valid Notice of intention to submit an Application", + "summary-withdrawn-date": "Withdrawn Date", + "summary-written-acceptance-of-notice": "Written Acceptance of Notice", + "summary-case-website-label": "Website", + "summary-case-recommendation-label": "Recommendation" } \ No newline at end of file diff --git a/pages/dnsdetails.js b/pages/dnsdetails.js index 7d16fb6a..ebe94a33 100644 --- a/pages/dnsdetails.js +++ b/pages/dnsdetails.js @@ -67,6 +67,9 @@ const Home = (props) => { props.currentView.caseReference.currentType } incidentid={props.currentView.caseReference.incidentid} + appealTypeID={ + props.currentView.caseReference.appealType + } />