diff --git a/components/case/representation/index.js b/components/case/representation/index.js index 04bf9c92..de82acfb 100644 --- a/components/case/representation/index.js +++ b/components/case/representation/index.js @@ -34,6 +34,8 @@ let MakeRepresentation = (props) => { const [clearRepForm, setClearRepForm] = useState(false); const [savingStatus, setSavingStatus] = useState(false); + const [finaliseAppealProcess, setFinaliseAppealProcess] = useState(false); + //const [questionnaireCount, setQuestionnaireCount] = useState(0); const { data: session } = useSession(); @@ -347,14 +349,14 @@ let MakeRepresentation = (props) => { currentView.caseReference.appealType != 846040015 && currentView.caseReference.appealType != 846040016 && todaysDate >= startDate && - todaysDate <= questionnaireDate && + todaysDate <= finalCommentsDate && buildArr.push("Questionnaire"); isLPA && isDNS && currentView.caseReference.appealType != 846040019 && todaysDate >= startDate && - todaysDate <= questionnaireDate && + todaysDate <= finalCommentsDate && buildArr.push("Local Impact Report"); !isDNS && @@ -879,7 +881,6 @@ let MakeRepresentation = (props) => { }; const onHandleSubmit = (values) => { - window.scrollTo({ top: 0, behavior: "smooth" }); values = setRepFileName(values); //console.log("onHandleSubmit form values - ", JSON.stringify(values)); @@ -1014,6 +1015,7 @@ let MakeRepresentation = (props) => { setRepresentationSubmit(true); } } + window.scrollTo({ top: 0, behavior: "smooth" }); } else { if (currentView.representationSubmit == true) { console.log("capacity", currentView.representationCapacity); @@ -1034,18 +1036,22 @@ let MakeRepresentation = (props) => { // Object.assign(values, { // "filesList": buildFileArray, // })), - console.log( - "====================== rep lpa payload:\n", - JSON.stringify(values) - ); + // console.log( + // "====================== rep lpa payload:\n", + // JSON.stringify(values) + // ); + setFinaliseAppealProcess(true); generateRepPDF( values, props.props.accountDetails.containerID, currentView.caseReference.currentReference - ); - uploadRepresentationFiles(values); - setRepresentationSubmit(true); - setRepresentationSubmitConfirmation(true); + ).then((data) => { + console.log(data); + data.status == "success" && + (uploadRepresentationFiles(values), + setRepresentationSubmit(true), + setRepresentationSubmitConfirmation(true)); + }); } else { console.log("not updated"); } @@ -1148,6 +1154,8 @@ let MakeRepresentation = (props) => { showQuestionnaireSection={showQuestionnaireSection} props={props} questionnaireCount={questionnaireCount} + finaliseAppealProcess={finaliseAppealProcess} + setFinaliseAppealProcess={setFinaliseAppealProcess} /> ) : ( <> diff --git a/components/case/representation/representationCompleteSubmit.js b/components/case/representation/representationCompleteSubmit.js index 9208d995..57cf569c 100644 --- a/components/case/representation/representationCompleteSubmit.js +++ b/components/case/representation/representationCompleteSubmit.js @@ -29,6 +29,7 @@ const RepCompleteSubmit = (props) => { setShowQuestionnaireSection, showQuestionnaireSection, questionnaireCount, + finaliseAppealProcess, } = props; const { acceptedFiles, getRootProps, getInputProps } = useDropzone(); const files = acceptedFiles.map((file) => ( @@ -473,72 +474,83 @@ const RepCompleteSubmit = (props) => { )}

-
-
-
- { - setConfirmSections( - !confirmSections - ); - }} - /> - -
+ {finaliseAppealProcess ? ( +
+

+ Finalising your representation + submission +

+

+ Currenly uploading files and finalising + your representation submission +

+

+ Please wait +

+ ) : ( + <> +
+
+
+ { + setConfirmSections( + !confirmSections + ); + }} + /> + +
+
+
- {/* */} -
-
-
-
- - {/* { - setRepresentationSubmit(false); - }} - className="govuk-button" - > - {t("common:continue-button")} - */} - - setSubmitBack()} - className="govuk-link" - > - {t("case:summary-back-button-label")} - -
+
+
+ + setSubmitBack()} + className="govuk-link" + > + {t( + "case:summary-back-button-label" + )} + +
+
+ + )}
diff --git a/components/case/representation/representationProgress/representationProgress_enforcement.js b/components/case/representation/representationProgress/representationProgress_enforcement.js index 6d5c7dd1..cd7d3221 100644 --- a/components/case/representation/representationProgress/representationProgress_enforcement.js +++ b/components/case/representation/representationProgress/representationProgress_enforcement.js @@ -455,7 +455,7 @@ const RepresentationProgress_enforcement = (props) => { > {t( - "myrepresentations:enf-section-heading-seven" + "myrepresentations:s78-section-heading-five-sub" )} diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js index b8d4d1a1..097d44be 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js @@ -126,9 +126,10 @@ let Enforcement_Questionnaire = (props) => {
{ {t("myrepresentations:enf-section-heading-six")}
- 31 .{t("myrepresentations:enf-section-question-31")} + 31. {t("myrepresentations:enf-section-question-31")}
@@ -946,8 +947,11 @@ let Enforcement_Questionnaire = (props) => { aria-describedby="commentBox-hint" >

- {t("myrepresentations:enf-section-heading-seven")} + {t("myrepresentations:s78-section-heading-five-sub")}

+

+ {t("myrepresentations:s78-section-heading-five")} +

{ conditionalLabel={t( "myrepresentations:enf-section-question-37-hint" )} + hint={ + "Regulation 45 of the Town and Country Planning (Environmental Impact Assessment) (Wales) Regulations 2017 (as amended)." + } optionSelect={t( "myrepresentations:questionnaire-yes" )} @@ -1244,6 +1251,7 @@ let Enforcement_Questionnaire = (props) => { label={t( "myrepresentations:enf-section-question-onbehalf" )} + disabled={true} validate={[required]} />
@@ -1253,9 +1261,9 @@ let Enforcement_Questionnaire = (props) => { label={t("myrepresentations:enf-section-question-date")} component={RenderDatePicker} validate={[required]} - errorMsg={t("newappeal:select-a-date-label")} + errorMsg={t("myrepresentations:select-a-date-label")} dateStart="0" - dateEnd="1-y" + dateEnd="0" /> )} diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js index cda5716f..0c62a866 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js @@ -1079,7 +1079,7 @@ let S78_Questionnaire = (props) => { validate={[required]} dateStart="0" dateEnd="0" - errorMsg={t("myrepresentations:is-required-label")} + errorMsg={t("myrepresentations:select-a-date-label")} locale={locale} /> diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js index 8b0dcd82..064b5681 100644 --- a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js +++ b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js @@ -27,7 +27,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- 5. Which procedure do you consider the appeal + 4. Which procedure do you consider the appeal should follow?
@@ -69,7 +69,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- { @@ -80,11 +80,11 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { {t("common:change-link-label")} {" "} - {/* {FieldsTranslations( + {FieldsTranslations( rows[0].value - )} */} + )} - + */}
)} @@ -159,19 +159,20 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { "Yes" && (
- {t( - "case:representation-onbehalfof-details" - )} + Evidence
- { - repFormData.enterNeighbouringLandToViewSiteEvidence - } +
- { @@ -182,11 +183,11 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { {t("common:change-link-label")} {" "} - {/* {FieldsTranslations( + {FieldsTranslations( rows[0].value - )} */} + )} - + */}
)} @@ -236,9 +237,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- { - repFormData.enterNeighbouringLandAccessRequired - } +
@@ -302,7 +306,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.healthAndSafetyIssuesEvidence} +
@@ -484,7 +493,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.previousGrantedCertsEvidence} +
@@ -549,7 +563,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.stopNoticeServedEvidence} +
@@ -614,7 +633,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.stopNoticeServedEvidence} +
@@ -679,7 +703,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.previousEnforcementEvidence} +
@@ -744,7 +773,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.subjectArticle4Evidence} +
@@ -809,7 +843,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.previousPDRRestrictionEvidence} +
@@ -851,7 +890,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.LPAldpAndMap} +
@@ -886,7 +930,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.LPAlocalGuidance} +
@@ -1026,7 +1075,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.ROWEvidence} +
@@ -1091,7 +1145,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.conservationAreaEvidence} +
@@ -1156,7 +1215,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.affectListedBuildingEvidence} +
@@ -1221,7 +1285,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.TPOEvidence} +
@@ -1286,7 +1355,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.natureConservationSiteEvidence} +
@@ -1351,7 +1425,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.protectedSpeciesEvidence} +
@@ -1451,7 +1530,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.floodingIssueEvidence} +
@@ -1516,9 +1600,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- { - repFormData.governmentDepartmentCommentsEvidence - } +
@@ -1631,9 +1718,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- { - repFormData.developmentCarriedOutInAccordanceEvidence - } +
@@ -1802,9 +1892,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- { - repFormData.developmentAnyOtherConditionsEvidence - } +
@@ -1833,7 +1926,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { {/* Section 7 Before sending, have you attached or provided a web link to: */}

- {t("myrepresentations:enf-section-heading-seven")} + {t("myrepresentations:s78-section-heading-five-sub")}

{_.has(repFormData, "copyOfEnforcementNotice") && ( <> @@ -1873,7 +1966,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.copyOfEnforcementNoticeEvidence} +
@@ -1936,7 +2034,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.enforcementNoticePlanEvidence} +
@@ -1999,9 +2102,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- { - repFormData.listOfNotifiedOfEnforcementEvidence - } +
@@ -2064,9 +2170,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- { - repFormData.copyOfLetterOfAppealNotificationEvidence - } +
@@ -2129,7 +2238,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.lpaEIAOSEvidence} +
@@ -2192,7 +2306,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.detailsOfOtherAppeals} +
@@ -2255,7 +2374,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.detailsOfPreviousAppealsEvidence} +
@@ -2284,7 +2408,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- 33. Any other relevant information that we should + 40. Any other relevant information that we should know about?
@@ -2318,7 +2442,12 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.otherRelevantInformationEvidence} +
diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js index 01598be3..20baf1ad 100644 --- a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js +++ b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js @@ -61,7 +61,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
- { @@ -71,11 +71,11 @@ let RepLPAQuestionnaireCheck_s78 = (props) => { {t("common:change-link-label")} {" "} - {/* {FieldsTranslations( + {FieldsTranslations( rows[0].value - )} */} + )} - + */}
)} @@ -161,7 +161,7 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
- { @@ -172,11 +172,11 @@ let RepLPAQuestionnaireCheck_s78 = (props) => { {t("common:change-link-label")} {" "} - {/* {FieldsTranslations( + {FieldsTranslations( rows[0].value - )} */} + )} - + */}
)} diff --git a/components/pdftemplates/enforcement_pdf.js b/components/pdftemplates/enforcement_pdf.js index fa7898a9..09111076 100644 --- a/components/pdftemplates/enforcement_pdf.js +++ b/components/pdftemplates/enforcement_pdf.js @@ -726,7 +726,6 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { { { The LPA’s Environmental Impact Assessment Screening Opinion and - ‘Regulation 45 Notice’*, if applicable? + ‘Regulation 45 Notice’, if applicable? {values.lpaEIAOS} diff --git a/components/pdftemplates/finalComments_pdf.js b/components/pdftemplates/finalComments_pdf.js index be300697..64edec6f 100644 --- a/components/pdftemplates/finalComments_pdf.js +++ b/components/pdftemplates/finalComments_pdf.js @@ -1,20 +1,17 @@ -import ReactPDF, { +import { Document, + Image, Page, + StyleSheet, Text, View, - Image, - StyleSheet, - PDFViewer, Font, } from "@react-pdf/renderer"; -import { createElement } from "react"; import Html from "react-pdf-html"; import { getFormCollectionByID, bytesToSize } from "../../components/utils"; import transLookupCY from "../../locales/cy/myrepresentations.json"; import transLookupEN from "../../locales/en/myrepresentations.json"; -import { JSONPath as jsonpath } from "jsonpath-plus"; const getTrans = (locale, key) => { let jsonQuery = `$.${key}`; @@ -56,6 +53,28 @@ const styles = StyleSheet.create({ paddingLeft: 10, backgroundColor: "white", }, + questionAnswerSmall: { + color: "#757575", + width: "300", + fontSize: 12, + padding: 5, + border: 1, + borderColor: "#eee", + paddingLeft: 10, + paddingRight: 10, + backgroundColor: "white", + marginRight: 10, + }, + questionAnswerSmaller: { + color: "#757575", + width: "90", + fontSize: 12, + padding: 5, + border: 1, + borderColor: "#eee", + paddingLeft: 10, + backgroundColor: "white", + }, questionAnswerMid: { color: "#757575", width: "20%", @@ -242,7 +261,7 @@ export const finalComments_pdf = ({ docProps }) => { {CleanHTML( values.conditional_representationCapacity_Comments - )} + ) || "N/A"} @@ -443,7 +462,7 @@ export const finalComments_pdf = ({ docProps }) => { }} > {getTrans( docProps.locale, @@ -451,7 +470,18 @@ export const finalComments_pdf = ({ docProps }) => { )} : - + {values.firstname} {values.lastname} @@ -462,14 +492,20 @@ export const finalComments_pdf = ({ docProps }) => { alignItems: "center", }} > - + {getTrans( docProps.locale, "statement-date-label" )} : - + {signedDate} @@ -482,6 +518,7 @@ export const finalComments_pdf = ({ docProps }) => { style={{ flexDirection: "row", marginBottom: 10, + alignItems: "center", }} > { : ""} + ) : values.hasOwnProperty("onBehalfOfLPA") ? ( + + + {getTrans( + docProps.locale, + "statement-onbehalf-label" + )} + : + + + {values.onBehalfOfLPA} + + ) : ( )} diff --git a/components/pdftemplates/lpaQuestionnaire_pdf.js b/components/pdftemplates/lpaQuestionnaire_pdf.js index d12c3259..a007afc6 100644 --- a/components/pdftemplates/lpaQuestionnaire_pdf.js +++ b/components/pdftemplates/lpaQuestionnaire_pdf.js @@ -310,7 +310,7 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { flexDirection: "column", marginBottom: 10, }} - wrap={false} + // wrap={false} > { {CleanHTML( values.conditional_representationCapacity_Comments - )} + ) || "N/A"} @@ -440,7 +462,7 @@ export const statement_pdf = ({ docProps }) => { }} > {getTrans( docProps.locale, @@ -448,7 +470,18 @@ export const statement_pdf = ({ docProps }) => { )} : - + {values.firstname} {values.lastname} @@ -459,14 +492,20 @@ export const statement_pdf = ({ docProps }) => { alignItems: "center", }} > - + {getTrans( docProps.locale, "statement-date-label" )} : - + {signedDate} @@ -479,6 +518,7 @@ export const statement_pdf = ({ docProps }) => { style={{ flexDirection: "row", marginBottom: 10, + alignItems: "center", }} > { : ""} + ) : values.hasOwnProperty("onBehalfOfLPA") ? ( + + + {getTrans( + docProps.locale, + "statement-onbehalf-label" + )} + : + + + {values.onBehalfOfLPA} + + ) : ( )} diff --git a/locales/cy/case.json b/locales/cy/case.json index d65e8ff5..e5dae20e 100644 --- a/locales/cy/case.json +++ b/locales/cy/case.json @@ -35,7 +35,7 @@ "summary-start-date-label": "Dyddiad Dechrau", "summary-questionnaire-due-date-label": "Holiadur i ddod", "summary-statement-due-date-label": "Datganiad(au) i ddod", - "summary-statement-interested-party-due-date-label": "Datganiad a Sylwadau Partïon â Buddiant i ddod", + "summary-statement-interested-party-due-date-label": "Datganiad a Sylwadau Partïon â Diddordeb yn ddyledus", "summary-date-exported-to-iss-label": "Dyddiad allgludo i ISS", "summary-interested-party-date-label": "Sylwadau Parti â Buddiant i ddod", "summary-applicant-final-comments-date-label": "Sylwadau Terfynol yr Apelydd/ACLl i ddod", diff --git a/locales/cy/myrepresentations.json b/locales/cy/myrepresentations.json index 17ba2360..880a26f8 100644 --- a/locales/cy/myrepresentations.json +++ b/locales/cy/myrepresentations.json @@ -225,5 +225,6 @@ "representation-type": "Math o sylw", "select-an-option-label": "Dewiswch opsiwn", "previously-added-files": "Ffeiliau wedi'u llwytho i fyny", - "is-required-label": "Yn ofynnol" + "is-required-label": "Yn ofynnol", + "select-a-date-label": "Dewiswch ddyddiad" } \ No newline at end of file diff --git a/locales/en/case.json b/locales/en/case.json index 531d5f51..4d4c6be7 100644 --- a/locales/en/case.json +++ b/locales/en/case.json @@ -35,7 +35,7 @@ "summary-start-date-label": "Start Date", "summary-questionnaire-due-date-label": "Questionnaire due", "summary-statement-due-date-label": "Statement(s) due", - "summary-statement-interested-party-due-date-label": "Statement and Interested Party Reps due", + "summary-statement-interested-party-due-date-label": "Statement and Interested Party Representations due", "summary-date-exported-to-iss-label": "Date exported to ISS", "summary-interested-party-date-label": "Interested Party Comments due", "summary-applicant-final-comments-date-label": "Appellant/LPA Final Comments due", diff --git a/locales/en/myrepresentations.json b/locales/en/myrepresentations.json index 7ef71c67..f6791b21 100644 --- a/locales/en/myrepresentations.json +++ b/locales/en/myrepresentations.json @@ -132,7 +132,7 @@ "enf-section-question-10": "Has the Local Planning Authority received the correct fee payable in relation to this appeal for the deemed planning application/ground (a) to be considered?", "enf-section-question-11": "Is the appeal fee exempt?", "enf-section-question-11-hint": "If Yes, please explain", - "enf-section-heading-three": "Planning History and Current Statuss", + "enf-section-heading-three": "Planning History and Current Status", "enf-section-question-12": "Have any planning permissions or lawful development certificates been granted previously in respect of the development or on the site?", "enf-section-question-12-hint": "If Yes, please submit any documents necessary for its interpretation and list here. E.g. Decision Notice, Relevant Plans, etc.", "enf-section-question-13": "Has a Stop Notice been served in addition to the Enforcement Notice?", @@ -181,13 +181,13 @@ "enf-section-heading-seven": "Before sending, have you attached or provided a web link to the following:", "enf-section-question-33": "A true copy of the enforcement notice?", "enf-section-question-33-hint": "Insert weblink here if available online. If Not, give reasons", - "enf-section-question-34": "The enforcement notice plan.", + "enf-section-question-34": "The enforcement notice plan?", "enf-section-question-34-hint": "Insert weblink here if available online. If Not, give reasons", - "enf-section-question-35": "A list of those served with the enforcement notice.", + "enf-section-question-35": "A list of those served with the enforcement notice?", "enf-section-question-35-hint": "Insert weblink here if available online. If Not, give reasons", "enf-section-question-36": "A copy of the letter with which you notified people of the appeal AND a list of the people you notified?", "enf-section-question-36-hint": "Insert weblink here if available online. If Not, give reasons", - "enf-section-question-37": "The LPA’s Environmental Impact Assessment Screening Opinion and ‘Regulation 45 Notice’*, if applicable?", + "enf-section-question-37": "The LPA’s Environmental Impact Assessment Screening Opinion and ‘Regulation 45 Notice’, if applicable?", "enf-section-question-37-hint": "Insert weblink here if available online. If Not, give reasons", "enf-section-question-38": "Details of other appeals or applications relating to the site, or a nearby site, which are still being considered by PEDW or the Welsh Ministers?", "enf-section-question-38-hint": "If Yes, provide reference numbers and, if applicable, attach or insert links to relevant documents", @@ -225,5 +225,6 @@ "representation-type": "Representation type", "select-an-option-label": "Select an option", "previously-added-files": "Uploaded files", - "is-required-label": "Is required" + "is-required-label": "Is required", + "select-a-date-label": "Select a date" } \ No newline at end of file diff --git a/pages/api/endpoint/getbasicdnssearchpaged_api.js b/pages/api/endpoint/getbasicdnssearchpaged_api.js index 8679bd1c..60c321b4 100644 --- a/pages/api/endpoint/getbasicdnssearchpaged_api.js +++ b/pages/api/endpoint/getbasicdnssearchpaged_api.js @@ -45,7 +45,11 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import _ from "lodash"; -import { azureHeadersPagedCustom, getToken } from "../../../actions"; +import { + azureHeadersPagedCustom, + getToken, + consoleLogger, +} from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/file/generatepdf.js b/pages/api/file/generatepdf.js index 85bcbfe0..10ae541c 100644 --- a/pages/api/file/generatepdf.js +++ b/pages/api/file/generatepdf.js @@ -153,16 +153,16 @@ export default async function handler(req, res) { ? cleanFilesList(reqBodyobj) : reqBodyobj; - console.log( - "//////////////////////\nreqBodyobj" + - req + - "\n//////////////////////\n" - ); - console.log( - "//////////////////////\nreqBodyobj" + - JSON.stringify(req.body) + - "\n//////////////////////\n" - ); + // console.log( + // "//////////////////////\nreqBodyobj" + + // req + + // "\n//////////////////////\n" + // ); + // console.log( + // "//////////////////////\nreqBodyobj" + + // JSON.stringify(req.body) + + // "\n//////////////////////\n" + // ); var containerID = reqBodyobj.containerID; var casefolderID = reqBodyobj.casefolderID;