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

Merged PR 1585: Env Permitting fix and 14624

Browse Source 
Related work items: #14624
This commit is contained in:
Robert Bond
2025-04-27 13:16:03 +00:00
parent b6798fbfca 372e1bf7ce
commit 0f7a9c36df
9 changed files with 300 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/selectQueryTypes.js
+2 -2
View File
@@ -10,7 +10,7 @@ export const getSelectQuery = (appealTypeName) => {
return "&$select=pinswg_detailedeiascreeningrequired,modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_starttimeoftheevent,pinswg_typeofevent,pinswg_statementsduedate"; return "&$select=pinswg_detailedeiascreeningrequired,modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_starttimeoftheevent,pinswg_typeofevent,pinswg_statementsduedate";
break; break;
case "pinswg_environmentalpermittings": case "pinswg_environmentalpermittings":
return "&$select=pinswg_eiarequired,modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateofevent,pinswg_typeofevent"; return "&$select=pinswg_detailedeiascreeningrequired,modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateofevent,pinswg_typeofevent";
break; break;
case "pinswg_hedgeshedgerowstreepreservationreplacems": case "pinswg_hedgeshedgerowstreepreservationreplacems":
return "&$select=pinswg_detailedeiascreening,pinswg_specialistcaseprocess,modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_statementduedate,pinswg_specialistcaseprocess"; return "&$select=pinswg_detailedeiascreening,pinswg_specialistcaseprocess,modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_statementduedate,pinswg_specialistcaseprocess";
@@ -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"; 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": 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_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"; 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";
break; break;
default: default:
return ""; return "";
components/case/summary.js
+180 -424
View File
@@ -32,32 +32,17 @@ import { signIn, useSession } from "next-auth/react";
import { destroyCookie, parseCookies, setCookie } from "nookies"; import { destroyCookie, parseCookies, setCookie } from "nookies";
import { getFormCollectionByID, getDetailsProxy } from "../utils"; import { getFormCollectionByID, getDetailsProxy } from "../utils";
import Pinswg_advertsid from "./summaryTypes/pinswg_advertsid"; import * as CaseTypes from "./summaryTypes"; // ✅ must match filename exactly
import Pinswg_callinss77id from "./summaryTypes/pinswg_callinss77id"; import {
import Pinswg_commonlandid from "./summaryTypes/pinswg_commonlandid"; capitalizeFirstLetter,
import Pinswg_communityinfrastructurelevyid from "./summaryTypes/pinswg_communityinfrastructurelevyid"; formatDates,
import Pinswg_compulsorypurchaseordersid from "./summaryTypes/pinswg_compulsorypurchaseordersid"; showReps,
import Pinswg_dnsid from "./summaryTypes/pinswg_dnsid"; hasValidKey,
import Pinswg_sipscase from "./summaryTypes/pinswg_sipscase"; isObjectNotEmpty,
import Pinswg_electricityactid from "./summaryTypes/pinswg_electricityactid"; hasOwnPropertyAndNotNull,
import Pinswg_enforcementlistedbuildingconseid from "./summaryTypes/pinswg_enforcementlistedbuildingconseid"; linkedCasesList,
import Pinswg_enforcementnoticeappeals174id from "./summaryTypes/pinswg_enforcementnoticeappeals174id"; } from "./summary/utils/helpers";
import Pinswg_environmentalpermittingid from "./summaryTypes/pinswg_environmentalpermittingid";
import Pinswg_harbourrevisionorderid from "./summaryTypes/pinswg_harbourrevisionorderid";
import Pinswg_hedgeshedgerowstreepreservatioid from "./summaryTypes/pinswg_hedgeshedgerowstreepreservatioid";
import Pinswg_householderappealhasid from "./summaryTypes/pinswg_householderappealhasid";
import Pinswg_lawfuldevelopmentcertificatappid from "./summaryTypes/pinswg_lawfuldevelopmentcertificatappid";
import Pinswg_ldpid from "./summaryTypes/pinswg_ldpid";
import Pinswg_listedbuildingandconservationrid from "./summaryTypes/pinswg_listedbuildingandconservationrid";
import Pinswg_maintenanceoflands217id from "./summaryTypes/pinswg_maintenanceoflands217id";
import Pinswg_miscellaneouscasewordid from "./summaryTypes/pinswg_miscellaneouscasewordid";
import Pinswg_nonvalidationid from "./summaryTypes/pinswg_nonvalidationid";
import Pinswg_planningappeals78id from "./summaryTypes/pinswg_planningappeals78id";
import Pinswg_planningconditionss73s79id from "./summaryTypes/pinswg_planningconditionss73s79id";
import Pinswg_planningobligationappeals106id from "./summaryTypes/pinswg_planningobligationappeals106id";
import Pinswg_rowid from "./summaryTypes/pinswg_rowid";
import Pinswg_transportandworkactid from "./summaryTypes/pinswg_transportandworkactid";
import Pinswg_wayleaveid from "./summaryTypes/pinswg_wayleaveid";
import CaseNoticeBanner from "./caseNoticeBanner"; import CaseNoticeBanner from "./caseNoticeBanner";
import WatchModal from "./watchmodal"; import WatchModal from "./watchmodal";
import EIADetails from "./eia"; import EIADetails from "./eia";
@@ -269,23 +254,6 @@ const CaseSummary = (props) => {
const zoom = isNaN(parseFloat(siteCoords.latitude)) ? 7 : 12; const zoom = isNaN(parseFloat(siteCoords.latitude)) ? 7 : 12;
function hasValidKey(obj, key) {
return (
obj.hasOwnProperty(key) &&
obj[key] !== null &&
obj[key] !== undefined &&
obj[key] !== ""
);
}
function hasOwnPropertyAndNotNull(obj, property) {
return obj.hasOwnProperty(property) && obj[property] !== null;
}
function isObjectNotEmpty(obj, key) {
return obj.hasOwnProperty(key) && Object.keys(obj[key]).length > 0;
}
let showDetailsBlock = let showDetailsBlock =
showDetails == true ? ( showDetails == true ? (
<> <>
@@ -729,6 +697,115 @@ const CaseSummary = (props) => {
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-button-group"> <div className="govuk-button-group">
{getFormCollectionByID(
appealTypeID
).PrimaryIdAttribute ==
"pinswg_sipscase" &&
showReps(
detailsObj.pinswg_consultationopen,
detailsObj.pinswg_consultationclose
) && (
<>
{showRepButton(
props
.currentView
.caseReference
.appealType
) ? (
<>
<Link
href={{
pathname:
"/myportal/representation",
query: {
case:
currentType ==
"searchResultsObj"
? detailsObj.pinswg_name
: currentType ==
"watchedCases"
? casesObj.pinswg_title
: currentType ==
"directResultsObj"
? detailsObj.pinswg_name
: casesObj.reference,
},
}}
className="govuk-button"
>
{props
.currentView
.caseReference
.appealType ==
846040002
? t(
"case:summary-make-consultation-label"
)
: t(
"case:summary-make-representation-label"
)}
</Link>
<a
onClick={() => {
//spinnerState();
router.back();
}}
className="govuk-button govuk-button--secondary"
>
{t(
"case:summary-back-button-label"
)}
</a>
</>
) : !isLPA &&
props.currentView
.caseReference
.appealType ==
846040004 ? (
""
) : (
<>
<div className="govuk-grid-column-full govuk-!-padding-left-0">
<div className="govuk-button-group">
<p className="govuk-body">
{t(
"case:representation-date-passed-label",
{
startDate:
formatDates(
detailsObj.pinswg_consultationopen
),
endDate:
formatDates(
detailsObj.pinswg_consultationclose
),
}
)}
<br />{" "}
{t(
"case:representation-date-passed-additional-label"
)}{" "}
<Link
href={
"mailto:" +
t(
"home:login-contact-email"
)
}
>
{t(
"home:login-contact-email"
)}
</Link>
</p>
</div>
</div>
</>
)}
</>
)}
{(_.has( {(_.has(
detailsObj, detailsObj,
"pinswg_startdate" "pinswg_startdate"
@@ -776,9 +853,17 @@ const CaseSummary = (props) => {
}} }}
className="govuk-button" className="govuk-button"
> >
{t( {props
"case:summary-make-representation-label" .currentView
)} .caseReference
.appealType ==
846040002
? t(
"case:summary-make-consultation-label"
)
: t(
"case:summary-make-representation-label"
)}
</Link> </Link>
<a <a
@@ -1045,9 +1130,17 @@ const CaseSummary = (props) => {
detailsObj.pinswg_finalcommentsduedate detailsObj.pinswg_finalcommentsduedate
) && ( ) && (
<div className="govuk-body"> <div className="govuk-body">
{t( {props.currentView
"case:representation-period-ended-on-label" .caseReference
)} .appealType ==
84604002
? t(
"case:consultation-period-ended-on-label"
)
: t(
"case:representation-period-ended-on-label"
)}
{props.currentView {props.currentView
.caseReference .caseReference
.appealType == .appealType ==
@@ -1073,7 +1166,15 @@ const CaseSummary = (props) => {
} }
id="case-summary" id="case-summary"
> >
{showSummary(casesObj, detailsObj)} {showSummary(
appealTypeID,
casesObj,
detailsObj,
formatDates,
linkedCasesList,
currentView,
showMap
)}
</div> </div>
{((hasValidKey( {((hasValidKey(
@@ -1559,13 +1660,6 @@ const CaseSummary = (props) => {
showFilteredDocs={props.showFilteredDocs} showFilteredDocs={props.showFilteredDocs}
/> />
</div> </div>
{/* <WatchModal
isOpen={isModalOpen}
onClose={handleCloseModal}
casesObj={casesObj}
currentType={currentType}
props={props}
/> */}
</div> </div>
</div> </div>
</> </>
@@ -1591,9 +1685,14 @@ const CaseSummary = (props) => {
href="/representation" href="/representation"
className="govuk-button" className="govuk-button"
> >
{t( {props.currentView.caseReference
"case:summary-make-representation-label" .appealType == 846040002
)} ? t(
"case:summary-make-consultation-label"
)
: t(
"case:summary-make-representation-label"
)}
</Link> </Link>
)} )}
@@ -1613,303 +1712,29 @@ const CaseSummary = (props) => {
</> </>
); );
function showSummary(casesObj, detailsObj) { function showSummary(
let appealIDObj = appealTypeID,
getFormCollectionByID(appealTypeID).PrimaryIdAttribute; casesObj,
detailsObj,
formatDates,
linkedCasesList,
currentView,
showMap
) {
const id = getFormCollectionByID(appealTypeID).PrimaryIdAttribute;
switch (appealIDObj) { const Component = CaseTypes[capitalizeFirstLetter(id)];
case "pinswg_advertsid":
return (
<Pinswg_advertsid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_callinss77id":
return (
<Pinswg_callinss77id
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_commonlandid":
return (
<Pinswg_commonlandid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_communityinfrastructurelevyid":
return (
<Pinswg_communityinfrastructurelevyid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_compulsorypurchaseordersid": return Component ? (
return ( <Component
<Pinswg_compulsorypurchaseordersid casesObj={casesObj}
casesObj={casesObj} detailsObj={detailsObj}
detailsObj={detailsObj} formatDates={formatDates}
formatDates={formatDates} linkedCasesList={linkedCasesList}
linkedCasesList={linkedCasesList} currentView={currentView}
currentView={props.currentView} showMap={showMap}
/> />
); ) : null;
break;
case "pinswg_dnsid":
return (
<Pinswg_dnsid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
showMap={showMap}
/>
);
break;
case "pinswg_sipscase":
return (
<Pinswg_sipscase
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
showMap={showMap}
/>
);
break;
case "pinswg_electricityactid":
return (
<Pinswg_electricityactid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_enforcementlistedbuildingconseid":
return (
<Pinswg_enforcementlistedbuildingconseid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_enforcementnoticeappeals174id":
return (
<Pinswg_enforcementnoticeappeals174id
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_enforcementpermittingid":
return (
<Pinswg_environmentalpermittingid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_harbourrevisionorderid":
return (
<Pinswg_harbourrevisionorderid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_hedgeshedgerowstreepreservatioid":
return (
<Pinswg_hedgeshedgerowstreepreservatioid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_householderappealhasid":
return (
<Pinswg_householderappealhasid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_lawfuldevelopmentcertificatappid":
return (
<Pinswg_lawfuldevelopmentcertificatappid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_ldpid":
return (
<Pinswg_ldpid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_listedbuildingandconservationrid":
return (
<Pinswg_listedbuildingandconservationrid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_maintenanceoflands217id":
return (
<Pinswg_maintenanceoflands217id
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_miscellaneouscasewordid":
return (
<Pinswg_miscellaneouscasewordid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_nonvalidationid":
return (
<Pinswg_nonvalidationid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_planningappeals78id":
return (
<Pinswg_planningappeals78id
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_planningconditionss73s79id":
return (
<Pinswg_planningconditionss73s79id
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_planningobligationappeals106id":
return (
<Pinswg_planningobligationappeals106id
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_rowid":
return (
<Pinswg_rowid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_transportandworkactid":
return (
<Pinswg_transportandworkactid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
case "pinswg_wayleaveid":
return (
<Pinswg_wayleaveid
casesObj={casesObj}
detailsObj={detailsObj}
formatDates={formatDates}
linkedCasesList={linkedCasesList}
currentView={props.currentView}
/>
);
break;
}
} }
useEffect(() => { useEffect(() => {
@@ -1931,67 +1756,6 @@ const CaseSummary = (props) => {
expDate.setDate(now.getDate() + 365); expDate.setDate(now.getDate() + 365);
function formatDates(dateObj, showTime) {
var dateObj = new Date(dateObj);
var dd = String(dateObj.getDate()).padStart(2, "0");
var mm = String(dateObj.getMonth() + 1).padStart(2, "0"); //January is 0!
var yyyy = dateObj.getFullYear();
var hh = dateObj.getHours();
hh = ("0" + hh).slice(-2);
var mins = dateObj.getMinutes();
mins = ("0" + mins).slice(-2);
const dateStr = showTime
? hh == 0 && mins == 0
? ""
: hh + ":" + mins
: dd + "/" + mm + "/" + yyyy + " ";
return dateStr;
}
function linkedCasesList(linkedCasesReference) {
//console.log(linkedCasesReference);
linkedCasesReference = linkedCasesReference.value || [];
return (
<>
<ul className="govuk-list govuk-!-font-size-16">
{linkedCasesReference.map((item, key) => {
return (
<li key={key}>
<Link
href={
router.locale == "cy"
? "/canlyniadauchwilio?q=" +
item.title +
"&lk=1"
: "/searchresults?q=" +
item.title +
"&lk=1"
}
className=""
>
{item.title}
</Link>
</li>
);
//console.log(item.incidentid, item.title);
})}
</ul>
</>
);
}
function showReps(startDate, endDate) {
let date = new Date();
date = new Date(date.toDateString());
const start = new Date(startDate);
const end = new Date(endDate);
return date >= start && date <= end ? true : false;
}
function showRepButton(appealType) { function showRepButton(appealType) {
switch (appealType) { switch (appealType) {
case 846040012: case 846040012:
@@ -2039,14 +1803,6 @@ const CaseSummary = (props) => {
} }
} }
function showRepsEnded(startDate, endDate) {
let date = new Date();
date = new Date(date.toDateString());
const start = new Date(startDate);
const end = new Date(endDate);
return date > start && date > end ? true : false;
}
if (status == "authenticated" && cookies.pedwWatchCase != null) { if (status == "authenticated" && cookies.pedwWatchCase != null) {
selectWatchedCase( selectWatchedCase(
props.accountDetails.accountDetails.contactid, props.accountDetails.accountDetails.contactid,
components/case/summary/utils/helpers.js
+76
View File
@@ -0,0 +1,76 @@
export function capitalizeFirstLetter(val) {
return String(val).charAt(0).toUpperCase() + String(val).slice(1);
}
export function formatDates(dateObj, showTime) {
const d = new Date(dateObj);
const dd = String(d.getDate()).padStart(2, "0");
const mm = String(d.getMonth() + 1).padStart(2, "0");
const yyyy = d.getFullYear();
const hh = String(d.getHours()).padStart(2, "0");
const mins = String(d.getMinutes()).padStart(2, "0");
return showTime && !(hh === "00" && mins === "00")
? `${hh}:${mins}`
: `${dd}/${mm}/${yyyy}`;
}
export function hasValidKey(obj, key) {
return obj?.hasOwnProperty(key) && obj[key] !== null && obj[key] !== "";
}
export function showReps(startDate, endDate) {
const now = new Date();
const start = new Date(startDate);
const end = new Date(endDate);
return now >= start && now <= end;
}
export function showRepsEnded(startDate, endDate) {
const now = new Date();
const start = new Date(startDate);
const end = new Date(endDate);
return now > start && now > end;
}
export function isObjectNotEmpty(obj, key) {
return obj.hasOwnProperty(key) && Object.keys(obj[key]).length > 0;
}
export function hasOwnPropertyAndNotNull(obj, property) {
return obj.hasOwnProperty(property) && obj[property] !== null;
}
export function linkedCasesList(linkedCasesReference) {
//console.log(linkedCasesReference);
linkedCasesReference = linkedCasesReference.value || [];
return (
<>
<ul className="govuk-list govuk-!-font-size-16">
{linkedCasesReference.map((item, key) => {
return (
<li key={key}>
<Link
href={
router.locale == "cy"
? "/canlyniadauchwilio?q=" +
item.title +
"&lk=1"
: "/searchresults?q=" +
item.title +
"&lk=1"
}
className=""
>
{item.title}
</Link>
</li>
);
//console.log(item.incidentid, item.title);
})}
</ul>
</>
);
}
components/case/summaryTypes/index.js
+26
View File
@@ -0,0 +1,26 @@
export { default as Pinswg_advertsid } from "./pinswg_advertsid";
export { default as Pinswg_callinss77id } from "./pinswg_callinss77id";
export { default as Pinswg_commonlandid } from "./pinswg_commonlandid";
export { default as Pinswg_communityinfrastructurelevyid } from "./pinswg_communityinfrastructurelevyid";
export { default as Pinswg_compulsorypurchaseordersid } from "./pinswg_compulsorypurchaseordersid";
export { default as Pinswg_dnsid } from "./pinswg_dnsid";
export { default as Pinswg_sipscase } from "./pinswg_sipscase";
export { default as Pinswg_electricityactid } from "./pinswg_electricityactid";
export { default as Pinswg_enforcementlistedbuildingconseid } from "./pinswg_enforcementlistedbuildingconseid";
export { default as Pinswg_enforcementnoticeappeals174id } from "./pinswg_enforcementnoticeappeals174id";
export { default as Pinswg_environmentalpermittingid } from "./pinswg_environmentalpermittingid";
export { default as Pinswg_harbourrevisionorderid } from "./pinswg_harbourrevisionorderid";
export { default as Pinswg_hedgeshedgerowstreepreservatioid } from "./pinswg_hedgeshedgerowstreepreservatioid";
export { default as Pinswg_householderappealhasid } from "./pinswg_householderappealhasid";
export { default as Pinswg_lawfuldevelopmentcertificatappid } from "./pinswg_lawfuldevelopmentcertificatappid";
export { default as Pinswg_ldpid } from "./pinswg_ldpid";
export { default as Pinswg_listedbuildingandconservationrid } from "./pinswg_listedbuildingandconservationrid";
export { default as Pinswg_maintenanceoflands217id } from "./pinswg_maintenanceoflands217id";
export { default as Pinswg_miscellaneouscasewordid } from "./pinswg_miscellaneouscasewordid";
export { default as Pinswg_nonvalidationid } from "./pinswg_nonvalidationid";
export { default as Pinswg_planningappeals78id } from "./pinswg_planningappeals78id";
export { default as Pinswg_planningconditionss73s79id } from "./pinswg_planningconditionss73s79id";
export { default as Pinswg_planningobligationappeals106id } from "./pinswg_planningobligationappeals106id";
export { default as Pinswg_rowid } from "./pinswg_rowid";
export { default as Pinswg_transportandworkactid } from "./pinswg_transportandworkactid";
export { default as Pinswg_wayleaveid } from "./pinswg_wayleaveid";
components/search/repsonresults.js
+8 -3
View File
@@ -119,9 +119,14 @@ const RepsOnResults = (props) => {
)} )}
</Link> */} </Link> */}
<div className="govuk-body govuk-!-font-size-14"> <div className="govuk-body govuk-!-font-size-14">
{t( {props.currentView.caseReference
"case:summary-representation-open-label" .appealType == 846040002
)}{" "} ? t(
"case:summary-consultation-open-label"
)
: t(
"case:summary-representation-open-label"
)}{" "}
</div> </div>
</> </>
) : !isLPA && ) : !isLPA &&
locales/cy/auth.json
+1 -1
View File
@@ -10,7 +10,7 @@
"auth-error-Signin-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.", "auth-error-Signin-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.",
"auth-error-OAuthSignin-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.", "auth-error-OAuthSignin-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.",
"auth-error-OAuthCallback-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.", "auth-error-OAuthCallback-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.",
"auth-error- OAuthCreateAccount-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.", "auth-error-OAuthCreateAccount-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.",
"auth-error-EmailCreateAccount-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.", "auth-error-EmailCreateAccount-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.",
"auth-error-Callback-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.", "auth-error-Callback-label": "Ceisiwch fewngofnodi gyda chyfrif gwahanol.",
"auth-error-OAuthAccountNotLinked-label": "I gadarnhau pwy ydych, mewngofnodwch gyda'r un cyfrif a ddefnyddioch yn wreiddiol.", "auth-error-OAuthAccountNotLinked-label": "I gadarnhau pwy ydych, mewngofnodwch gyda'r un cyfrif a ddefnyddioch yn wreiddiol.",
locales/cy/case.json
+3
View File
@@ -17,7 +17,9 @@
"summary-environmental-statement-label": "Lleoliad Datganiad Amgylcheddol", "summary-environmental-statement-label": "Lleoliad Datganiad Amgylcheddol",
"summary-last-modified-label": "Addaswyd ddiwethaf", "summary-last-modified-label": "Addaswyd ddiwethaf",
"summary-make-representation-label": "Cyflwyno sylwadau", "summary-make-representation-label": "Cyflwyno sylwadau",
"summary-make-consultation-label": "Cyflwyno Ymateb i'r Ymgynghoriad",
"summary-representation-open-label": "Cynrychioliadau yn agor", "summary-representation-open-label": "Cynrychioliadau yn agor",
"summary-consultation-open-label": "Ymgynghoriad ar agor",
"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",
"summary-project-details-label": "Manylion y Prosiect", "summary-project-details-label": "Manylion y Prosiect",
@@ -98,6 +100,7 @@
"representation-comments": "Sylwadau", "representation-comments": "Sylwadau",
"representation-files": "Ffeiliau perthnasol", "representation-files": "Ffeiliau perthnasol",
"representation-period-ended-on-label": "Daeth y Cyfnod Sylwadau i ben ar ", "representation-period-ended-on-label": "Daeth y Cyfnod Sylwadau i ben ar ",
"consultation-period-ended-on-label": "Daeth y Cyfnod Ymgynghori i ben ar",
"stop-watching-case-link": "Stopiwch wylio'r achos hwn", "stop-watching-case-link": "Stopiwch wylio'r achos hwn",
"watch-this-case-link": "Gwyliwch yr achos hwn", "watch-this-case-link": "Gwyliwch yr achos hwn",
"you-are-watching-label": "Ydych chi eisiau gwylio achos ", "you-are-watching-label": "Ydych chi eisiau gwylio achos ",
locales/en/auth.json
+1 -1
View File
@@ -10,7 +10,7 @@
"auth-error-Signin-label": "Try signing with a different account.", "auth-error-Signin-label": "Try signing with a different account.",
"auth-error-OAuthSignin-label": "Try signing with a different account.", "auth-error-OAuthSignin-label": "Try signing with a different account.",
"auth-error-OAuthCallback-label": "Try signing with a different account.", "auth-error-OAuthCallback-label": "Try signing with a different account.",
"auth-error- OAuthCreateAccount-label": "Try signing with a different account.", "auth-error-OAuthCreateAccount-label": "Try signing with a different account.",
"auth-error-EmailCreateAccount-label": "Try signing with a different account.", "auth-error-EmailCreateAccount-label": "Try signing with a different account.",
"auth-error-Callback-label": "Try signing with a different account.", "auth-error-Callback-label": "Try signing with a different account.",
"auth-error-OAuthAccountNotLinked-label": "To confirm your identity, sign in with the same account you used originally.", "auth-error-OAuthAccountNotLinked-label": "To confirm your identity, sign in with the same account you used originally.",
locales/en/case.json
+3
View File
@@ -17,7 +17,9 @@
"summary-environmental-statement-label": "Environmental Statement Location", "summary-environmental-statement-label": "Environmental Statement Location",
"summary-last-modified-label": "Last modified", "summary-last-modified-label": "Last modified",
"summary-make-representation-label": "Make representation", "summary-make-representation-label": "Make representation",
"summary-make-consultation-label": "Submit a Consultation Response",
"summary-representation-open-label": "Representations open", "summary-representation-open-label": "Representations open",
"summary-consultation-open-label": "Consultation open",
"summary-back-button-label": "Go back", "summary-back-button-label": "Go back",
"summary-case-details-label": "Case Details", "summary-case-details-label": "Case Details",
"summary-project-details-label": "Project Details", "summary-project-details-label": "Project Details",
@@ -98,6 +100,7 @@
"representation-comments": "Representation", "representation-comments": "Representation",
"representation-files": "Relevant files", "representation-files": "Relevant files",
"representation-period-ended-on-label": "Representation Period ended on ", "representation-period-ended-on-label": "Representation Period ended on ",
"consultation-period-ended-on-label": "Consultation Period ended on ",
"stop-watching-case-link": "Stop watching this case", "stop-watching-case-link": "Stop watching this case",
"watch-this-case-link": "Watch this case", "watch-this-case-link": "Watch this case",
"you-are-watching-label": "Do you want to watch case ", "you-are-watching-label": "Do you want to watch case ",