From 747548f574a969c0756af1092505615c48c863b5 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Wed, 8 Jun 2022 16:30:59 +0100 Subject: [PATCH] add in start event date and type of event --- actions/selectQueryTypes.js | 48 ++++++++----- components/case/summary.js | 16 ++++- .../case/summaryTypes/pinswg_advertsid.js | 44 ++++++++++++ .../case/summaryTypes/pinswg_callinss77id.js | 49 ++++++++++++- .../case/summaryTypes/pinswg_commonlandid.js | 44 ++++++++++++ .../pinswg_communityinfrastructurelevyid.js | 44 ++++++++++++ .../pinswg_compulsorypurchaseordersid.js | 44 ++++++++++++ components/case/summaryTypes/pinswg_dnsid.js | 46 ++++++++++++ .../summaryTypes/pinswg_electricityactid.js | 21 ++++++ ...pinswg_enforcementlistedbuildingconseid.js | 44 ++++++++++++ .../pinswg_enforcementnoticeappeals174id.js | 44 ++++++++++++ .../pinswg_environmentalpermittingid.js | 44 ++++++++++++ ...pinswg_hedgeshedgerowstreepreservatioid.js | 52 +++++++++++++- .../pinswg_householderappealhasid.js | 25 +++++++ ...pinswg_lawfuldevelopmentcertificatappid.js | 44 ++++++++++++ components/case/summaryTypes/pinswg_ldpid.js | 44 ++++++++++++ ...pinswg_listedbuildingandconservationrid.js | 44 ++++++++++++ .../pinswg_maintenanceoflands217id.js | 44 ++++++++++++ .../pinswg_miscellaneouscasewordid.js | 44 ++++++++++++ .../pinswg_planningappeals78id.js | 44 ++++++++++++ .../pinswg_planningconditionss73s79id.js | 44 ++++++++++++ .../pinswg_planningobligationappeals106id.js | 44 ++++++++++++ components/case/summaryTypes/pinswg_rowid.js | 44 ++++++++++++ .../case/summaryTypes/pinswg_wayleaveid.js | 44 ++++++++++++ data/collections.json | 4 +- data/lookuptranslations.json | 72 +++++++++++++++++++ locales/cy/case.json | 4 +- locales/en/case.json | 2 + pages/api/endpoint/getbasicsearch_api.js | 2 +- .../api/endpoint/getbasicsearchdetails_api.js | 2 +- pages/api/endpoint/getmycases_api.js | 2 +- 31 files changed, 1065 insertions(+), 28 deletions(-) diff --git a/actions/selectQueryTypes.js b/actions/selectQueryTypes.js index c11e80e5..125c931f 100644 --- a/actions/selectQueryTypes.js +++ b/actions/selectQueryTypes.js @@ -1,47 +1,63 @@ export const getSelectQuery = (appealTypeName) => { switch (appealTypeName) { case "pinswg_advertses": - return "&$select=_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_procedure,pinswg_questionnaireduedate,statuscode"; + return "&$select=_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_procedure,pinswg_questionnaireduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent"; break; case "pinswg_callinss77s": - return "&$select=_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_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_startdate,statuscode,pinswg_dateexportedtoiss"; + return "&$select=_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_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_startdate,statuscode,pinswg_dateexportedtoiss,pinswg_startdateofevent,pinswg_typeofevent"; break; case "pinswg_commonlands": + return "&$select=_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"; + break; case "pinswg_environmentalpermittings": + return "&$select=_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; case "pinswg_hedgeshedgerowstreepreservationreplacems": case "pinswg_miscellaneouscaseworks": case "pinswg_wayleaves": - return "&$select=_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"; + return "&$select=_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"; break; case "pinswg_communityinfrastructurelevys117118119s": - return "&$select=_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_procedure,pinswg_startdate,statuscode"; + return "&$select=_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_procedure,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent"; break; case "pinswg_compulsorypurchaseorderses": - return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode"; + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,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; case "pinswg_dnses": - 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"; + 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"; + break; case "pinswg_electricityacts": - return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_decision,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode"; + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_decision,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode,pinswg_startdateofevent,pinswg_typeofevent"; + break; case "pinswg_householderappealhases": 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_otherpartiesstatement,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode"; + break; case "pinswg_enforcementnoticeappeals174s": - 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"; + 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_startdateoftheevent,pinswg_typeofevent"; + break; case "pinswg_enforcementlistedbuildingconservationaps": - 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_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdates,pinswg_statementduedate,statuscode"; + 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_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdates,pinswg_statementduedate,statuscode,pinswg_startdateofevent,pinswg_typeofevent"; + break; case "pinswg_maintenanceoflands217s": - 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_startdates,pinswg_statementduedate,statuscode"; + 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_startdates,pinswg_statementduedate,statuscode,pinswg_startdateofevent,pinswg_typeofevent"; + break; case "pinswg_lawfuldevelopmentcertificates": - 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_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode"; + 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_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent"; + break; case "pinswg_listedbuildingandconservationareaconsens": - 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"; + 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; 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"; + 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"; + break; 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"; + 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"; + break; case "pinswg_planningobligationappeals106s": - 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_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode"; + 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_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent"; + break; case "pinswg_rows": - 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_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode"; + 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_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent"; break; default: return ""; diff --git a/components/case/summary.js b/components/case/summary.js index fd39a79d..d2beffba 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -452,7 +452,7 @@ const CaseSummary = (props) => { /> ); break; - case "pinswg_environmentalpermittingid": + case "pinswg_enforcementpermittingid": return ( { 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); - return dd + "/" + mm + "/" + yyyy; + return ( + dd + + "/" + + mm + + "/" + + yyyy + + " " + + (hh == 0 && mins == 0 ? "" : hh + ":" + mins) + ); } function linkedCasesList(linkedCasesReference) { diff --git a/components/case/summaryTypes/pinswg_advertsid.js b/components/case/summaryTypes/pinswg_advertsid.js index ac8e96c1..926dc9a6 100644 --- a/components/case/summaryTypes/pinswg_advertsid.js +++ b/components/case/summaryTypes/pinswg_advertsid.js @@ -96,6 +96,25 @@ const Pinswg_advertsid = (props) => { ] || ""} +
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -324,6 +343,31 @@ const Pinswg_advertsid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateoftheevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateoftheevent + ) + ? formatDates( + detailsObj.pinswg_startdateoftheevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_callinss77id.js b/components/case/summaryTypes/pinswg_callinss77id.js index d28cd5e3..01ce3709 100644 --- a/components/case/summaryTypes/pinswg_callinss77id.js +++ b/components/case/summaryTypes/pinswg_callinss77id.js @@ -96,6 +96,25 @@ const Pinswg_callinss77id = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -259,7 +278,7 @@ const Pinswg_callinss77id = (props) => { )}
-
+ {/*
{t( "case:summary-date-exported-to-iss-label" @@ -283,7 +302,8 @@ const Pinswg_callinss77id = (props) => { "case:summary-no-date-entered-label" )} -
+
*/} +
{t( @@ -420,6 +440,31 @@ const Pinswg_callinss77id = (props) => { )}
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_commonlandid.js b/components/case/summaryTypes/pinswg_commonlandid.js index 5c736e43..7d0c2fcd 100644 --- a/components/case/summaryTypes/pinswg_commonlandid.js +++ b/components/case/summaryTypes/pinswg_commonlandid.js @@ -96,6 +96,25 @@ const Pinswg_commonlandid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -420,6 +439,31 @@ const Pinswg_commonlandid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_starttimeoftheevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_starttimeoftheevent + ) + ? formatDates( + detailsObj.pinswg_starttimeoftheevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js index 57abd0e2..7ac431f8 100644 --- a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js +++ b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js @@ -96,6 +96,25 @@ const Pinswg_communityinfrastructurelevyid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -323,6 +342,31 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateoftheevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateoftheevent + ) + ? formatDates( + detailsObj.pinswg_startdateoftheevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js index 5ae074b6..4dd770ac 100644 --- a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js +++ b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js @@ -78,6 +78,25 @@ const Pinswg_compulsorypurchaseordersid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -402,6 +421,31 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_dnsid.js b/components/case/summaryTypes/pinswg_dnsid.js index bba52130..fdcc5e33 100644 --- a/components/case/summaryTypes/pinswg_dnsid.js +++ b/components/case/summaryTypes/pinswg_dnsid.js @@ -221,6 +221,52 @@ const Pinswg_dnsid = (props) => { : ""}
+
+
+ {t( + "case:summary-type-of-event-label" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-information-to-date-label" + ) + : t( + "case:summary-no-information-to-date-label" + )} +
+
{t("case:summary-event-date-label")} diff --git a/components/case/summaryTypes/pinswg_electricityactid.js b/components/case/summaryTypes/pinswg_electricityactid.js index 8ae9f2a7..c11fd219 100644 --- a/components/case/summaryTypes/pinswg_electricityactid.js +++ b/components/case/summaryTypes/pinswg_electricityactid.js @@ -136,6 +136,27 @@ const Pinswg_electricityactid = (props) => { ] || ""}
+
+
+ {t( + "case:summary-type-of-event-label" + )} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} diff --git a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js index e1f57f9a..9dcc726c 100644 --- a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js +++ b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js @@ -96,6 +96,25 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -400,6 +419,31 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js index 8471d5ca..5d18f2e9 100644 --- a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js +++ b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js @@ -96,6 +96,25 @@ const Pinswg_enforcementnoticeappeals174id = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -400,6 +419,31 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateoftheevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateoftheevent + ) + ? formatDates( + detailsObj.pinswg_startdateoftheevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_environmentalpermittingid.js b/components/case/summaryTypes/pinswg_environmentalpermittingid.js index 46046924..4e830074 100644 --- a/components/case/summaryTypes/pinswg_environmentalpermittingid.js +++ b/components/case/summaryTypes/pinswg_environmentalpermittingid.js @@ -96,6 +96,25 @@ const Pinswg_environmentalpermittingid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -420,6 +439,31 @@ const Pinswg_environmentalpermittingid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js index f2d87455..132ea262 100644 --- a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js +++ b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js @@ -96,6 +96,25 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -201,10 +220,14 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => { ? jsonpath.query( transLookup, '$..[?(@.value=="' + - detailsObj.pinswg_relevantauthorityname + + detailsObj[ + "pinswg_relevantauthorityname@OData.Community.Display.V1.FormattedValue" + ] + '")].value_cy' ) - : detailsObj.pinswg_relevantauthorityname || + : detailsObj[ + "pinswg_relevantauthorityname@OData.Community.Display.V1.FormattedValue" + ] || t( "case:summary-no-date-entered-label" )} @@ -420,6 +443,31 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateoftheevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateoftheevent + ) + ? formatDates( + detailsObj.pinswg_startdateoftheevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_householderappealhasid.js b/components/case/summaryTypes/pinswg_householderappealhasid.js index df418aa8..cc9648b3 100644 --- a/components/case/summaryTypes/pinswg_householderappealhasid.js +++ b/components/case/summaryTypes/pinswg_householderappealhasid.js @@ -349,6 +349,31 @@ const Pinswg_householderappealhasid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js index 1bcfeaa7..cbdfd2d3 100644 --- a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js +++ b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js @@ -96,6 +96,25 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -400,6 +419,31 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateoftheevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateoftheevent + ) + ? formatDates( + detailsObj.pinswg_startdateoftheevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_ldpid.js b/components/case/summaryTypes/pinswg_ldpid.js index 40bda60f..6deacc72 100644 --- a/components/case/summaryTypes/pinswg_ldpid.js +++ b/components/case/summaryTypes/pinswg_ldpid.js @@ -96,6 +96,25 @@ const Pinswg_ldpid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -400,6 +419,31 @@ const Pinswg_ldpid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js index 78cecdb4..aa109969 100644 --- a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js +++ b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js @@ -96,6 +96,25 @@ const Pinswg_listedbuildingandconservationrid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -400,6 +419,31 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_starttimeofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_starttimeofevent + ) + ? formatDates( + detailsObj.pinswg_starttimeofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js index b22f5d55..8a7ab195 100644 --- a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js +++ b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js @@ -96,6 +96,25 @@ const Pinswg_maintenanceoflands217id = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -400,6 +419,31 @@ const Pinswg_maintenanceoflands217id = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js index e56c49b2..4f58b8e8 100644 --- a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js +++ b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js @@ -96,6 +96,25 @@ const Pinswg_miscellaneouscasewordid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -424,6 +443,31 @@ const Pinswg_miscellaneouscasewordid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_planningappeals78id.js b/components/case/summaryTypes/pinswg_planningappeals78id.js index bc4d224b..8c1abd24 100644 --- a/components/case/summaryTypes/pinswg_planningappeals78id.js +++ b/components/case/summaryTypes/pinswg_planningappeals78id.js @@ -96,6 +96,25 @@ const Pinswg_planningappeals78id = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -400,6 +419,31 @@ const Pinswg_planningappeals78id = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdatetimeiftheevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdatetimeiftheevent + ) + ? formatDates( + detailsObj.pinswg_startdatetimeiftheevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js index 77b4699c..e1b3f4cd 100644 --- a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js +++ b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js @@ -96,6 +96,25 @@ const Pinswg_planningconditionss73s79id = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -400,6 +419,31 @@ const Pinswg_planningconditionss73s79id = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js index 0b315ebb..d5f43f6a 100644 --- a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js +++ b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js @@ -96,6 +96,25 @@ const Pinswg_planningobligationappeals106id = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -400,6 +419,31 @@ const Pinswg_planningobligationappeals106id = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateoftheevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateoftheevent + ) + ? formatDates( + detailsObj.pinswg_startdateoftheevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_rowid.js b/components/case/summaryTypes/pinswg_rowid.js index 9167e86c..c5e9bc8b 100644 --- a/components/case/summaryTypes/pinswg_rowid.js +++ b/components/case/summaryTypes/pinswg_rowid.js @@ -96,6 +96,25 @@ const Pinswg_rowid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -420,6 +439,31 @@ const Pinswg_rowid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateoftheevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateoftheevent + ) + ? formatDates( + detailsObj.pinswg_startdateoftheevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/components/case/summaryTypes/pinswg_wayleaveid.js b/components/case/summaryTypes/pinswg_wayleaveid.js index 206f7295..3b4c3f93 100644 --- a/components/case/summaryTypes/pinswg_wayleaveid.js +++ b/components/case/summaryTypes/pinswg_wayleaveid.js @@ -96,6 +96,25 @@ const Pinswg_wayleaveid = (props) => { ] || ""}
+
+
+ {t("case:summary-type-of-event-label")} +
+
+ {router.locale == "cy" + ? jsonpath.query( + transLookup, + '$..[?(@.value=="' + + detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] + + '")].value_cy' + ) + : detailsObj[ + "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue" + ] || ""} +
+
{t("case:summary-status-label")} @@ -420,6 +439,31 @@ const Pinswg_wayleaveid = (props) => {
+
+
+ {t( + "case:summary-start-event-date-label" + )} +
+
+ {_.has( + detailsObj, + "pinswg_startdateofevent" + ) + ? !_.isEmpty( + detailsObj.pinswg_startdateofevent + ) + ? formatDates( + detailsObj.pinswg_startdateofevent + ) + : t( + "case:summary-no-date-entered-label" + ) + : t( + "case:summary-no-date-entered-label" + )} +
+
{t("case:summary-decision-date-label")} diff --git a/data/collections.json b/data/collections.json index 1d74c56f..7d15f8fa 100644 --- a/data/collections.json +++ b/data/collections.json @@ -318,11 +318,11 @@ { "LogicalCollectionName": "pinswg_environmentalpermittings", "LogicalName": "pinswg_environmentalpermitting", - "PrimaryIdAttribute": "pinswg_environmentalpermittingid", + "PrimaryIdAttribute": "pinswg_enforcementpermittingid", "UrlName": "environmentalpermitting", "MetadataId": "62d4aa9a-5682-eb11-aac0-00224800be9c", "appealTypeID": "846040020", - "NavigationProperty": "pinswg_EnvironmentalPermittingIds" + "NavigationProperty": "pinswg_EnforcementPermittingIds" }, { "LogicalCollectionName": "pinswg_enforcementnoticeappeals174s", diff --git a/data/lookuptranslations.json b/data/lookuptranslations.json index ad1e6706..3ef3449c 100644 --- a/data/lookuptranslations.json +++ b/data/lookuptranslations.json @@ -211,6 +211,11 @@ "value": "Problem Solved", "value_cy": "Problem wedi’i Datrys", "statuscode": 6 + }, + { + "value": "Case Closed", + "value_cy": "Achos ar Gau", + "statuscode": 6 } ], "pinswg_decision": [ @@ -546,5 +551,72 @@ "value_cy": "Tynnwyd yn ôl", "pinswg_decision": 846040007 } + ], + "pinswg_typeofevent": [ + { + "value": "Advisory Visit", + "value_cy": "Ymweliad Ymgynghorol", + "pinswg_decision": 846040004 + }, + { + "value": "Advisory Visit (Virtual)", + "value_cy": "Ymweliad Ymgynghorol (Rhithwir)", + "pinswg_decision": 846040011 + }, + { + "value": "Hearing", + "value_cy": "Ymweliad Safle (heb gwmni)", + "pinswg_decision": 846040002 + }, + { + "value": "Hearing (Virtual)", + "value_cy": "Gwrandawiad (Rhithwir)", + "pinswg_decision": 846040007 + }, + { + "value": "In-House", + "value_cy": "Mewnol", + "pinswg_decision": 846040006 + }, + { + "value": "Inquiry", + "value_cy": "ymchwiliad", + "pinswg_decision": 846040012 + }, + { + "value": "Inquiry (Virtual)", + "value_cy": "Yymchwiliad (Rhithwir)", + "pinswg_decision": 846040009 + }, + { + "value": "Pre-Inquiry", + "value_cy": "Ymweliad Safle (heb gwmni)", + "pinswg_decision": 846040003 + }, + { + "value": "Pre-Inquiry (Virtual)", + "value_cy": "Rhag-Ymchwiliad (Rhithwir)", + "pinswg_decision": 846040008 + }, + { + "value": "Site Visit (Access Required)", + "value_cy": "Ymweliad Safle (Angen Mynediad)", + "pinswg_decision": 846040005 + }, + { + "value": "Site visit (Accompanied)", + "value_cy": "Ymweliad safle (yng nghwmni)", + "pinswg_decision": 846040001 + }, + { + "value": "Site Visit (Un-accompanied)", + "value_cy": "Ymweliad Safle (heb gwmni)", + "pinswg_decision": 846040000 + }, + { + "value": "Site Visit (Virtual)", + "value_cy": "Ymweliad safle (Rhithwir)", + "pinswg_decision": 846040010 + } ] } \ No newline at end of file diff --git a/locales/cy/case.json b/locales/cy/case.json index a65451fc..3e395d38 100644 --- a/locales/cy/case.json +++ b/locales/cy/case.json @@ -16,6 +16,7 @@ "summary-case-summary-label": "Crynodeb o'r Achos", "summary-case-officer-label": "Swyddog Achos", "summary-procedure-label": "Gweithdrefn", + "summary-type-of-event-label": "Math o ddigwyddiad", "summary-status-label": "Statws", "summary-decision-label": "Penderfyniad a chanlyniad", "summary-case-link-status-label": "Statws cysylltiad yr Achos", @@ -34,7 +35,8 @@ "summary-interested-party-date-label": "Sylwadau Parti â Buddiant i ddod", "summary-applicant-final-comments-date-label": "Sylwadau Terfynol yr Apelydd/ACLl i ddod", "summary-inquiry-evidence-date-label": "Tystiolaeth yr Ymchwiliad i ddod", - "summary-event-date-label": "Dyddiad y Digwyddiad", + "summary-start-event-date-label": "Start date of event", + "summary-event-date-label": "Dyddiad cychwyn y digwyddiad", "summary-decision-date-label": "Dyddiad y Penderfyniad", "summary-documents-button-label": "Dogfennau", "documents-document-count-label": "Dogfennau", diff --git a/locales/en/case.json b/locales/en/case.json index ad0dc2c4..f15cf3aa 100644 --- a/locales/en/case.json +++ b/locales/en/case.json @@ -16,6 +16,7 @@ "summary-case-summary-label": "Case Summary", "summary-case-officer-label": "Case Officer", "summary-procedure-label": "Procedure", + "summary-type-of-event-label": "Type of event", "summary-status-label": "Status", "summary-decision-label": "Decision and Outcome", "summary-case-link-status-label": "Case Link Status", @@ -34,6 +35,7 @@ "summary-interested-party-date-label": "Interested Party Comments due", "summary-applicant-final-comments-date-label": "Appellant/LPA Final Comments due", "summary-inquiry-evidence-date-label": "Inquiry Evidence due", + "summary-start-event-date-label": "Start date of event", "summary-event-date-label": "Event Date", "summary-decision-date-label": "Decision Date", "summary-documents-button-label": "Documents", diff --git a/pages/api/endpoint/getbasicsearch_api.js b/pages/api/endpoint/getbasicsearch_api.js index 396fa471..90ccf283 100644 --- a/pages/api/endpoint/getbasicsearch_api.js +++ b/pages/api/endpoint/getbasicsearch_api.js @@ -32,7 +32,7 @@ export default async function ApiProxy(req, res) { searchString + "')) and pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true"; - //console.log("basic search ", queryUrl); + console.log("basic search ", queryUrl); var apiResponse = _.isEmpty(req.query) ? res.status(400).json() diff --git a/pages/api/endpoint/getbasicsearchdetails_api.js b/pages/api/endpoint/getbasicsearchdetails_api.js index 608efbfa..0abcb60b 100644 --- a/pages/api/endpoint/getbasicsearchdetails_api.js +++ b/pages/api/endpoint/getbasicsearchdetails_api.js @@ -34,7 +34,7 @@ export default async function ApiProxy(req, res) { queryUrl = queryUrl + getSelectQuery(appealTypeName); - //console.log("query: ", queryUrl, "<<<