diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js
index 98ef2fd1..a4691883 100644
--- a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js
+++ b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js
@@ -23,1971 +23,16 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
{t("myrepresentations:enf-section-heading-one")}
- {_.has(repFormData, "procedureType") && (
- <>
-
- {repFormData.representationOnBehalfOf == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "enterToView") && (
- <>
-
-
- )}
- {_.has(repFormData, "enterNeighbouringLandToViewSite") && (
- <>
-
- {repFormData.enterNeighbouringLandToViewSite ==
- "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "enterNeighbouringLandAccessRequired") && (
- <>
-
- {repFormData.enterNeighbouringLandAccessRequired !=
- "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "healthAndSafetyIssues") && (
- <>
-
- {repFormData.healthAndSafetyIssues == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "LPAcontactDetails") && (
- <>
-
-
- )}
-
- {/* Section 2 Deemed Application Fee */}
- <>
-
- {t("myrepresentations:enf-section-heading-two")}
-
- {_.has(repFormData, "feePaid") && (
- <>
-
-
- )}
- {_.has(repFormData, "feeExempt") && (
- <>
-
-
- )}
-
- {/* Section 3 Planning History and Current Status */}
- <>
-
- {t("myrepresentations:enf-section-heading-three")}
-
- {_.has(repFormData, "previousGrantedCerts") && (
- <>
-
- {repFormData.previousGrantedCerts == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "stopNoticeServed") && (
- <>
-
- {repFormData.stopNoticeServed == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "relatedCases") && (
- <>
-
- {repFormData.relatedCases == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "previousEnforcement") && (
- <>
-
- {repFormData.previousEnforcement == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "subjectArticle4") && (
- <>
-
- {repFormData.subjectArticle4 == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "previousPDRRestriction") && (
- <>
-
- {repFormData.previousPDRRestriction == "Yes" && (
-
- )}
-
- )}
-
- {/* Section 4 Supporting Documents */}
- <>
-
- {t("myrepresentations:enf-section-heading-four")}
-
- {_.has(repFormData, "LPAldpAndMap") && (
- <>
-
-
- )}
- {_.has(repFormData, "LPAlocalGuidance") && (
- <>
-
-
- )}
- {_.has(repFormData, "LPAintentionToSubmitFullStatement") && (
- <>
-
-
- )}
-
- {/* Section 5 */}
- <>
-
- {t("myrepresentations:enf-section-heading-five")}
-
- {_.has(repFormData, "AONB") && (
- <>
-
-
- )}
- {_.has(repFormData, "ROW") && (
- <>
-
- {repFormData.ROW == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "conservationArea") && (
- <>
-
- {repFormData.conservationArea == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "affectListedBuilding") && (
- <>
-
- {repFormData.affectListedBuilding == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "TPO") && (
- <>
-
- {repFormData.TPO == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "natureConservationSite") && (
- <>
-
- {repFormData.natureConservationSite == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "protectedSpecies") && (
- <>
-
- {repFormData.protectedSpecies == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "gypsyTravellerInvolvment") && (
- <>
-
-
- )}
- {_.has(repFormData, "floodingIssue") && (
- <>
-
- {repFormData.floodingIssue == "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "governmentDepartmentComments") && (
- <>
-
- {repFormData.governmentDepartmentComments == "Yes" && (
-
- )}
-
- )}
-
-
- {/* Section 6 */}
- <>
-
- {t("myrepresentations:enf-section-heading-six")}
-
- {_.has(
- repFormData,
- "developmentNotBeginLaterThanFiveYears"
- ) && (
- <>
-
-
- )}
-
- {_.has(repFormData, "developmentCarriedOutInAccordance") && (
- <>
-
- {repFormData.developmentCarriedOutInAccordance ==
- "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "developmentNotTakePlaceBiodiversity") && (
- <>
-
-
- )}
-
- {_.has(repFormData, "developmentNotTakePlaceBroadband") && (
- <>
-
- {repFormData.developmentNotTakePlaceBroadband ==
- "Yes" && (
-
- )}
-
- )}
- {_.has(repFormData, "developmentAnyOtherConditions") && (
- <>
-
- {repFormData.developmentAnyOtherConditions == "Yes" && (
-
- )}
-
- )}
-
-
- {/* Section 7 Before sending, have you attached or provided a web link to: */}
-
- {t("myrepresentations:s78-section-heading-five-sub")}
-
- {_.has(repFormData, "copyOfEnforcementNotice") && (
<>
- {"33. " +
- t("myrepresentations:enf-section-question-33")}
+ {"4. " +
+ t("myrepresentations:enf-section-question-4")}
- {repFormData.copyOfEnforcementNotice}
+ {repFormData.procedureType}
@@ -1996,7 +41,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
href="#"
onClick={() => {
setRepresentationSubmit(false);
- setShowQuestionnaireSection(7);
+ setShowQuestionnaireSection(1);
}}
>
{t("common:change-link-label")}
@@ -2009,7 +54,101 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.copyOfEnforcementNotice == "No" && (
+ {repFormData.representationOnBehalfOf == "Yes" && (
+
+ )}
+
+
+ <>
+
+
+
+ <>
+
+ {repFormData.enterNeighbouringLandToViewSite == "Yes" && (
+ )}
+
+
+ <>
+
+ {repFormData.enterNeighbouringLandAccessRequired !=
+ "Yes" && (
+
+
+ {t(
+ "myrepresentations:questionnaire-evidence-label"
+ )}
+
+
+
+
@@ -2032,7 +241,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
href="#"
onClick={() => {
setRepresentationSubmit(false);
- setShowQuestionnaireSection(7);
+ setShowQuestionnaireSection(1);
}}
>
{t("common:change-link-label")}
@@ -2047,17 +256,1662 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
+ {t("myrepresentations:enf-section-heading-two")}
+
+
+ <>
+
+
+
+ <>
+
+
+
+ {/* Section 3 Planning History and Current Status */}
+ <>
+
+ {t("myrepresentations:enf-section-heading-three")}
+
+
+ <>
+
+ {repFormData.previousGrantedCerts == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.stopNoticeServed == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.relatedCases == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.previousEnforcement == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.subjectArticle4 == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.previousPDRRestriction == "Yes" && (
+
+ )}
+
+
+ {/* Section 4 Supporting Documents */}
+ <>
+
+ {t("myrepresentations:enf-section-heading-four")}
+
+
+ <>
+
+
+
+ <>
+
+
+
+ <>
+
+
+
+ {/* Section 5 */}
+ <>
+
+ {t("myrepresentations:enf-section-heading-five")}
+
+
+ <>
+
+
+
+ <>
+
+ {repFormData.ROW == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.conservationArea == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.affectListedBuilding == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.TPO == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.natureConservationSite == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.protectedSpecies == "Yes" && (
+
+ )}
+
+
+ <>
+
+
+
+ <>
+
+ {repFormData.floodingIssue == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.governmentDepartmentComments == "Yes" && (
+
+ )}
+
+
+
+ {/* Section 6 */}
+ <>
+
+ {t("myrepresentations:enf-section-heading-six")}
+
+
+ <>
+
+
+
+ <>
+
+ {repFormData.developmentCarriedOutInAccordance == "Yes" && (
+
+ )}
+
+
+ <>
+
+
+
+ <>
+
+ {repFormData.developmentNotTakePlaceBroadband == "Yes" && (
+
+ )}
+
+
+ <>
+
+ {repFormData.developmentAnyOtherConditions == "Yes" && (
+
+ )}
+
+
+
+ {/* Section 7 Before sending, have you attached or provided a web link to: */}
+
+ {t("myrepresentations:s78-section-heading-five-sub")}
+
+ <>
+
+ {repFormData.copyOfEnforcementNotice == "No" && (
+
+
+ {t(
+ "myrepresentations:questionnaire-evidence-label"
+ )}
+
+
+
+
@@ -2079,7 +1933,41 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
{t(
@@ -2116,40 +2004,40 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
)}
-
- )}
- {_.has(repFormData, "listOfNotifiedOfEnforcement") && (
- <>
-
-
- {"35. " +
- t("myrepresentations:enf-section-question-35")}
-
+
-
- {repFormData.enforcementNoticePlan}
-
+ <>
+
- {repFormData.listOfNotifiedOfEnforcement != "Yes" && (
+
+
+
+
{t(
@@ -2186,18 +2074,53 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
)}
-
- )}
- {_.has(repFormData, "copyOfLetterOfAppealNotification") && (
- <>
+
+
+ <>
+
+ {repFormData.copyOfLetterOfAppealNotification == "No" && (
- {"36. " +
- t("myrepresentations:enf-section-question-36")}
+ {t(
+ "myrepresentations:questionnaire-evidence-label"
+ )}
- {repFormData.copyOfLetterOfAppealNotification}
+
@@ -2219,55 +2142,54 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.copyOfLetterOfAppealNotification == "No" && (
-
-
- {t(
- "myrepresentations:questionnaire-evidence-label"
- )}
-
+ )}
+
-
-
-
+ <>
+
- )}
-
- )}
- {_.has(repFormData, "lpaEIAOS") && (
- <>
+
+
+
+
- {"37. " +
- t("myrepresentations:enf-section-question-37")}
+ {t(
+ "myrepresentations:questionnaire-evidence-label"
+ )}
- {repFormData.lpaEIAOS}
+
@@ -2289,55 +2211,54 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.lpaEIAOS == "No" && (
-
-
- {t(
- "myrepresentations:questionnaire-evidence-label"
- )}
-
+ )}
+
-
-
-
+ <>
+
- )}
-
- )}
- {_.has(repFormData, "detailsOfOtherAppeals") && (
- <>
+
+
+
+
- {"38. " +
- t("myrepresentations:enf-section-question-38")}
+ {t(
+ "myrepresentations:questionnaire-evidence-label"
+ )}
- {repFormData.detailsOfOtherAppeals}
+
@@ -2359,55 +2280,54 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.detailsOfOtherAppeals == "Yes" && (
-
-
- {t(
- "myrepresentations:questionnaire-evidence-label"
- )}
-
+ )}
+
-
-
-
+ <>
+
- )}
-
- )}
- {_.has(repFormData, "detailsOfPreviousAppeals") && (
- <>
+
+
+
+
- {"39. " +
- t("myrepresentations:enf-section-question-39")}
+ {t(
+ "myrepresentations:questionnaire-evidence-label"
+ )}
- {repFormData.detailsOfPreviousAppeals}
+
@@ -2429,55 +2349,54 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.detailsOfPreviousAppeals == "Yes" && (
-
-
- {t(
- "myrepresentations:questionnaire-evidence-label"
- )}
-
+ )}
+
-
-
-
+ <>
+
- )}
-
- )}
- {_.has(repFormData, "otherRelevantInformation") && (
- <>
+
+
+
+
- {"40. " +
- t("myrepresentations:enf-section-question-40")}
+ {t(
+ "myrepresentations:questionnaire-evidence-label"
+ )}
- {repFormData.otherRelevantInformation}
+
@@ -2486,7 +2405,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
href="#"
onClick={() => {
setRepresentationSubmit(false);
- setShowQuestionnaireSection(7);
+ setShowQuestionnaireSection();
}}
>
{t("common:change-link-label")}
@@ -2499,152 +2418,109 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.otherRelevantInformation == "Yes" && (
-
- )}
-
- )}
{/* Section 9 Declaration */}
<>
{t("myrepresentations:enf-section-heading-eight")}
- {_.has(repFormData, "signedDate") && (
- <>
-
-
- {t(
- "myrepresentations:enf-section-question-signed"
- )}
-
-
- {repFormData.caseOfficer}
-
+ <>
+
-
- )}
- {_.has(repFormData, "caseOfficer") && (
- <>
-
-
- {t(
- "myrepresentations:s78-section-heading-date"
- )}
-
+
+
+
+
+
-
- {formatDates(repFormData.signedDate)}
-
+ <>
+
-
- )}
- {_.has(repFormData, "onBehalfOfLPA") && (
- <>
-
-
- {t(
- "myrepresentations:enf-section-question-onbehalf"
- )}
-
+
+
+
+
+
-
- {repFormData.onBehalfOfLPA}
-
+ <>
+
-
- )}
+
+
+
+