diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js index 097d44be..aa6155f8 100644 --- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js +++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js @@ -4,6 +4,8 @@ import { useRouter } from "next/router"; import { useDropzone } from "react-dropzone"; import { connect } from "react-redux"; import { Field, formValueSelector, reduxForm } from "redux-form"; +import { getFormCollectionByID } from "../../../../components/utils"; + import { FileUploadField, RenderDatePicker, @@ -124,10 +126,20 @@ let Enforcement_Questionnaire = (props) => { detailsObj.pinswg_siteaddresspostcode} +
+
+ 4. {t("myrepresentations:s78-section-question-4")}:{" "} + { + getFormCollectionByID( + currentView.caseReference.appealType + ).value + } +
+
{ { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "6. " + + "7. " + t( "myrepresentations:enf-section-question-6" ) @@ -225,7 +237,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "7. " + + "8. " + t( "myrepresentations:enf-section-question-7" ) @@ -254,7 +266,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "8. " + + "9. " + t( "myrepresentations:enf-section-question-8" ) @@ -278,7 +290,7 @@ let Enforcement_Questionnaire = (props) => { type="text" component={RenderRichMultiline} label={ - "9. " + + "10. " + t( "myrepresentations:enf-section-question-9" ) @@ -299,7 +311,7 @@ let Enforcement_Questionnaire = (props) => {
{ component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "11. " + + "12. " + t("myrepresentations:enf-section-question-11") } conditionalLabel={t( @@ -368,7 +380,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "12. " + + "13. " + t("myrepresentations:enf-section-question-12") } conditionalLabel={t( @@ -395,7 +407,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "13. " + + "14. " + t("myrepresentations:enf-section-question-13") } conditionalLabel={t( @@ -422,7 +434,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "14. " + + "15. " + t("myrepresentations:enf-section-question-14") } conditionalLabel={t( @@ -449,7 +461,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "15. " + + "16. " + t("myrepresentations:enf-section-question-15") } conditionalLabel={t( @@ -476,7 +488,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "16. " + + "17. " + t("myrepresentations:enf-section-question-16") } conditionalLabel={t( @@ -503,7 +515,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "17. " + + "18. " + t("myrepresentations:enf-section-question-17") } conditionalLabel={t( @@ -528,7 +540,7 @@ let Enforcement_Questionnaire = (props) => {
{
{
{ { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "22. " + + "23. " + t("myrepresentations:enf-section-question-22") } conditionalLabel={t( @@ -651,7 +663,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "23. " + + "24. " + t("myrepresentations:enf-section-question-23") } conditionalLabel={t( @@ -678,7 +690,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "24. " + + "25. " + t("myrepresentations:enf-section-question-24") } conditionalLabel={t( @@ -705,7 +717,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "25. " + + "26. " + t("myrepresentations:enf-section-question-25") } conditionalLabel={t( @@ -732,7 +744,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "26. " + + "27. " + t("myrepresentations:enf-section-question-26") } conditionalLabel={t( @@ -759,7 +771,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "27. " + + "28. " + t("myrepresentations:enf-section-question-27") } conditionalLabel={t( @@ -773,7 +785,7 @@ let Enforcement_Questionnaire = (props) => {
{ component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "29. " + + "30. " + t("myrepresentations:enf-section-question-29") } conditionalLabel={t( @@ -832,7 +844,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "30. " + + "31. " + t("myrepresentations:enf-section-question-30") } conditionalLabel={t( @@ -854,7 +866,7 @@ let Enforcement_Questionnaire = (props) => { {t("myrepresentations:enf-section-heading-six")}
- 31. {t("myrepresentations:enf-section-question-31")} + 32. {t("myrepresentations:enf-section-question-31")}
@@ -928,7 +940,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "32. " + + "33. " + t("myrepresentations:enf-section-question-32") } conditionalLabel={t( @@ -969,7 +981,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "33. " + + "34. " + t("myrepresentations:enf-section-question-33") } conditionalLabel={t( @@ -996,7 +1008,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "34. " + + "35. " + t("myrepresentations:enf-section-question-34") } conditionalLabel={t( @@ -1023,7 +1035,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "35. " + + "36. " + t("myrepresentations:enf-section-question-35") } conditionalLabel={t( @@ -1050,7 +1062,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "36. " + + "37. " + t("myrepresentations:enf-section-question-36") } conditionalLabel={t( @@ -1077,7 +1089,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "37. " + + "38. " + t("myrepresentations:enf-section-question-37") } conditionalLabel={t( @@ -1107,7 +1119,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "38. " + + "39. " + t("myrepresentations:enf-section-question-38") } conditionalLabel={t( @@ -1134,7 +1146,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "39. " + + "40. " + t("myrepresentations:enf-section-question-39") } conditionalLabel={t( @@ -1161,7 +1173,7 @@ let Enforcement_Questionnaire = (props) => { component={RenderLPACondtionalRadioList} validate={[required]} legend={ - "40. " + + "41. " + t("myrepresentations:enf-section-question-40") } conditionalLabel={t( diff --git a/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js b/components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_enforcement.js index a4691883..6236ba0c 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) => { <>
- {"4. " + + {"5. " + t("myrepresentations:enf-section-question-4")}
@@ -89,7 +89,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"5. " + + {"6. " + t("myrepresentations:enf-section-question-5")}
@@ -121,7 +121,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"6. " + + {"7. " + t("myrepresentations:enf-section-question-6")}
@@ -190,7 +190,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"7. " + + {"8. " + t("myrepresentations:enf-section-question-7")}
@@ -217,50 +217,50 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => {
- {repFormData.enterNeighbouringLandAccessRequired != - "Yes" && ( -
-
- {t( - "myrepresentations:questionnaire-evidence-label" - )} -
+ {repFormData.enterNeighbouringLandAccessRequired != "Yes" && + repFormData.enforcementNoticePlan != null && ( + - )} + + + +
+ )} <>
- {"8. " + + {"9. " + t("myrepresentations:enf-section-question-8")}
@@ -329,7 +329,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"9. " + + {"10. " + t("myrepresentations:enf-section-question-9")}
@@ -372,7 +372,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"10. " + + {"11. " + t("myrepresentations:enf-section-question-10")}
@@ -404,7 +404,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"11. " + + {"12. " + t("myrepresentations:enf-section-question-11")}
@@ -442,7 +442,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"12. " + + {"13. " + t( "myrepresentations:enf-section-question-12" )}{" "} @@ -513,7 +513,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"13. " + + {"14. " + t("myrepresentations:enf-section-question-13")}
@@ -582,7 +582,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"14. " + + {"15. " + t("myrepresentations:enf-section-question-14")}
@@ -651,7 +651,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"15. " + + {"16. " + t("myrepresentations:enf-section-question-15")}
@@ -720,7 +720,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"16. " + + {"17. " + t("myrepresentations:enf-section-question-16")}
@@ -789,7 +789,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"17. " + + {"18. " + t("myrepresentations:enf-section-question-17")}
@@ -864,7 +864,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"18. " + + {"19. " + t("myrepresentations:enf-section-question-18")}
@@ -901,7 +901,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"19. " + + {"20. " + t("myrepresentations:enf-section-question-19")}
@@ -938,7 +938,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"20. " + + {"21. " + t("myrepresentations:enf-section-question-20")}
@@ -976,7 +976,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"21. " + + {"22. " + t("myrepresentations:enf-section-question-21")}
@@ -1008,7 +1008,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"22. " + + {"23. " + t("myrepresentations:enf-section-question-22")}
@@ -1077,7 +1077,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"23. " + + {"24. " + t("myrepresentations:enf-section-question-23")}
@@ -1146,7 +1146,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"24. " + + {"25. " + t("myrepresentations:enf-section-question-24")}
@@ -1215,7 +1215,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"25. " + + {"26. " + t("myrepresentations:enf-section-question-25")}
@@ -1284,7 +1284,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"26. " + + {"27. " + t("myrepresentations:enf-section-question-26")}
@@ -1353,7 +1353,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"27. " + + {"28. " + t("myrepresentations:enf-section-question-27")}
@@ -1422,7 +1422,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"28. " + + {"29. " + t("myrepresentations:enf-section-question-28")}
@@ -1454,7 +1454,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"29. " + + {"30. " + t("myrepresentations:enf-section-question-29")}
@@ -1523,7 +1523,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"30. " + + {"31. " + t("myrepresentations:enf-section-question-30")}
@@ -1599,39 +1599,21 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {t("myrepresentations:enf-section-question-31a")} + 32. {t("myrepresentations:enf-section-question-31")}
{repFormData.developmentNotBeginLaterThanFiveYears}
-
- { - setRepresentationSubmit(false); - setShowQuestionnaireSection(6); - }} - > - {t("common:change-link-label")} - - {" "} - {/* {FieldsTranslations( - rows[0].value - )} */} - - -
+
<>
- 31 - {t("myrepresentations:enf-section-question-31a")} + a) {t("myrepresentations:enf-section-question-31a")}
@@ -1699,8 +1681,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- 31 - {t("myrepresentations:enf-section-question-31b")} + b) {t("myrepresentations:enf-section-question-31b")}
@@ -1731,8 +1712,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- 31 - {t("myrepresentations:enf-section-question-31c")} + c) {t("myrepresentations:enf-section-question-31c")}
@@ -1797,7 +1777,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- 32. {t("myrepresentations:enf-section-question-32")} + 33. {t("myrepresentations:enf-section-question-32")}
@@ -1870,7 +1850,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"33. " + + {"34. " + t("myrepresentations:enf-section-question-33")}
@@ -1939,7 +1919,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"34. " + + {"35. " + t("myrepresentations:enf-section-question-34")}
@@ -2009,7 +1989,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"35. " + + {"36. " + t("myrepresentations:enf-section-question-35")}
@@ -2079,7 +2059,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"36. " + + {"37. " + t("myrepresentations:enf-section-question-36")}
@@ -2148,7 +2128,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"37. " + + {"38. " + t("myrepresentations:enf-section-question-37")}
@@ -2217,7 +2197,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"38. " + + {"39. " + t("myrepresentations:enf-section-question-38")}
@@ -2286,7 +2266,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"39. " + + {"40. " + t("myrepresentations:enf-section-question-39")}
@@ -2355,7 +2335,7 @@ let RepLPAQuestionnaireCheck_enforcement = (props) => { <>
- {"40. " + + {"41. " + t("myrepresentations:enf-section-question-40")}
diff --git a/components/pdftemplates/enforcement_pdf.js b/components/pdftemplates/enforcement_pdf.js index 20ce4a38..725aebf7 100644 --- a/components/pdftemplates/enforcement_pdf.js +++ b/components/pdftemplates/enforcement_pdf.js @@ -271,6 +271,24 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { {values.siteAddress} + + 4. + + {getTrans( + docProps.locale, + "s78-section-question-4" + )} + + + {appealTypeValue.value} + + @@ -302,7 +320,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 4. + 5. {getTrans( @@ -332,7 +350,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 5. + 6. {getTrans( docProps.locale, @@ -357,7 +375,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 6. + 7. {getTrans( @@ -394,7 +412,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 7. + 8. {getTrans( @@ -432,7 +450,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 8. + 9. {getTrans( @@ -467,7 +485,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 9. + 10. @@ -515,7 +533,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 10. + 11. {getTrans( @@ -542,7 +560,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 11. + 12. {getTrans( @@ -589,7 +607,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 12. + 13. {getTrans( docProps.locale, @@ -616,7 +634,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 13. + 14. {getTrans( docProps.locale, @@ -643,7 +661,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 14. + 15. {getTrans( docProps.locale, @@ -668,7 +686,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 15. + 16. {getTrans( docProps.locale, @@ -695,7 +713,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 16. + 17. {getTrans( docProps.locale, @@ -722,7 +740,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 17. + 18. {getTrans( docProps.locale, @@ -774,7 +792,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 18. + 19. {getTrans( @@ -803,7 +821,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 19. + 20. {getTrans( @@ -825,7 +843,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 20. + 21. {getTrans( docProps.locale, @@ -860,7 +878,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 21. + 22. {getTrans( docProps.locale, @@ -884,7 +902,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 22. + 23. {getTrans( @@ -917,7 +935,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 23. + 24. {getTrans( @@ -952,7 +970,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 24. + 25. {getTrans( @@ -987,7 +1005,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 25. + 26. {getTrans( @@ -1020,7 +1038,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 26. + 27. {getTrans( @@ -1055,7 +1073,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 27. + 28. {getTrans( @@ -1084,7 +1102,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 28. + 29. {getTrans( docProps.locale, @@ -1108,7 +1126,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 29. + 30. {getTrans( @@ -1143,7 +1161,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 30. + 31. {getTrans( @@ -1190,7 +1208,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { marginBottom: 10, }} > - 31. + 32. {getTrans( docProps.locale, @@ -1286,7 +1304,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 32. + 33. {getTrans( @@ -1339,7 +1357,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 33. + 34. {getTrans( @@ -1373,7 +1391,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 34. + 35. {getTrans( @@ -1408,7 +1426,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 35. + 36. {getTrans( @@ -1441,7 +1459,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 36. + 37. {getTrans( @@ -1477,7 +1495,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 37. + 38. {getTrans( @@ -1510,7 +1528,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 38. + 39. {getTrans( @@ -1546,7 +1564,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 39. + 40. {getTrans( @@ -1582,7 +1600,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => { }} > - 40. + 41. {getTrans(