robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uat defects and s78 dns amends

Browse Source
This commit is contained in:
robbond
2022-11-02 13:23:54 +00:00
parent e2f7e3756a
commit ca91f679ce
6 changed files with 348 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/selectQueryTypes.js
+1 -1
View File
@@ -48,7 +48,7 @@ export const getSelectQuery = (appealTypeName) => {
return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_sitepostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_starttimeofevent,pinswg_typeofevent"; return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_sitepostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_starttimeofevent,pinswg_typeofevent";
break; break;
case "pinswg_planningappeals78s": case "pinswg_planningappeals78s":
return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdatetimeiftheevent,pinswg_typeofevent"; return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,pinswg_casedecisiondate,pinswg_dicision,pinswg_dateeventrequested,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdatetimeiftheevent,pinswg_typeofevent";
break; break;
case "pinswg_planningconditionss73s79s": case "pinswg_planningconditionss73s79s":
return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateofevent,pinswg_typeofevent"; return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
components/case/summary.js
+11 -11
View File
@@ -128,7 +128,10 @@ const CaseSummary = (props) => {
<dl className="govuk-summary-list govuk-!-margin-bottom-9"> <dl className="govuk-summary-list govuk-!-margin-bottom-9">
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t("case:summary-applicant-label")} {getFormCollectionByID(appealTypeID)
.PrimaryIdAttribute == "pinswg_dnsid"
? t("case:summary-applicantonly-label")
: t("case:summary-applicant-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{detailsObj[ {detailsObj[
@@ -668,7 +671,7 @@ const CaseSummary = (props) => {
// : setShowSpinnerState(true); // : setShowSpinnerState(true);
// }; // };
function formatDates(dateObj) { function formatDates(dateObj, showTime) {
var dateObj = new Date(dateObj); var dateObj = new Date(dateObj);
var dd = String(dateObj.getDate()).padStart(2, "0"); var dd = String(dateObj.getDate()).padStart(2, "0");
var mm = String(dateObj.getMonth() + 1).padStart(2, "0"); //January is 0! var mm = String(dateObj.getMonth() + 1).padStart(2, "0"); //January is 0!
@@ -678,15 +681,12 @@ const CaseSummary = (props) => {
var mins = dateObj.getMinutes(); var mins = dateObj.getMinutes();
mins = ("0" + mins).slice(-2); mins = ("0" + mins).slice(-2);
return ( const dateStr = showTime
dd + ? hh == 0 && mins == 0
"/" + ? ""
mm + : hh + ":" + mins
"/" + : dd + "/" + mm + "/" + yyyy + " ";
yyyy + return dateStr;
" " +
(hh == 0 && mins == 0 ? "" : hh + ":" + mins)
);
} }
function linkedCasesList(linkedCasesReference) { function linkedCasesList(linkedCasesReference) {
components/case/summaryTypes/pinswg_dnsid.js
+251 -300
View File
@@ -141,6 +141,46 @@ const Pinswg_dnsid = (props) => {
)} )}
</dd> </dd>
</div> </div>
{detailsObj.pinswg_webaddress != null && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-website-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{router.locale == "cy"
? jsonpath.query(
transLookup,
'$..[?(@.value=="' +
detailsObj.pinswg_webaddress +
'")].value_cy'
)
: (
<a
target="_blank"
rel="noreferrer"
href={
detailsObj.pinswg_webaddress.indexOf(
"https://"
)
? "https://" +
detailsObj.pinswg_webaddress
: detailsObj.pinswg_webaddress
}
>
{
detailsObj.pinswg_webaddress
}
</a>
) ||
t(
"case:summary-no-date-entered-label"
)}
</dd>
</div>
)}
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t("case:summary-lpa-label")} {t("case:summary-lpa-label")}
@@ -182,7 +222,7 @@ const Pinswg_dnsid = (props) => {
)} )}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> {/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t("case:summary-status-label")} {t("case:summary-status-label")}
</dt> </dt>
@@ -203,24 +243,22 @@ const Pinswg_dnsid = (props) => {
"case:summary-to-be-confirmed-label" "case:summary-to-be-confirmed-label"
)} )}
</dd> </dd>
</div> </div> */}
<div className="govuk-summary-list__row"> {/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t(
"case:summary-case-officer-label" "case:summary-case-officer-label"
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{" "}
{/* {casesObj.caseDetails.caseOfficer ||
""} */}
{_.has(casesObj, "_ownerid_value") {_.has(casesObj, "_ownerid_value")
? casesObj[ ? casesObj[
"_ownerid_value@OData.Community.Display.V1.FormattedValue" "_ownerid_value@OData.Community.Display.V1.FormattedValue"
] ]
: ""} : ""}
</dd> </dd>
</div> </div> */}
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t(
@@ -329,13 +367,13 @@ const Pinswg_dnsid = (props) => {
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{_.has( {_.has(
detailsObj, detailsObj,
"pinswg_casedecisiondate" "pinswg_dateofdecision"
) )
? !_.isEmpty( ? !_.isEmpty(
detailsObj.pinswg_casedecisiondate detailsObj.pinswg_dateofdecision
) )
? formatDates( ? formatDates(
detailsObj.pinswg_casedecisiondate detailsObj.pinswg_dateofdecision
) )
: t( : t(
"case:summary-no-information-to-date-label" "case:summary-no-information-to-date-label"
@@ -404,46 +442,6 @@ const Pinswg_dnsid = (props) => {
: detailsObj.pinswg_recommendation} : detailsObj.pinswg_recommendation}
</dd> </dd>
</div> */} </div> */}
{detailsObj.pinswg_webaddress != null && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-website-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{router.locale == "cy"
? jsonpath.query(
transLookup,
'$..[?(@.value=="' +
detailsObj.pinswg_webaddress +
'")].value_cy'
)
: (
<a
target="_blank"
rel="noreferrer"
href={
detailsObj.pinswg_webaddress.indexOf(
"https://"
)
? "https://" +
detailsObj.pinswg_webaddress
: detailsObj.pinswg_webaddress
}
>
{
detailsObj.pinswg_webaddress
}
</a>
) ||
t(
"case:summary-no-date-entered-label"
)}
</dd>
</div>
)}
</dl> </dl>
</div> </div>
</div> </div>
@@ -455,7 +453,7 @@ const Pinswg_dnsid = (props) => {
{t("case:summary-dates-label")} {t("case:summary-dates-label")}
</h3> </h3>
<dl className="govuk-summary-list govuk-!-font-size-16 govuk-!-margin-bottom-9"> <dl className="govuk-summary-list govuk-!-font-size-16 govuk-!-margin-bottom-9">
<div className="govuk-summary-list__row"> {/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t(
"case:summary-valid-notice-of-intention-to-submit-an-application" "case:summary-valid-notice-of-intention-to-submit-an-application"
@@ -479,7 +477,7 @@ const Pinswg_dnsid = (props) => {
"case:summary-awaiting-information-label" "case:summary-awaiting-information-label"
)} )}
</dd> </dd>
</div> </div> */}
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t(
@@ -555,56 +553,58 @@ const Pinswg_dnsid = (props) => {
)} )}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> {_.has(
<dt className="govuk-summary-list__key"> detailsObj,
{t( "pinswg_applicationacceptedasvalid"
"case:summary-application-accepted-as-valid" ) &&
)} !_.isEmpty(
</dt> detailsObj.pinswg_applicationrejectedasinvalid
<dd className="govuk-summary-list__value"> ) && (
{_.has( <div className="govuk-summary-list__row">
detailsObj, <dt className="govuk-summary-list__key">
"pinswg_applicationacceptedasvalid" {t(
) "case:summary-application-accepted-as-valid"
? !_.isEmpty( )}
detailsObj.pinswg_applicationacceptedasvalid </dt>
) <dd className="govuk-summary-list__value">
? formatDates( {!_.isEmpty(
detailsObj.pinswg_applicationacceptedasvalid detailsObj.pinswg_applicationacceptedasvalid
) )
: t( ? formatDates(
"case:summary-awaiting-information-label" detailsObj.pinswg_applicationacceptedasvalid
) )
: t( : t(
"case:summary-awaiting-information-label" "case:summary-awaiting-information-label"
)} )}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> )}
<dt className="govuk-summary-list__key"> {_.has(
{t( detailsObj,
"case:summary-application-rejected-as-invalid" "pinswg_applicationrejectedasinvalid"
)} ) &&
</dt> !_.isEmpty(
<dd className="govuk-summary-list__value"> detailsObj.pinswg_applicationrejectedasinvalid
{_.has( ) && (
detailsObj, <div className="govuk-summary-list__row">
"pinswg_applicationrejectedasinvalid" <dt className="govuk-summary-list__key">
) {t(
? !_.isEmpty( "case:summary-application-rejected-as-invalid"
detailsObj.pinswg_applicationrejectedasinvalid )}
) </dt>
? formatDates( <dd className="govuk-summary-list__value">
detailsObj.pinswg_applicationrejectedasinvalid {!_.isEmpty(
) detailsObj.pinswg_applicationrejectedasinvalid
: t( )
"case:summary-awaiting-information-label" ? formatDates(
) detailsObj.pinswg_applicationrejectedasinvalid
: t( )
"case:summary-awaiting-information-label" : t(
)} "case:summary-awaiting-information-label"
</dd> )}
</div> </dd>
</div>
)}
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t(
@@ -630,182 +630,130 @@ const Pinswg_dnsid = (props) => {
)} )}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-date-of-request-to-vary"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_dateofrequesttovarytheapplication"
)
? !_.isEmpty(
detailsObj.pinswg_dateofrequesttovarytheapplication
)
? formatDates(
detailsObj.pinswg_dateofrequesttovarytheapplication
)
: t(
"case:summary-awaiting-information-label"
)
: t(
"case:summary-awaiting-information-label"
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-confirm-request-to-vary-application"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_confirmrequesttovaryapplication"
)
? !_.isEmpty(
detailsObj.pinswg_confirmrequesttovaryapplication
)
? formatDates(
detailsObj.pinswg_confirmrequesttovaryapplication
)
: t(
"case:summary-awaiting-information-label"
)
: t(
"case:summary-awaiting-information-label"
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-reject-request-to-vary-application"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_rejectrequesttovaryapplication"
)
? !_.isEmpty(
detailsObj.pinswg_rejectrequesttovaryapplication
)
? formatDates(
detailsObj.pinswg_rejectrequesttovaryapplication
)
: t(
"case:summary-awaiting-information-label"
)
: t(
"case:summary-awaiting-information-label"
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-suspension-start-dates"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(
detailsObj,
"pinswg_suspensionstartdates"
)
? !_.isEmpty(
detailsObj.pinswg_suspensionstartdates
)
? formatDates(
detailsObj.pinswg_suspensionstartdates
)
: t(
"case:summary-awaiting-information-label"
)
: t(
"case:summary-awaiting-information-label"
)}
</dd>
</div>
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-date-of-decisions"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.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"
)}
</dd>
</div> */}
{/* <div className="govuk-summary-list__row"> {_.has(
<dt className="govuk-summary-list__key"> detailsObj,
{t( "pinswg_dateofrequesttovarytheapplication"
"case:summary-date-project-published-to-website" ) &&
)} !_.isEmpty(
</dt> detailsObj.pinswg_dateofrequesttovarytheapplication
<dd className="govuk-summary-list__value"> ) && (
{_.has( <div className="govuk-summary-list__row">
detailsObj, <dt className="govuk-summary-list__key">
"pinswg_dateprojectpublishedonwebsite" {t(
) "case:summary-date-of-request-to-vary"
? !_.isEmpty( )}
detailsObj.pinswg_dateprojectpublishedonwebsite </dt>
) <dd className="govuk-summary-list__value">
? formatDates( {!_.isEmpty(
detailsObj.pinswg_dateprojectpublishedonwebsite detailsObj.pinswg_dateofrequesttovarytheapplication
) )
: t( ? formatDates(
"case:summary-no-date-entered-label" detailsObj.pinswg_dateofrequesttovarytheapplication
) )
: t( : t(
"case:summary-no-date-entered-label" "case:summary-awaiting-information-label"
)} )}
</dd> </dd>
</div> */} </div>
{/* <div className="govuk-summary-list__row"> )}
<dt className="govuk-summary-list__key">
{t( {_.has(
"case:summary-procedure-confirmed" detailsObj,
)} "pinswg_confirmrequesttovaryapplication"
</dt> ) &&
<dd className="govuk-summary-list__value"> !_.isEmpty(
{_.has( detailsObj.pinswg_confirmrequesttovaryapplication
detailsObj, ) &&
"pinswg_procedureconfirmed" (_.has(
) detailsObj,
? !_.isEmpty( "pinswg_rejectrequesttovaryapplication"
detailsObj.pinswg_procedureconfirmed ) &&
) _.isEmpty(
? formatDates( detailsObj.pinswg_rejectrequesttovaryapplication
detailsObj.pinswg_procedureconfirmed ) ? (
) <div className="govuk-summary-list__row">
: t( <dt className="govuk-summary-list__key">
"case:summary-no-date-entered-label" {t(
) "case:summary-confirm-request-to-vary-application"
: t( )}
"case:summary-no-date-entered-label" </dt>
)} <dd className="govuk-summary-list__value">
</dd> {!_.isEmpty(
</div> */} detailsObj.pinswg_confirmrequesttovaryapplication
)
? formatDates(
detailsObj.pinswg_confirmrequesttovaryapplication
)
: t(
"case:summary-awaiting-information-label"
)}
</dd>
</div>
) : (
""
))}
{_.has(
detailsObj,
"pinswg_rejectrequesttovaryapplication"
) &&
!_.isEmpty(
detailsObj.pinswg_rejectrequesttovaryapplication
) &&
(_.has(
detailsObj,
"pinswg_confirmrequesttovaryapplication"
) &&
_.isEmpty(
detailsObj.pinswg_confirmrequesttovaryapplication
) ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-reject-request-to-vary-application"
)}
</dt>
<dd className="govuk-summary-list__value">
{!_.isEmpty(
detailsObj.pinswg_rejectrequesttovaryapplication
)
? formatDates(
detailsObj.pinswg_rejectrequesttovaryapplication
)
: t(
"case:summary-awaiting-information-label"
)}
</dd>
</div>
) : (
""
))}
{_.has(
detailsObj,
"pinswg_suspensionstartdates"
) &&
!_.isEmpty(
detailsObj.pinswg_suspensionstartdates
) && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-suspension-start-dates"
)}
</dt>
<dd className="govuk-summary-list__value">
{!_.isEmpty(
detailsObj.pinswg_suspensionstartdates
)
? formatDates(
detailsObj.pinswg_suspensionstartdates
)
: t(
"case:summary-awaiting-information-label"
)}
</dd>
</div>
)}
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
@@ -903,29 +851,32 @@ const Pinswg_dnsid = (props) => {
)} )}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> {_.has(
<dt className="govuk-summary-list__key"> detailsObj,
{t("case:summary-withdrawn-date")} "pinswg_withdrawndate"
</dt> ) &&
<dd className="govuk-summary-list__value"> !_.isEmpty(
{_.has( detailsObj.pinswg_withdrawndate
detailsObj, ) && (
"pinswg_withdrawndate" <div className="govuk-summary-list__row">
) <dt className="govuk-summary-list__key">
? !_.isEmpty( {t(
detailsObj.pinswg_withdrawndate "case:summary-withdrawn-date"
) )}
? formatDates( </dt>
detailsObj.pinswg_withdrawndate <dd className="govuk-summary-list__value">
) {!_.isEmpty(
: t( detailsObj.pinswg_withdrawndate
"case:summary-awaiting-information-label" )
) ? formatDates(
: t( detailsObj.pinswg_withdrawndate
"case:summary-awaiting-information-label" )
)} : t(
</dd> "case:summary-awaiting-information-label"
</div> )}
</dd>
</div>
)}
</dl> </dl>
</div> </div>
</div> </div>
components/case/summaryTypes/pinswg_planningappeals78id.js
+63 -31
View File
@@ -147,12 +147,12 @@ const Pinswg_planningappeals78id = (props) => {
transLookup, transLookup,
'$..[?(@.value=="' + '$..[?(@.value=="' +
detailsObj[ detailsObj[
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_dicision@OData.Community.Display.V1.FormattedValue"
] + ] +
'")].value_cy' '")].value_cy'
) )
: detailsObj[ : detailsObj[
"pinswg_decision@OData.Community.Display.V1.FormattedValue" "pinswg_dicision@OData.Community.Display.V1.FormattedValue"
] || ] ||
t( t(
"case:summary-no-date-entered-label" "case:summary-no-date-entered-label"
@@ -167,6 +167,29 @@ const Pinswg_planningappeals78id = (props) => {
</Link> */} </Link> */}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-decision-date-label")}
</dt>
<dd className="govuk-summary-list__value">
{_.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"
)}
</dd>
</div>
{casesObj.numberofchildincidents > 0 && ( {casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
@@ -283,7 +306,7 @@ const Pinswg_planningappeals78id = (props) => {
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t(
"case:summary-statement-due-date-label" "case:summary-statement-interested-party-due-date-label"
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
@@ -306,7 +329,7 @@ const Pinswg_planningappeals78id = (props) => {
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> {/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t(
"case:summary-interested-party-date-label" "case:summary-interested-party-date-label"
@@ -343,12 +366,12 @@ const Pinswg_planningappeals78id = (props) => {
"case:summary-no-date-entered-label" "case:summary-no-date-entered-label"
)} )}
</dd> </dd>
</div> </div> */}
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t(
"case:summary-applicant-final-comments-date-label" "case:summary-final-comments-date-label"
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
@@ -395,7 +418,7 @@ const Pinswg_planningappeals78id = (props) => {
)} )}
</dd> </dd>
</div> */} </div> */}
<div className="govuk-summary-list__row"> {/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")} {t("case:summary-event-date-label")}
</dt> </dt>
@@ -417,13 +440,11 @@ const Pinswg_planningappeals78id = (props) => {
"case:summary-no-date-entered-label" "case:summary-no-date-entered-label"
)} )}
</dd> </dd>
</div> </div> */}
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key"> <dt className="govuk-summary-list__key">
{t( {t("case:summary-event-date-label")}
"case:summary-start-event-date-label"
)}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{_.has( {_.has(
@@ -444,29 +465,40 @@ const Pinswg_planningappeals78id = (props) => {
)} )}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> {detailsObj.pinswg_typeofevent == 846040002 ||
<dt className="govuk-summary-list__key"> detailsObj.pinswg_typeofevent == 846040007 ||
{t("case:summary-decision-date-label")} detailsObj.pinswg_typeofevent == 846040012 ||
</dt> detailsObj.pinswg_typeofevent == 846040009 ? (
<dd className="govuk-summary-list__value"> <div className="govuk-summary-list__row">
{_.has( <dt className="govuk-summary-list__key">
detailsObj, {t(
"pinswg_casedecisiondate" "case:summary-start-event-time-label"
) )}
? !_.isEmpty( </dt>
detailsObj.pinswg_casedecisiondate
) <dd className="govuk-summary-list__value">
? formatDates( {_.has(
detailsObj.pinswg_casedecisiondate detailsObj,
"pinswg_startdatetimeiftheevent"
)
? !_.isEmpty(
detailsObj.pinswg_startdatetimeiftheevent
) )
? formatDates(
detailsObj.pinswg_startdatetimeiftheevent,
true
)
: t(
"case:summary-no-date-entered-label"
)
: t( : t(
"case:summary-no-date-entered-label" "case:summary-no-date-entered-label"
) )}
: t( </dd>
"case:summary-no-date-entered-label" </div>
)} ) : (
</dd> ""
</div> )}
</dl> </dl>
</div> </div>
</div> </div>
locales/cy/case.json
+12 -8
View File
@@ -3,10 +3,11 @@
"case-card-title": "Reference: APP/B1415/W/20/3271702", "case-card-title": "Reference: APP/B1415/W/20/3271702",
"summary-reference-label": "Cyfeirnod", "summary-reference-label": "Cyfeirnod",
"summary-applicant-label": "Apelydd/Ymgeisydd", "summary-applicant-label": "Apelydd/Ymgeisydd",
"summary-applicantonly-label": "Ymgeisydd",
"summary-agent-label": "Asiant", "summary-agent-label": "Asiant",
"summary-site-address-label": "Cyfeiriad y Safle", "summary-site-address-label": "Cyfeiriad y Safle",
"summary-description-label": "Disgrifiad", "summary-description-label": "Disgrifiad",
"summary-case-stage-label": "Cam achos", "summary-case-stage-label": "Cyfnod Achos",
"summary-make-representation-label": "Cyflwyno cynrychiolaeth", "summary-make-representation-label": "Cyflwyno cynrychiolaeth",
"summary-back-button-label": "Ewch yn ôl", "summary-back-button-label": "Ewch yn ôl",
"summary-case-details-label": "Manylion yr Achos", "summary-case-details-label": "Manylion yr Achos",
@@ -18,12 +19,12 @@
"summary-procedure-label": "Gweithdrefn", "summary-procedure-label": "Gweithdrefn",
"summary-type-of-event-label": "Math o ddigwyddiad", "summary-type-of-event-label": "Math o ddigwyddiad",
"summary-status-label": "Statws", "summary-status-label": "Statws",
"summary-decision-label": "Penderfyniad a chanlyniad", "summary-decision-label": "Penderfyniad",
"summary-case-link-status-label": "Statws cysylltiad yr Achos", "summary-case-link-status-label": "Statws cysylltiad yr Achos",
"summary-case-link-status-not-linked": "Heb ei Gysylltu", "summary-case-link-status-not-linked": "Heb ei Gysylltu",
"summary-case-link-status-linked": "Cysylltiedig", "summary-case-link-status-linked": "Cysylltiedig",
"summary-linked-cases-label": "Achosion cysylltiedig", "summary-linked-cases-label": "Achosion cysylltiedig",
"summary-dates-label": "Dyddiadau", "summary-dates-label": "Dyddiadau allweddol",
"summary-no-date-entered-label": "dim dyddiad wedi'i nodi", "summary-no-date-entered-label": "dim dyddiad wedi'i nodi",
"summary-no-information-to-date-label": "Dim gwybodaeth hyd yma", "summary-no-information-to-date-label": "Dim gwybodaeth hyd yma",
"summary-awaiting-information-label": "Aros am wybodaeth", "summary-awaiting-information-label": "Aros am wybodaeth",
@@ -31,12 +32,15 @@
"summary-start-date-label": "Dyddiad Dechrau", "summary-start-date-label": "Dyddiad Dechrau",
"summary-questionnaire-due-date-label": "Holiadur i ddod", "summary-questionnaire-due-date-label": "Holiadur i ddod",
"summary-statement-due-date-label": "Datganiad(au) i ddod", "summary-statement-due-date-label": "Datganiad(au) i ddod",
"summary-statement-interested-party-due-date-label": "Datganiad a Sylwadau Partïon â Diddordeb yn ddyledus",
"summary-date-exported-to-iss-label": "Dyddiad allforio i ISS", "summary-date-exported-to-iss-label": "Dyddiad allforio i ISS",
"summary-interested-party-date-label": "Sylwadau Parti â Buddiant i ddod", "summary-interested-party-date-label": "Sylwadau Parti â Buddiant i ddod",
"summary-applicant-final-comments-date-label": "Sylwadau Terfynol yr Apelydd/ACLl i ddod", "summary-applicant-final-comments-date-label": "Sylwadau Terfynol yr Apelydd/ACLl i ddod",
"summary-final-comments-date-label": "Sylwadau terfynol gan bob parti",
"summary-inquiry-evidence-date-label": "Tystiolaeth yr Ymchwiliad i ddod", "summary-inquiry-evidence-date-label": "Tystiolaeth yr Ymchwiliad i ddod",
"summary-start-event-date-label": "Start date of event", "summary-start-event-date-label": "Dyddiad cychwyn y digwyddiad",
"summary-event-date-label": "Dyddiad cychwyn y digwyddiad", "summary-start-event-time-label": "Amser cychwyn y digwyddiad",
"summary-event-date-label": "Dyddiad Digwyddiad",
"summary-decision-date-label": "Dyddiad y Penderfyniad", "summary-decision-date-label": "Dyddiad y Penderfyniad",
"summary-documents-button-label": "Dogfennau", "summary-documents-button-label": "Dogfennau",
"documents-document-count-label": "Dogfennau", "documents-document-count-label": "Dogfennau",
@@ -60,11 +64,11 @@
"summary-date-of-submission-of-application": "Dyddiad cyflwyno'r cais", "summary-date-of-submission-of-application": "Dyddiad cyflwyno'r cais",
"summary-date-project-published-to-website": "Dyddiad Cyhoeddi Prosiect i Wefan", "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-deadline-for-submission-of-application": "Dyddiad cau ar gyfer cyflwyno'r cais",
"summary-end-of-representation-period": "Diwedd y cyfnod cynrychiolaeth", "summary-end-of-representation-period": "Diwedd y Cyfnod Sylwadau Cychwynnol",
"summary-inspector-report-submission-to-welsh-government": "Cyflwyniad Adroddiad yr Arolygydd i Lywodraeth Cymru", "summary-inspector-report-submission-to-welsh-government": "Adroddiad yr Arolygydd wedi'i gyflwyno i Gyfarwyddiaeth Gynllunio Llywodraeth Cymru",
"summary-procedure-confirmed": "Cadarnhawyd y weithdrefn", "summary-procedure-confirmed": "Cadarnhawyd y weithdrefn",
"summary-reject-request-to-vary-application": "Gwrthod cais i amrywio cais", "summary-reject-request-to-vary-application": "Gwrthod cais i amrywio cais",
"summary-report-due-by": "Adroddiad yn ddyledus gan", "summary-report-due-by": "Amcangyfrif o gyflwyniad yr adroddiad gan",
"summary-suspension-dates": "Dyddiadau Atal", "summary-suspension-dates": "Dyddiadau Atal",
"summary-suspension-end-dates": "Dyddiadau Gorffen Atal dros dro", "summary-suspension-end-dates": "Dyddiadau Gorffen Atal dros dro",
"summary-suspension-start-dates": "Dyddiadau cychwyn atal dros dro", "summary-suspension-start-dates": "Dyddiadau cychwyn atal dros dro",
locales/en/case.json
+10 -6
View File
@@ -3,10 +3,11 @@
"case-card-title": "Reference: APP/B1415/W/20/3271702", "case-card-title": "Reference: APP/B1415/W/20/3271702",
"summary-reference-label": "Reference", "summary-reference-label": "Reference",
"summary-applicant-label": "Appellant/Applicant", "summary-applicant-label": "Appellant/Applicant",
"summary-applicantonly-label": "Applicant",
"summary-agent-label": "Agent", "summary-agent-label": "Agent",
"summary-site-address-label": "Site Address", "summary-site-address-label": "Site Address",
"summary-description-label": "Description", "summary-description-label": "Description",
"summary-case-stage-label": "Case stage", "summary-case-stage-label": "Case Stage",
"summary-make-representation-label": "Make representation", "summary-make-representation-label": "Make representation",
"summary-back-button-label": "Go back", "summary-back-button-label": "Go back",
"summary-case-details-label": "Case Details", "summary-case-details-label": "Case Details",
@@ -18,12 +19,12 @@
"summary-procedure-label": "Procedure", "summary-procedure-label": "Procedure",
"summary-type-of-event-label": "Type of event", "summary-type-of-event-label": "Type of event",
"summary-status-label": "Status", "summary-status-label": "Status",
"summary-decision-label": "Decision and Outcome", "summary-decision-label": "Decision",
"summary-case-link-status-label": "Case Link Status", "summary-case-link-status-label": "Case Link Status",
"summary-case-link-status-not-linked": "Not linked", "summary-case-link-status-not-linked": "Not linked",
"summary-case-link-status-linked": "Linked", "summary-case-link-status-linked": "Linked",
"summary-linked-cases-label": "Linked Cases", "summary-linked-cases-label": "Linked Cases",
"summary-dates-label": "Dates", "summary-dates-label": "Key Dates",
"summary-no-date-entered-label": "no date entered", "summary-no-date-entered-label": "no date entered",
"summary-no-information-to-date-label": "No information to date", "summary-no-information-to-date-label": "No information to date",
"summary-awaiting-information-label": "Awaiting information", "summary-awaiting-information-label": "Awaiting information",
@@ -31,11 +32,14 @@
"summary-start-date-label": "Start Date", "summary-start-date-label": "Start Date",
"summary-questionnaire-due-date-label": "Questionnaire due", "summary-questionnaire-due-date-label": "Questionnaire due",
"summary-statement-due-date-label": "Statement(s) due", "summary-statement-due-date-label": "Statement(s) due",
"summary-statement-interested-party-due-date-label": "Statement and Interested Party Reps due",
"summary-date-exported-to-iss-label": "Date exported to ISS", "summary-date-exported-to-iss-label": "Date exported to ISS",
"summary-interested-party-date-label": "Interested Party Comments due", "summary-interested-party-date-label": "Interested Party Comments due",
"summary-applicant-final-comments-date-label": "Appellant/LPA Final Comments due", "summary-applicant-final-comments-date-label": "Appellant/LPA Final Comments due",
"summary-final-comments-date-label": "Final comments from all parties",
"summary-inquiry-evidence-date-label": "Inquiry Evidence due", "summary-inquiry-evidence-date-label": "Inquiry Evidence due",
"summary-start-event-date-label": "Start date of event", "summary-start-event-date-label": "Start date of event",
"summary-start-event-time-label": "Start time of event",
"summary-event-date-label": "Event Date", "summary-event-date-label": "Event Date",
"summary-decision-date-label": "Decision Date", "summary-decision-date-label": "Decision Date",
"summary-documents-button-label": "Documents", "summary-documents-button-label": "Documents",
@@ -60,11 +64,11 @@
"summary-date-of-submission-of-application": "Date of submission of Application", "summary-date-of-submission-of-application": "Date of submission of Application",
"summary-date-project-published-to-website": "Date Project Published to Website", "summary-date-project-published-to-website": "Date Project Published to Website",
"summary-deadline-for-submission-of-application": "Deadline for submission of Application", "summary-deadline-for-submission-of-application": "Deadline for submission of Application",
"summary-end-of-representation-period": "End of representation Period", "summary-end-of-representation-period": "End of Initial Representations Period",
"summary-inspector-report-submission-to-welsh-government": "Inspector Report Submission to Welsh Government", "summary-inspector-report-submission-to-welsh-government": "Inspector Report submitted to Planning Directorate of the Welsh Government",
"summary-procedure-confirmed": "Procedure Confirmed", "summary-procedure-confirmed": "Procedure Confirmed",
"summary-reject-request-to-vary-application": "Reject Request to Vary Application", "summary-reject-request-to-vary-application": "Reject Request to Vary Application",
"summary-report-due-by": "Report Due By", "summary-report-due-by": "Report submission estimated by",
"summary-suspension-dates": "Suspension Dates", "summary-suspension-dates": "Suspension Dates",
"summary-suspension-end-dates": "Suspension End Dates", "summary-suspension-end-dates": "Suspension End Dates",
"summary-suspension-start-dates": "Suspension Start Dates", "summary-suspension-start-dates": "Suspension Start Dates",