updated query and display logic for post determination fields
This commit is contained in:
@@ -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,pinswg_reportissuedtowelshministers,pinswg_decisionissuedtoapplicant,pinswg_decisionoutcome";
|
||||
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,pinswg_redetermination,pinswg_redeterminationconsultationdeadline";
|
||||
break;
|
||||
default:
|
||||
return "";
|
||||
|
||||
@@ -42,12 +42,12 @@ const Pinswg_sipscase = (props) => {
|
||||
) < 0
|
||||
? detailsObj.pinswg_projectdescription
|
||||
: router.locale == "cy"
|
||||
? detailsObj.pinswg_projectdescription.split(
|
||||
";"
|
||||
)[1]
|
||||
: detailsObj.pinswg_projectdescription.split(
|
||||
";"
|
||||
)[0]
|
||||
? detailsObj.pinswg_projectdescription.split(
|
||||
";"
|
||||
)[1]
|
||||
: detailsObj.pinswg_projectdescription.split(
|
||||
";"
|
||||
)[0]
|
||||
: ""}
|
||||
</p>
|
||||
|
||||
@@ -436,7 +436,7 @@ const Pinswg_sipscase = (props) => {
|
||||
</dt>
|
||||
<dd className="govuk-summary-list__value">
|
||||
{_.has(casesObj, [
|
||||
"numberofchildincidents",
|
||||
"numberofchildincidents"
|
||||
])
|
||||
? casesObj.numberofchildincidents >
|
||||
0
|
||||
@@ -807,6 +807,85 @@ const Pinswg_sipscase = (props) => {
|
||||
</dl>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{hasValidKey(
|
||||
detailsObj,
|
||||
"pinswg_redetermination"
|
||||
) && (
|
||||
<div>
|
||||
<h4 className="govuk-heading-s ">
|
||||
{t(
|
||||
"case:summary-post-decision-sub-title"
|
||||
)}
|
||||
</h4>
|
||||
|
||||
<dl className="govuk-summary-list govuk-!-font-size-16 govuk-!-margin-bottom-9">
|
||||
{hasValidKey(
|
||||
detailsObj,
|
||||
"pinswg_redetermination"
|
||||
) && (
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t(
|
||||
"case:summary-post-decision-redetermination-label"
|
||||
)}
|
||||
</dt>{" "}
|
||||
<dd className="govuk-summary-list__value">
|
||||
{_.has(
|
||||
detailsObj,
|
||||
"pinswg_redetermination@OData.Community.Display.V1.FormattedValue"
|
||||
)
|
||||
? !_.isEmpty(
|
||||
detailsObj[
|
||||
"pinswg_redetermination@OData.Community.Display.V1.FormattedValue"
|
||||
]
|
||||
)
|
||||
? detailsObj[
|
||||
"pinswg_redetermination@OData.Community.Display.V1.FormattedValue"
|
||||
]
|
||||
: t(
|
||||
"case:summary-awaiting-information-label"
|
||||
)
|
||||
: t(
|
||||
"case:summary-awaiting-information-label"
|
||||
)}
|
||||
</dd>
|
||||
</div>
|
||||
)}
|
||||
{hasValidKey(
|
||||
detailsObj,
|
||||
"pinswg_redeterminationconsultationdeadline"
|
||||
) && (
|
||||
<div className="govuk-summary-list__row">
|
||||
<dt className="govuk-summary-list__key">
|
||||
{t(
|
||||
"case:summary-post-decision-redetermination-deadline-label"
|
||||
)}
|
||||
</dt>{" "}
|
||||
<dd className="govuk-summary-list__value">
|
||||
{_.has(
|
||||
detailsObj,
|
||||
"pinswg_redeterminationconsultationdeadline"
|
||||
)
|
||||
? !_.isEmpty(
|
||||
detailsObj.pinswg_redeterminationconsultationdeadline
|
||||
)
|
||||
? formatDates(
|
||||
detailsObj.pinswg_redeterminationconsultationdeadline
|
||||
)
|
||||
: t(
|
||||
"case:summary-awaiting-information-label"
|
||||
)
|
||||
: t(
|
||||
"case:summary-awaiting-information-label"
|
||||
)}
|
||||
</dd>
|
||||
</div>
|
||||
)}
|
||||
</dl>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* <div>
|
||||
<h4 className="govuk-heading-s ">
|
||||
EIA Screening
|
||||
|
||||
@@ -134,6 +134,9 @@
|
||||
"stop-sending-email-notifications": "Stopio anfon diweddariadau e-bost",
|
||||
"summary-pre-submission-sub-title": "Cyn-gyflwyno",
|
||||
"summary-submission-sub-title": "Cyflwyniad",
|
||||
"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",
|
||||
"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",
|
||||
|
||||
@@ -135,6 +135,9 @@
|
||||
"stop-sending-email-notifications": "Stop sending email updates",
|
||||
"summary-pre-submission-sub-title": "Pre Submission",
|
||||
"summary-submission-sub-title": "Submission",
|
||||
"summary-post-decision-sub-title": "Post Decision",
|
||||
"summary-post-decision-redetermination-label": "Redetermination",
|
||||
"summary-post-decision-redetermination-deadline-label": "Redetermination deadline",
|
||||
"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",
|
||||
|
||||
Reference in New Issue
Block a user