From c5f893f91c781eaecc70ace8034cae48a629556b Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Wed, 5 Mar 2025 15:32:54 +0000 Subject: [PATCH] pre submssion details on summary --- actions/selectQueryTypes.js | 2 +- .../case/summaryTypes/pinswg_sipscase.js | 398 +++++++++++++++--- 2 files changed, 329 insertions(+), 71 deletions(-) diff --git a/actions/selectQueryTypes.js b/actions/selectQueryTypes.js index 34009b41..046abef3 100644 --- a/actions/selectQueryTypes.js +++ b/actions/selectQueryTypes.js @@ -75,7 +75,7 @@ export const getSelectQuery = (appealTypeName) => { break; case "pinswg_sipses": // return "&$select=pinswg_anticipatedgridreferenceeastingtext,pinswg_anticipatedgridreferencenorthingtext,_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_addresscounty,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_choiceofprocedure,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofdecision,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_decision,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_suspensionenddates,pinswg_suspensionstartdates,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,pinswg_casestage,_pinswg_dnsids_value,pinswg_startdateofevent,pinswg_typeofevent"; - return "&$select=pinswg_anticipatedgridreferenceeastingtext,pinswg_anticipatedgridreferencenorthingtext,_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_addresscounty,pinswg_choiceofprocedure,pinswg_decision,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,pinswg_webaddress,statuscode,pinswg_casestage,_pinswg_sipscase_value"; + return "&$select=pinswg_anticipatedgridreferenceeastingtext,pinswg_anticipatedgridreferencenorthingtext,_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_addresscounty,pinswg_choiceofprocedure,pinswg_decision,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,pinswg_webaddress,statuscode,pinswg_casestage,_pinswg_sipscase_value,pinswg_writtenacceptanceofnotification,pinswg_validnoticeofintentiontosubmit,pinswg_deadlineforsubmissionofapplication,pinswg_screeningstartdate,pinswg_eiatargetdate,pinswg_targetextended,pinswg_directionissueddate,pinswg_eiarequired,pinswg_scopingstartdate,pinswg_scopingtargetdate,pinswg_scopingtargetextended,pinswg_scopingoutcomeissueddate"; break; default: return ""; diff --git a/components/case/summaryTypes/pinswg_sipscase.js b/components/case/summaryTypes/pinswg_sipscase.js index ffe4c291..7a999a9c 100644 --- a/components/case/summaryTypes/pinswg_sipscase.js +++ b/components/case/summaryTypes/pinswg_sipscase.js @@ -37,6 +37,15 @@ const Pinswg_sipscase = (props) => { const zoom = isNaN(parseFloat(siteCoords.latitude)) ? 7 : 12; + function hasValidKey(obj, key) { + return ( + obj.hasOwnProperty(key) && + obj[key] !== null && + obj[key] !== undefined && + obj[key] !== "" + ); + } + return ( <> {detailsObj.pinswg_projectdescription != null ? ( @@ -447,85 +456,334 @@ const Pinswg_sipscase = (props) => {
-

- {t("case:summary-dates-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-dates-label")} +

+

+ Pre Submission +

+
+
+
+ {t( + "case:summary-valid-notice-of-intention-to-submit-an-application" + )} +
{" "} +
+ {_.has( + detailsObj, + "pinswg_validnoticeofintentiontosubmit" + ) + ? !_.isEmpty( + detailsObj.pinswg_validnoticeofintentiontosubmit ) + ? formatDates( + detailsObj.pinswg_validnoticeofintentiontosubmit + ) + : t( + "case:summary-awaiting-information-label" + ) : t( "case:summary-awaiting-information-label" - ) - : t( - "case:summary-awaiting-information-label" - )} -
-
*/} -
-
- {t( - "case:summary-written-acceptance-of-notice" - )} -
-
- {_.has( - detailsObj, - "pinswg_writtenacceptanceofnotification" - ) - ? !_.isEmpty( - detailsObj.pinswg_writtenacceptanceofnotification - ) - ? formatDates( + )} +
+
+
+
+ {t( + "case:summary-written-acceptance-of-notice" + )} +
+
+ {_.has( + detailsObj, + "pinswg_writtenacceptanceofnotification" + ) + ? !_.isEmpty( detailsObj.pinswg_writtenacceptanceofnotification ) + ? formatDates( + detailsObj.pinswg_writtenacceptanceofnotification + ) + : t( + "case:summary-awaiting-information-label" + ) : t( "case:summary-awaiting-information-label" - ) - : t( - "case:summary-awaiting-information-label" - )} -
-
-
-
- {t( - "case:summary-deadline-for-submission-of-application" - )} -
-
- {_.has( - detailsObj, - "pinswg_deadlineforsubmissionofapplication" - ) - ? !_.isEmpty( - detailsObj.pinswg_deadlineforsubmissionofapplication - ) - ? formatDates( + )} +
+
+
+
+ {t( + "case:summary-deadline-for-submission-of-application" + )} +
+
+ {_.has( + detailsObj, + "pinswg_deadlineforsubmissionofapplication" + ) + ? !_.isEmpty( detailsObj.pinswg_deadlineforsubmissionofapplication ) + ? formatDates( + detailsObj.pinswg_deadlineforsubmissionofapplication + ) + : t( + "case:summary-awaiting-information-label" + ) : t( "case:summary-awaiting-information-label" + )} +
+
+
+
+ +
+

