diff --git a/actions/selectQueryTypes.js b/actions/selectQueryTypes.js index b12a9f32..25df358f 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_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_dnsids_value,pinswg_startdateofevent,pinswg_typeofevent"; - return "&$select=pinswg_casedeadline,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_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_consultationopen,pinswg_consultationclose,pinswg_reportissuedtowelshministers,pinswg_decisionissuedtoapplicant,pinswg_decisionoutcome,pinswg_redetermination,pinswg_redeterminationconsultationdeadline"; + return "&$select=pinswg_casedeadline,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_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_consultationopen,pinswg_consultationclose,pinswg_reportissuedtowelshministers,pinswg_decisionissuedtoapplicant,pinswg_decisionoutcome,pinswg_redetermination,pinswg_redeterminationconsultationdeadline,pinswg_reportdeadline,pinswg_casesubmissiondate,pinswg_preexaminationmeetingneeded,pinswg_consultaionpublicitydeadline,pinswg_endofexaminationstartofreporting"; break; default: return ""; diff --git a/components/case/summary.js b/components/case/summary.js index b3f51867..32bbd1e3 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -1701,13 +1701,17 @@ const CaseSummary = (props) => {

- EIA Screening + {t( + "case:summary-eia-screening-heading" + )}

- Screening start date + {t( + "case:summary-eia-screening-start-date-label" + )}
{" "}
{hasOwn( @@ -1730,7 +1734,9 @@ const CaseSummary = (props) => {
- EIA target date + {t( + "case:summary-eia-screening-target-date-label" + )}
{" "}
{hasOwn( @@ -1758,7 +1764,9 @@ const CaseSummary = (props) => { ) && (
- Target Extended + {t( + "case:summary-eia-screening-target-extended-label" + )}
{" "}
{hasOwn( @@ -1782,8 +1790,9 @@ const CaseSummary = (props) => { )}
- Direction Issued - Date + {t( + "case:summary-eia-screening-direction-issued-label" + )}
{" "}
{hasOwn( @@ -1843,13 +1852,17 @@ const CaseSummary = (props) => {

- EIA Scoping + {t( + "case:summary-eia-scoping-heading" + )}

- Scoping Start Date + {t( + "case:summary-eia-scoping-start-date-label" + )}
{" "}
{hasOwn( @@ -1872,7 +1885,9 @@ const CaseSummary = (props) => {
- Scoping Target Date + {t( + "case:summary-eia-scoping-target-date-label" + )}
{" "}
{hasOwn( @@ -1899,8 +1914,9 @@ const CaseSummary = (props) => { ) && (
- Scoping Target - Extended + {t( + "case:summary-eia-scoping-target-extended-label" + )}
{hasOwn( @@ -1924,8 +1940,9 @@ const CaseSummary = (props) => { )}
- Scoping Outcome - Issued Date + {t( + "case:summary-eia-scoping-direction-issued-date-label" + )}
{" "}
{hasOwn( diff --git a/components/case/summaryTypes/pinswg_sipscase.js b/components/case/summaryTypes/pinswg_sipscase.js index c3a5096e..dfe4b438 100644 --- a/components/case/summaryTypes/pinswg_sipscase.js +++ b/components/case/summaryTypes/pinswg_sipscase.js @@ -102,7 +102,6 @@ const Pinswg_sipscase = (props) => { ) })} /> - {projectTypes.length > 0 && ( { } /> )} - {detailsObj.pinswg_webaddress != null && ( { } /> )} - { ) } /> - +
{t("case:summary-decision-label")} @@ -358,7 +376,32 @@ const Pinswg_sipscase = (props) => {
+ { const fallback = t( "case:summary-awaiting-information-label" @@ -492,8 +535,35 @@ const Pinswg_sipscase = (props) => { "case:summary-submission-sub-title" )} -
+ {hasValidKey( + detailsObj, + "pinswg_casesubmissiondate" + ) && ( + + )} {hasValidKey( detailsObj, "pinswg_validationdeadlineextension" @@ -578,6 +648,63 @@ const Pinswg_sipscase = (props) => { } /> )} + + {hasValidKey( + detailsObj, + "pinswg_consultaionpublicitydeadline" + ) && ( + + )} + {hasValidKey( + detailsObj, + "pinswg_endofexaminationstartofreporting" + ) && ( + + )}
)} diff --git a/locales/cy/case.json b/locales/cy/case.json index 27826595..da97bdae 100644 --- a/locales/cy/case.json +++ b/locales/cy/case.json @@ -133,7 +133,7 @@ "send-email-notifications": "Anfon hysbysiadau e-bost am ddiweddariadau i'r achos hwn", "stop-sending-email-notifications": "Stopio anfon diweddariadau e-bost", "summary-pre-submission-sub-title": "Cyn-gyflwyno", - "summary-submission-sub-title": "Cyflwyniad", + "summary-submission-sub-title": "Cyflwyniad - Archwiliad", "summary-post-decision-sub-title": "Ar ôl y Penderfyniad", "summary-post-decision-redetermination-label": " Ailbenderfynu", "summary-post-decision-redetermination-deadline-label": "Dyddiad cau ar gyfer ailbenderfynu", @@ -153,5 +153,21 @@ "status-show-all-label": "Dangoswch bob cam", "status-hide-all-label": "Cuddio pob cam", "project-type-label": "Math o brosiect", - "summary-specialist-case-process-label": "Proses Achos Arbenigol" + "summary-specialist-case-process-label": "Proses Achos Arbenigol", + "summary-eia-screening-heading": "Sgrinio EIA", + "summary-eia-screening-start-date-label": "Dyddiad Dechrau Sgrinio", + "summary-eia-screening-target-date-label": "Dyddiad Targed Sgrinio", + "summary-eia-screening-target-extended-label": "Targed Sgrinio wedi'i Estyn", + "summary-eia-screening-direction-issued-label": "Dyddiad Cyhoeddi Cyfarwyddyd Sgrinio", + "summary-eia-scoping-heading": "Cwmpasu EIA", + "summary-eia-scoping-start-date-label": "Dyddiad Dechrau Cwmpasu", + "summary-eia-scoping-target-date-label": "Dyddiad Targed Cwmpasu", + "summary-eia-scoping-target-extended-label": "Targed Cwmpasu wedi'i Estyn", + "summary-eia-scoping-direction-issued-date-label": "Dyddiad Cyhoeddi Cyfarwyddyd Cwmpasu", + "summary-case-deadline-label": "Dyddiad Cau'r Achos", + "summary-report-deadline-label": "Dyddiad Cau'r Adroddiad", + "summary-case-submission-date-label": "Dyddiad Cyflwyno'r Achos", + "summary-pre-examination-needed-label": "Angen Cyfarfod Cyn-arholiad", + "summary-consultation-publicity-deadline-label": "Dyddiad Cau ar gyfer Ymgynghori/Cyhoeddusrwydd", + "summary-endof-examination-label": "Diwedd yr Arholiad/Dechrau'r Adrodd" } \ No newline at end of file diff --git a/locales/en/case.json b/locales/en/case.json index 344f7dc0..76dd5cb0 100644 --- a/locales/en/case.json +++ b/locales/en/case.json @@ -134,7 +134,7 @@ "send-email-notifications": "Send email notifications for updates to this case", "stop-sending-email-notifications": "Stop sending email updates", "summary-pre-submission-sub-title": "Pre Submission", - "summary-submission-sub-title": "Submission", + "summary-submission-sub-title": "Submission - Examination", "summary-post-decision-sub-title": "Post Decision", "summary-post-decision-redetermination-label": "Redetermination", "summary-post-decision-redetermination-deadline-label": "Redetermination deadline", @@ -154,5 +154,21 @@ "status-show-all-label": "Show all stages", "status-hide-all-label": "Hide all stages", "project-type-label": "Project type", - "summary-specialist-case-process-label": "Specialist Case Process" + "summary-specialist-case-process-label": "Specialist Case Process", + "summary-eia-screening-heading": "EIA Screening", + "summary-eia-screening-start-date-label": "Screening Start Date", + "summary-eia-screening-target-date-label": "Screening Target Date", + "summary-eia-screening-target-extended-label": "Screening Target Extended", + "summary-eia-screening-direction-issued-label": "Screening Direction Issued Date", + "summary-eia-scoping-heading": "EIA Scoping", + "summary-eia-scoping-start-date-label": "Scoping Start Date", + "summary-eia-scoping-target-date-label": "Scoping Target Date", + "summary-eia-scoping-target-extended-label": "Scoping Target Extended", + "summary-eia-scoping-direction-issued-date-label": "Scoping Direction Issued Date", + "summary-case-deadline-label": "Case Deadline", + "summary-report-deadline-label": "Report Deadline", + "summary-case-submission-date-label": "Case Submission Date", + "summary-pre-examination-needed-label": "Pre-Examination Meeting Needed", + "summary-consultation-publicity-deadline-label": "Consultation/Publicity Deadline", + "summary-endof-examination-label": "End of Examination/Start of Reporting" } \ No newline at end of file