diff --git a/actions/selectQueryTypes.js b/actions/selectQueryTypes.js index 60368160..0a0aa571 100644 --- a/actions/selectQueryTypes.js +++ b/actions/selectQueryTypes.js @@ -82,7 +82,7 @@ export const getSelectQuery = (appealTypeName) => { return "&$select=pinswg_eiarequired,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_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_suspensionenddates,pinswg_suspensionstartdate,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,pinswg_casestage,pinswg_startdateofevent,pinswg_typeofevent"; 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_projecttype_value,pinswg_eiarequired,pinswg_anticipatedgridrefeasting,pinswg_anticipatedgridrefnorthing,_pinswg_appellant_value,pinswg_name,_pinswg_associatedlpa_value,pinswg_choiceofprocedure,pinswg_decision,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,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,pinswg_essubmitted,pinswg_deemedmarinelicenseappliedfor,pinswg_validationdeadlineextension,pinswg_casesuspensionstartdate,pinswg_casesuspensionenddate,pinswg_consultationopen,pinswg_consultationclose"; + return "&$select=_pinswg_projecttype_value,pinswg_eiarequired,pinswg_anticipatedgridrefeasting,pinswg_anticipatedgridrefnorthing,_pinswg_appellant_value,pinswg_name,_pinswg_associatedlpa_value,pinswg_choiceofprocedure,pinswg_decision,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,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,pinswg_essubmitted,pinswg_deemedmarinelicenseappliedfor,pinswg_validationdeadlineextension,pinswg_casesuspensionstartdate,pinswg_casesuspensionenddate,pinswg_consultationopen,pinswg_consultationclose,pinswg_reportissuedtowelshministers,pinswg_decisionissuedtoapplicant,pinswg_decisionoutcome"; break; default: return ""; diff --git a/components/case/summaryTypes/pinswg_sipscase.js b/components/case/summaryTypes/pinswg_sipscase.js index 2b616e39..6e3b938d 100644 --- a/components/case/summaryTypes/pinswg_sipscase.js +++ b/components/case/summaryTypes/pinswg_sipscase.js @@ -499,7 +499,9 @@ const Pinswg_sipscase = (props) => { {t("case:summary-dates-label")}

- Pre Submission + {t( + "case:summary-pre-submission-sub-title" + )}

@@ -579,7 +581,6 @@ const Pinswg_sipscase = (props) => {
- {(hasValidKey( detailsObj, "pinswg_validationdeadlineextension" @@ -595,6 +596,9 @@ const Pinswg_sipscase = (props) => {

Submission + {t( + "case:summary-submission-sub-title" + )}

@@ -604,8 +608,9 @@ const Pinswg_sipscase = (props) => { ) && (
- Validation - Deadline - extension + {t( + "case:summary-validation-deadline-extension" + )}
{" "}
{_.has( @@ -633,8 +638,9 @@ const Pinswg_sipscase = (props) => { ) && (
- Case Suspension Start - Date + {t( + "case:summary-case-suspension-start-date" + )}
{" "}
{_.has( @@ -662,7 +668,9 @@ const Pinswg_sipscase = (props) => { ) && (
- Case Suspension End Date + {t( + "case:summary-case-suspension-end-date" + )}
{" "}
{_.has( @@ -687,6 +695,119 @@ const Pinswg_sipscase = (props) => {
)} + {(hasValidKey( + detailsObj, + "pinswg_reportissuedtowelshministers" + ) || + hasValidKey( + detailsObj, + "pinswg_decisionissuedtoapplicant" + ) || + hasValidKey( + detailsObj, + "pinswg_decisionoutcome" + )) && ( +
+

+ {t( + "case:summary-reporting-decision-sub-title" + )} +

+ +
+ {hasValidKey( + detailsObj, + "pinswg_reportissuedtowelshministers" + ) && ( +
+
+ {t( + "case:summary-report-issued-to-welsh-ministers" + )} +
{" "} +
+ {_.has( + detailsObj, + "pinswg_reportissuedtowelshministers" + ) + ? !_.isEmpty( + detailsObj.pinswg_reportissuedtowelshministers + ) + ? formatDates( + detailsObj.pinswg_reportissuedtowelshministers + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+
+ )} + {hasValidKey( + detailsObj, + "pinswg_decisionissuedtoapplicant" + ) && ( +
+
+ {t( + "case:summary-decision-issued-to-applicant" + )} +
{" "} +
+ {_.has( + detailsObj, + "pinswg_decisionissuedtoapplicant" + ) + ? !_.isEmpty( + detailsObj.pinswg_decisionissuedtoapplicant + ) + ? formatDates( + detailsObj.pinswg_decisionissuedtoapplicant + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+
+ )} + {hasValidKey( + detailsObj, + "pinswg_decisionoutcome" + ) && ( +
+
+ {t( + "case:summary-decision-outcome" + )} +
{" "} +
+ {_.has( + detailsObj, + "pinswg_decisionoutcome" + ) + ? !_.isEmpty( + detailsObj.pinswg_decisionoutcome + ) + ? formatDates( + detailsObj.pinswg_decisionoutcome + ) + : t( + "case:summary-awaiting-information-label" + ) + : t( + "case:summary-awaiting-information-label" + )} +
+
+ )} +
+
+ )} {/*

EIA Screening diff --git a/locales/cy/case.json b/locales/cy/case.json index fea5b5ec..6a06de93 100644 --- a/locales/cy/case.json +++ b/locales/cy/case.json @@ -124,5 +124,14 @@ "summary-subscribe-mail-label": "Ydych chi eisiau derbyn diweddariadau e-bost ar gyfer ", "summary-unsubscribe-mail-label": "Ydych chi eisiau dad-danysgrifio i ddiweddariadau e-bost ar gyfer ", "send-email-notifications": "Anfon hysbysiadau e-bost am ddiweddariadau i'r achos hwn", - "stop-sending-email-notifications": "Stopio anfon diweddariadau e-bost" + "stop-sending-email-notifications": "Stopio anfon diweddariadau e-bost", + "summary-pre-submission-sub-title": "Cyn-gyflwyno", + "summary-submission-sub-title": "Cyflwyniad", + "summary-validation-deadline-extension": "Dilysu - Estyniad dyddiad cau", + "summary-case-suspension-start-date": "Dyddiad Dechrau Atal Achos", + "summary-case-suspension-end-date": "Dyddiad Gorffen Atal Achos", + "summary-reporting-decision-sub-title": "Adrodd/Penderfyniad", + "summary-report-issued-to-welsh-ministers": "Adroddiad a Gyhoeddwyd i Weinidogion Cymru", + "summary-decision-issued-to-applicant": "Penderfyniad a Gyhoeddwyd i'r Ymgeisydd", + "summary-decision-outcome": "Canlyniad y Penderfyniad" } \ No newline at end of file diff --git a/locales/en/case.json b/locales/en/case.json index 03d30da5..c7cd77d2 100644 --- a/locales/en/case.json +++ b/locales/en/case.json @@ -125,5 +125,14 @@ "summary-subscribe-mail-label": "Do you want to be sent email updates for ", "summary-unsubscribe-mail-label": "Do you want to unsubscribe to email updates for ", "send-email-notifications": "Send email notifications for updates to this case", - "stop-sending-email-notifications": "Stop sending email updates" + "stop-sending-email-notifications": "Stop sending email updates", + "summary-pre-submission-sub-title": "Pre Submission", + "summary-submission-sub-title": "Submission", + "summary-validation-deadline-extension": "Validation - Deadline extension", + "summary-case-suspension-start-date": "Case Suspension Start Date", + "summary-case-suspension-end-date": "Case Suspension End Date", + "summary-reporting-decision-sub-title": "Reporting/Decision", + "summary-report-issued-to-welsh-ministers": "Report Issued to Welsh Ministers", + "summary-decision-issued-to-applicant": "Decision Issued to Applicant", + "summary-decision-outcome": "Decision Outcome" } \ No newline at end of file