+ EIA Screening +

+ +
+
+
+ Screening start date +
{" "} +
+ {_.has( + detailsObj, + "pinswg_screeningstartdate" + ) + ? !_.isEmpty( + detailsObj.pinswg_screeningstartdate ) - : t( - "case:summary-awaiting-information-label" - )} -
-
+ ? formatDates( + detailsObj.pinswg_screeningstartdate + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+
+
+
+ EIA target date +
{" "} +
+ {_.has( + detailsObj, + "pinswg_eiatargetdate" + ) + ? !_.isEmpty( + detailsObj.pinswg_eiatargetdate + ) + ? formatDates( + detailsObj.pinswg_eiatargetdate + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+
+ + {hasValidKey( + detailsObj, + "pinswg_targetextended" + ) && ( +
+
+ Target Extended +
{" "} +
+ {_.has( + detailsObj, + "pinswg_targetextended" + ) + ? !_.isEmpty( + detailsObj.pinswg_targetextended + ) + ? formatDates( + detailsObj.pinswg_targetextended + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+
+ )} +
+
+ Direction Issued Date +
{" "} +
+ {_.has( + detailsObj, + "pinswg_directionissueddate" + ) + ? !_.isEmpty( + detailsObj.pinswg_directionissueddate + ) + ? formatDates( + detailsObj.pinswg_directionissueddate + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+
+ + {hasValidKey( + detailsObj, + "pinswg_eiarequired" + ) && ( +
+
+ EIA required +
+
+ {_.has( + detailsObj, + "pinswg_eiarequired" + ) + ? detailsObj.pinswg_eiarequired + ? router.locale == + "cy" + ? "Ie" + : "Yes" + : router.locale == + "cy" + ? "Na" + : "No" + : t( + "case:summary-awaiting-information-label" + )} +
+
+ )} +
+
+
+

+ EIA Scoping +

+ +
+
+
+ Scoping Start Date +
{" "} +
+ {_.has( + detailsObj, + "pinswg_scopingstartdate" + ) + ? !_.isEmpty( + detailsObj.pinswg_scopingstartdate + ) + ? formatDates( + detailsObj.pinswg_scopingstartdate + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+
+
+
+ Scoping Target Date +
{" "} +
+ {_.has( + detailsObj, + "pinswg_scopingtargetdate" + ) + ? !_.isEmpty( + detailsObj.pinswg_scopingtargetdate + ) + ? formatDates( + detailsObj.pinswg_scopingtargetdate + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+
+ {hasValidKey( + detailsObj, + "pinswg_scopingtargetextended" + ) && ( +
+
+ Scoping Target Extended +
+
+ {_.has( + detailsObj, + "pinswg_scopingtargetextended" + ) + ? !_.isEmpty( + detailsObj.pinswg_scopingtargetextended + ) + ? formatDates( + detailsObj.pinswg_scopingtargetextended + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+ ) +
+ )} +
+
+ Scoping Outcome Issued Date +
{" "} +
+ {_.has( + detailsObj, + "pinswg_scopingoutcomeissueddate" + ) + ? !_.isEmpty( + detailsObj.pinswg_scopingoutcomeissueddate + ) + ? formatDates( + detailsObj.pinswg_scopingoutcomeissueddate + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+
+
+
+ {/*
{t( @@ -801,7 +1059,7 @@ const Pinswg_sipscase = (props) => { )}
- {/*
+
{t("case:summary-suspension-dates")}
@@ -823,7 +1081,7 @@ const Pinswg_sipscase = (props) => { "case:summary-no-date-entered-label" )} -
*/} +
{t( @@ -875,7 +1133,7 @@ const Pinswg_sipscase = (props) => {
)} -
+ */}