From 49d39e052eef820f3a3b9ca458e332052f934b83 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Tue, 3 Dec 2024 18:27:51 +0000
Subject: [PATCH] questionnaire for callins and uploads

---
 actions/selectQueryTypes.js                   |   2 +-
 components/breadcrumbs.js                     |  87 +++++++++++--
 components/case/representation/index.js       |  26 ++--
 .../representationCompleteSubmit.js           | 121 ++++++++++--------
 .../representation/representationElements.js  |  67 ++--------
 .../case/representation/representationLPA.js  |   4 +
 ...resentationLPAQuestionnaire_enforcement.js |   4 +-
 .../case/summaryTypes/pinswg_callinss77id.js  |   6 +-
 components/representation.js                  |   6 +
 data/formsxml/planningappeals78.xml           |   2 +-
 locales/en/myrepresentations.json             |  30 ++---
 pages/myportal/representation.js              |  19 ++-
 store/currentView/action.js                   |   2 +-
 store/currentView/reducer.js                  |   4 +-
 14 files changed, 220 insertions(+), 160 deletions(-)

diff --git a/actions/selectQueryTypes.js b/actions/selectQueryTypes.js
index 491e47f1..b39755bf 100644
--- a/actions/selectQueryTypes.js
+++ b/actions/selectQueryTypes.js
@@ -4,7 +4,7 @@ export const getSelectQuery = (appealTypeName) => {
             return "&$select=pinswg_speacialistcaseprocess,modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_procedure,pinswg_questionnaireduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_startdate,pinswg_otherpartiesstatement,pinswg_finalcommentsduedate,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_speacialistcaseprocess,pinswg_statementduedate";
             break;
         case "pinswg_callinss77s":
-            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_startdate,statuscode,pinswg_dateexportedtoiss,pinswg_startdateofevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_startdate,statuscode,pinswg_dateexportedtoiss,pinswg_startdateofevent,pinswg_typeofevent,pinswg_statementsduedate";
             break;
         case "pinswg_commonlands":
             return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode,pinswg_starttimeoftheevent,pinswg_typeofevent,pinswg_statementsduedate";
diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js
index ae801038..eacd6089 100644
--- a/components/breadcrumbs.js
+++ b/components/breadcrumbs.js
@@ -27,6 +27,23 @@ const Breadcrumbs = (props) => {
 
     const { data: session, status } = useSession();
 
+    const qcount =
+        currentView.caseReference.appealType == 846040000 ||
+        currentView.caseReference.appealType == 846040001 ||
+        currentView.caseReference.appealType == 846040006 ||
+        currentView.caseReference.appealType == 846040025 ||
+        currentView.caseReference.appealType == 846040004 ||
+        currentView.caseReference.appealType == 846040018 ||
+        currentView.caseReference.appealType == 846040003 ||
+        currentView.caseReference.appealType == 846040009 ||
+        currentView.caseReference.appealType == 846040008
+            ? 7
+            : currentView.caseReference.appealType == 846040005 ||
+              currentView.caseReference.appealType == 846040006 ||
+              currentView.caseReference.appealType == 846040007
+            ? 9
+            : "";
+
     return (
         <>
             <nav
@@ -866,25 +883,67 @@ const Breadcrumbs = (props) => {
                                     }
                                 </li> */}
 
-                                {typeof props.currentView
-                                    .representationCapacity != "undefined" &&
-                                    props.currentView.representationCapacity !=
-                                        "" && (
+                                {props.currentView.representationSubmit ==
+                                    true &&
+                                    props.currentView
+                                        .representationSubmitConfirmation !=
+                                        true && (
                                         <li className="govuk-breadcrumbs__link-item backChevron">
                                             <a
                                                 className="govuk-breadcrumbs__link"
                                                 href="#"
                                                 onClick={() => {
-                                                    props.currentView
-                                                        .representationSubmit
-                                                        ? setRepresentationSubmit(
-                                                              false
-                                                          )
-                                                        : setRepresentationCapacity();
-                                                    props.updateField(
-                                                        "representationForm",
-                                                        "representationType",
-                                                        ""
+                                                    setRepresentationSubmit(
+                                                        qcount
+                                                    );
+                                                }}
+                                            >
+                                                {t("common:back-link")}
+                                            </a>
+                                        </li>
+                                    )}
+                                {props.currentView.representationSubmit !=
+                                    true &&
+                                    props.currentView.caseReference.hasOwnProperty(
+                                        "repDetails"
+                                    ) &&
+                                    props.currentView.caseReference.repDetails
+                                        .representationType !=
+                                        "Questionnaire" && (
+                                        <li className="govuk-breadcrumbs__link-item backChevron">
+                                            <a
+                                                className="govuk-breadcrumbs__link"
+                                                href="#"
+                                                onClick={() => {
+                                                    setRepresentationSubmit(
+                                                        false
+                                                    );
+                                                }}
+                                            >
+                                                {t("common:back-link")}
+                                            </a>
+                                        </li>
+                                    )}
+                                {props.currentView.representationSubmit !=
+                                    true &&
+                                    props.currentView.caseReference.hasOwnProperty(
+                                        "repDetails"
+                                    ) &&
+                                    props.currentView.caseReference.repDetails
+                                        .representationType ==
+                                        "Questionnaire" &&
+                                    props.showQuestionnaireSection > 1 && (
+                                        <li className="govuk-breadcrumbs__link-item backChevron">
+                                            <a
+                                                className="govuk-breadcrumbs__link"
+                                                href="#"
+                                                onClick={() => {
+                                                    props.setShowQuestionnaireSection(
+                                                        props.showQuestionnaireSection -
+                                                            1
+                                                    );
+                                                    setRepresentationSubmit(
+                                                        false
                                                     );
                                                 }}
                                             >
diff --git a/components/case/representation/index.js b/components/case/representation/index.js
index d97b1f52..3156e2ff 100644
--- a/components/case/representation/index.js
+++ b/components/case/representation/index.js
@@ -34,7 +34,6 @@ let MakeRepresentation = (props) => {
 
     const [clearRepForm, setClearRepForm] = useState(false);
     const [savingStatus, setSavingStatus] = useState(false);
-    const [showQuestionnaireSection, setShowQuestionnaireSection] = useState(1);
     //const [questionnaireCount, setQuestionnaireCount] = useState(0);
 
     const { data: session } = useSession();
@@ -57,6 +56,8 @@ let MakeRepresentation = (props) => {
         handleSubmit,
         setRepresentationSubmitConfirmation,
         setRepresentationMessageSent,
+        setShowQuestionnaireSection,
+        showQuestionnaireSection,
         initialValues,
     } = props;
     const formObj = props.props.form;
@@ -194,6 +195,8 @@ let MakeRepresentation = (props) => {
             ? true
             : false;
 
+    isLPA && setRepresentationCapacity("lpa");
+
     currentType == "searchResultsObj"
         ? (casesObj = jsonpath(
               '$..[?(@.title=="' + caseReference + '")]',
@@ -374,7 +377,15 @@ let MakeRepresentation = (props) => {
     };
 
     const whichControl = () => {
-        if (isLPA && _.isEmpty(currentView.representationCapacity)) {
+        if (
+            isLPA &&
+            _.isEmpty(
+                currentView.representationCapacity ||
+                    (currentView.caseReference.hasOwnProperty("repDetails") &&
+                        currentView.caseReference.repDetails
+                            .representationCapacity)
+            )
+        ) {
             return (
                 //setRepresentationCapacity("lpa"),
                 <RepLPACapacitySelection
@@ -396,7 +407,10 @@ let MakeRepresentation = (props) => {
                 />
             );
         } else {
-            switch (currentView.representationCapacity) {
+            switch (
+                currentView.representationCapacity ||
+                currentView.caseReference.repDetails.representationCapacity
+            ) {
                 case false:
                     <RepCapacitySelection
                         formObj={formObj}
@@ -955,11 +969,7 @@ let MakeRepresentation = (props) => {
         if (currentView.representationSubmit != true) {
             if (_.isEmpty(currentView.representationCapacity)) {
                 if (isLPA) {
-                    setRepresentationCapacity(
-                        values.representationCapacity
-                            .replace(/(\band|[\s\-\+\(\)\,\&])/g, "")
-                            .toLowerCase()
-                    );
+                    setRepresentationCapacity("lpa");
                 } else {
                     setRepresentationCapacity(
                         values.representationCapacity
diff --git a/components/case/representation/representationCompleteSubmit.js b/components/case/representation/representationCompleteSubmit.js
index 6feecd61..0c95e90c 100644
--- a/components/case/representation/representationCompleteSubmit.js
+++ b/components/case/representation/representationCompleteSubmit.js
@@ -141,21 +141,21 @@ const RepCompleteSubmit = (props) => {
 
     let buildAppealFilesArray = [];
 
-    // let filesUploadObj =
-    //     formObj.representationForm.values.representationDocuments;
+    let filesUploadObj =
+        formObj.representationForm.values.representationDocuments;
 
-    // for (let key in filesUploadObj) {
-    //     typeof filesUploadObj[key].name != "undefined" &&
-    //         buildAppealFilesArray.push({
-    //             "name": filesUploadObj[key].name,
-    //             "size": filesUploadObj[key].size,
-    //         });
-    // }
+    for (let key in filesUploadObj) {
+        typeof filesUploadObj[key].name != "undefined" &&
+            buildAppealFilesArray.push({
+                "name": filesUploadObj[key].name,
+                "size": filesUploadObj[key].size,
+            });
+    }
 
-    // console.log(
-    //     buildAppealFilesArray,
-    //     formObj.representationForm.values.filesList
-    // );
+    console.log(
+        buildAppealFilesArray,
+        formObj.representationForm.values.filesList
+    );
 
     buildAppealFilesArray = formObj.representationForm.values.hasOwnProperty(
         "filesList"
@@ -165,23 +165,43 @@ const RepCompleteSubmit = (props) => {
 
     console.log(buildAppealFilesArray);
 
-    // const arrUniq = [
-    //     ...new Map(buildAppealFilesArray.map((v) => [v.name, v])).values(),
-    // ];
+    let arrUniq = [
+        ...new Map(buildAppealFilesArray.map((v) => [v.name, v])).values(),
+    ];
 
-    // buildAppealFilesArray = buildAppealFilesArray.filter(function (el) {
-    //     return el != null;
-    // });
+    buildAppealFilesArray = buildAppealFilesArray.filter(function (el) {
+        return el != null;
+    });
 
     // const arrUniq = buildAppealFilesArray.filter(
     //     (obj1, i, arr) => arr.findIndex((obj2) => obj2.name === obj1.name) === i
     // );
 
-    // console.log(arrUniq);
+    console.log(arrUniq, buildAppealFilesArray);
 
-    // Object.assign(formObj.representationForm.values, {
-    //     "filesList": arrUniq,
-    // });
+    arrUniq = arrUniq.concat(filesUploadObj);
+
+    function removeNullObjects(arr) {
+        if (arr.length === 0) {
+            return arr;
+        }
+        return arr.filter((obj) => obj !== null);
+    }
+    function removeEmptyObjects(arr) {
+        if (arr.length === 0) {
+            return arr;
+        }
+        return arr.filter(
+            (obj) =>
+                obj && typeof obj === "object" && Object.keys(obj).length > 0
+        );
+    }
+    arrUniq = removeNullObjects(arrUniq);
+    arrUniq = removeEmptyObjects(arrUniq);
+
+    Object.assign(formObj.representationForm.values, {
+        "filesList": arrUniq,
+    });
 
     let filterFiles = [];
     return (
@@ -363,35 +383,29 @@ const RepCompleteSubmit = (props) => {
                                     </dt>
 
                                     <dd className="govuk-summary-list__value">
-                                        {buildAppealFilesArray.length > 0
-                                            ? buildAppealFilesArray.map(
-                                                  (blob, i) => (
-                                                      <div
-                                                          key={
-                                                              blob.name +
-                                                              "_" +
-                                                              i
-                                                          }
-                                                          className="govuk-!-margin-bottom-5 fileThumb "
-                                                      >
-                                                          <img
-                                                              src={getThumbnailIconByExtension(
-                                                                  blob.name
-                                                              )}
-                                                              alt={blob.name}
-                                                              width="50"
-                                                          />
+                                        {arrUniq.length > 0
+                                            ? arrUniq.map((blob, i) => (
+                                                  <div
+                                                      key={blob.name + "_" + i}
+                                                      className="govuk-!-margin-bottom-5 fileThumb "
+                                                  >
+                                                      <img
+                                                          src={getThumbnailIconByExtension(
+                                                              blob.name
+                                                          )}
+                                                          alt={blob.name}
+                                                          width="50"
+                                                      />
 
-                                                          <span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
-                                                              {blob.name} (
-                                                              {bytesToSize(
-                                                                  blob.size
-                                                              )}
-                                                              )
-                                                          </span>
-                                                      </div>
-                                                  )
-                                              )
+                                                      <span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
+                                                          {blob.name} (
+                                                          {bytesToSize(
+                                                              blob.size
+                                                          )}
+                                                          )
+                                                      </span>
+                                                  </div>
+                                              ))
                                             : ""}
                                     </dd>
 
@@ -413,7 +427,10 @@ const RepCompleteSubmit = (props) => {
                                         </a>
                                     </dd>
                                 </div>
-                                {whichQuestionnaireCheck()}
+                                {repFormData.representationType ==
+                                "Questionnaire"
+                                    ? whichQuestionnaireCheck()
+                                    : ""}
                             </dl>
                             <p>
                                 {t(
diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js
index 4e42dd4f..bf45b64c 100644
--- a/components/case/representation/representationElements.js
+++ b/components/case/representation/representationElements.js
@@ -494,7 +494,9 @@ export const RenderPickList = ({
                         disabled={custom.disabled}
                         // onChange={onChange}
                     >
-                        <option>{t("common:drop-down-select")}</option>
+                        <option value="" disabled defaultValue>
+                            {t("common:drop-down-select")}
+                        </option>
                         {Object.keys(optionsArr).map((key, index) => {
                             return (
                                 <option key={key} value={optionsArr[key]}>
@@ -907,59 +909,6 @@ export const RenderFileUpload = (field) => {
         }
     };
 
-    const getDocumentType = (docCode) => {
-        switch (docCode) {
-            case "000001":
-                return "000001";
-                break;
-            case "000002":
-                return "000002";
-                break;
-            case "000003":
-                return "000003";
-                break;
-            case "000004":
-                return "000004";
-                break;
-            case "000005":
-                return "000005";
-                break;
-            case "000006":
-                return "000006";
-                break;
-            case "000007":
-                return "000007";
-                break;
-            case "000008":
-                return "000008";
-                break;
-            case "000009":
-                return "000009";
-                break;
-            case "000010":
-                return "000010";
-                break;
-            case "000011":
-                return "000011";
-                break;
-            case "000012":
-                return "000012";
-                break;
-            case "000013":
-                return "000013";
-                break;
-            case "000014":
-                return "000014";
-                break;
-            case "000015":
-                return "000015";
-                break;
-
-            default:
-                return "000000";
-        }
-    };
-
     const filelistObj = field.fileList || {};
 
     console.log("----", filelistObj.length);
@@ -1006,7 +955,7 @@ export const RenderFileUpload = (field) => {
             });
     }
 
-    buildAppealFilesArray = buildAppealFilesArray.concat(blobList);
+    //buildAppealFilesArray = buildAppealFilesArray.concat(blobList);
 
     function removeDuplicates(arr) {
         const seen = new Set();
@@ -1022,7 +971,7 @@ export const RenderFileUpload = (field) => {
 
     buildAppealFilesArray = removeDuplicates(buildAppealFilesArray);
 
-    blobList = buildAppealFilesArray;
+    //blobList = buildAppealFilesArray;
 
     const deleteThisBlob = async (
         containerName,
@@ -1098,9 +1047,9 @@ export const RenderFileUpload = (field) => {
             {field.meta.touched && field.meta.error && (
                 <span className="error">{field.meta.error}</span>
             )}
-            {/* {files && Array.isArray(files) && (
+            {filesUploadObj && Array.isArray(filesUploadObj) && (
                 <ul>
-                    {files.map(
+                    {filesUploadObj.map(
                         (file, i) =>
                             typeof file.name != "undefined" && (
                                 <div
@@ -1119,7 +1068,7 @@ export const RenderFileUpload = (field) => {
                             )
                     )}
                 </ul>
-            )} */}
+            )}
             {blobList.map((blob, i) => (
                 <div
                     key={blob.name + "_" + i}
diff --git a/components/case/representation/representationLPA.js b/components/case/representation/representationLPA.js
index 2af6cdf2..74933b14 100644
--- a/components/case/representation/representationLPA.js
+++ b/components/case/representation/representationLPA.js
@@ -61,6 +61,7 @@ let RepLPA = (props) => {
                 case 846040003:
                 case 846040009:
                 case 846040008:
+                case 846040010:
                 case 846040017:
                     return (
                         <S78_Questionnaire
@@ -487,6 +488,9 @@ let RepLPA = (props) => {
                                     type="submit"
                                     className="govuk-button"
                                     data-module="govuk-button"
+                                    onClick={() => {
+                                        setRepresentationSubmit(true);
+                                    }}
                                 >
                                     {t("common:continue-button")}
                                 </button>
diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
index 7783a88a..b0fc7a30 100644
--- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
@@ -87,7 +87,9 @@ let Enforcement_Questionnaire = (props) => {
                     aria-describedby="commentBox-hint"
                 >
                     <h3 className="govuk-heading-s ">
-                        Enforcement_Questionnaire{" "}
+                        Enforcement Questionnaire
+                    </h3>
+                    <h3 className="govuk-heading-s ">
                         {t("myrepresentations:enf-section-heading-one")}{" "}
                     </h3>
                     <div className="govuk-form-group">
diff --git a/components/case/summaryTypes/pinswg_callinss77id.js b/components/case/summaryTypes/pinswg_callinss77id.js
index fe03ca96..bb649b14 100644
--- a/components/case/summaryTypes/pinswg_callinss77id.js
+++ b/components/case/summaryTypes/pinswg_callinss77id.js
@@ -313,13 +313,13 @@ const Pinswg_callinss77id = (props) => {
                                     <dd className="govuk-summary-list__value">
                                         {_.has(
                                             detailsObj,
-                                            "pinswg_statementduedate"
+                                            "pinswg_statementsduedate"
                                         )
                                             ? !_.isEmpty(
-                                                  detailsObj.pinswg_statementduedate
+                                                  detailsObj.pinswg_statementsduedate
                                               )
                                                 ? formatDates(
-                                                      detailsObj.pinswg_statementduedate
+                                                      detailsObj.pinswg_statementsduedate
                                                   )
                                                 : t(
                                                       "case:summary-no-date-entered-label"
diff --git a/components/representation.js b/components/representation.js
index 8cc7d005..0f4495b1 100644
--- a/components/representation.js
+++ b/components/representation.js
@@ -27,6 +27,12 @@ const CaseRepresentation = (props) => {
                         searchDetailsObj={props.searchDetailsObj}
                         searchString={props.searchString}
                         props={props.props}
+                        showQuestionnaireSection={
+                            props.showQuestionnaireSection
+                        }
+                        setShowQuestionnaireSection={
+                            props.setShowQuestionnaireSection
+                        }
                     />
                 </div>
             </div>
diff --git a/data/formsxml/planningappeals78.xml b/data/formsxml/planningappeals78.xml
index afb9a268..33a5df56 100644
--- a/data/formsxml/planningappeals78.xml
+++ b/data/formsxml/planningappeals78.xml
@@ -148,7 +148,7 @@
 									<labels>
 										<label description="Owners" />
 									</labels>
-									<control id="pinswg_owners" parentField="pinswg_ownershipcertificate" parentFieldShowOnValue="846040002" classid="{0273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_owners" disabled="false" maxsubfield="5" />
+									<control id="pinswg_owners" parentField="pinswg_ownershipcertificate" parentFieldShowOnValue="846040002" classid="{0273EDBD-AC1D-40d3-9FB2-095C621B552D}" datafieldname="pinswg_owners" disabled="false" maxsubfield="10" />
 								</row>
 								<row>
 									<labels>
diff --git a/locales/en/myrepresentations.json b/locales/en/myrepresentations.json
index 5fd5ee1a..7f5aca3c 100644
--- a/locales/en/myrepresentations.json
+++ b/locales/en/myrepresentations.json
@@ -40,10 +40,10 @@
     "rep-complete-para-three": "You will shortly receive confirmation to the email address you have provided.",
     "lpa-capacity-para-one": "This form enables you to submit statements, comments and questionaires on a case to Planning and Environment Decisions Wales.",
     "s78-section-heading-one": "Appeal procedure and site visit",
-    "s78-section-question-1": "PEDW Reference: ",
-    "s78-section-question-2": "LPA reference:",
-    "s78-section-question-4": "Appeal type:",
-    "s78-section-question-3": "Site Address: ",
+    "s78-section-question-1": "PEDW Reference",
+    "s78-section-question-2": "LPA reference",
+    "s78-section-question-4": "Appeal type",
+    "s78-section-question-3": "Site Address",
     "s78-section-question-5": "Which procedure do you consider the appeal should follow?",
     "s78-section-question-6": "Will the Inspector need to enter the appeal site/property?",
     "s78-section-question-7": "Do you consider that the Inspector needs to enter neighbouring private land/property to view the site?",
@@ -52,11 +52,11 @@
     "s78-section-question-8-hint": "If No, give reasons for why you consider an Accompanied Site Visit to be necessary",
     "s78-section-question-9": "Are you aware of any health and safety issues which would need to be considered when the Inspector visits the site?",
     "s78-section-question-9-hint": "If Yes, describe the health and safety issues to be considered",
-    "s78-section-question-10": "LPA contact for site visit, hearing or inquiry arrangements:",
+    "s78-section-question-10": "LPA contact for site visit, hearing or inquiry arrangements",
     "s78-section-heading-two": "Supporting documents",
     "s78-section-question-11": "LPA case file and representations",
     "s78-section-question-11-hint": "Insert weblink(s) to case file and representations on the LPA’s public portal. This must include all documents which were before the LPA at the time of its decision or when the appeal was made. Ensure that you link directly to the case documents list, not to a generic page on the LPA’s portal. If web-based comments were also made, insert a second link to that page. Alternatively, state here if you are sending relevant case file documents under separate cover.",
-    "s78-section-question-12": "LPA’s adopted local development plan and Proposals Map:",
+    "s78-section-question-12": "LPA’s adopted local development plan and Proposals Map",
     "s78-section-question-12-hint": "Insert weblinks to the Written Statement of the adopted LDP/UDP, and the accompanying Proposals Map (including map key). Alternatively, list relevant policies here and attach excerpts.",
     "s78-section-question-13": "Adopted local guidance relevant to the proposal",
     "s78-section-question-13-hint": "Insert weblink(s) to any relevant any local guidance (e.g. Supplementary Planning Guidance, Conservation Area appraisals) which the LPA considers relevant, specifying the document name before the web link. Alternatively, list the relevant guidance and attach copies/excerpts.",
@@ -79,7 +79,7 @@
     "s78-section-question-23": "Have you received comments or directions from any government department/agency or statutory undertaker, including in response to a statutory notification or consultation?",
     "s78-section-question-23-hint": "If Yes, specify which and attach any relevant details",
     "s78-section-heading-four": "Suggested conditions",
-    "s78-section-question-24": "Review the following standard conditions and advise whether they would be necessary if permission/consent is granted (not applicable to Advertisement consent proposals):",
+    "s78-section-question-24": "Review the following standard conditions and advise whether they would be necessary if permission/consent is granted (not applicable to Advertisement consent proposals)",
     "s78-section-question-24a": "a) The development shall begin not later than five years from the date of this decision. Reason: To comply with Section 91 of the Town and Country Planning Act 1990 / Section 18 of the Town and Country Planning (Listed Building and Conservation Areas) Act 1990.",
     "s78-section-question-24b": "b) The development shall be carried out in accordance with the following approved plans and documents: ............................ Reason: To ensure the development is carried out in accordance with the approved documents, plans and drawings submitted with the application.",
     "s78-section-question-24b-hint": "If Yes, list the approved plans, documents and drawings here or list them in an attached document",
@@ -87,7 +87,7 @@
     "s78-section-question-24d": "d) No development shall take place until a scheme to enable the provision of gigabit capable broadband infrastructure from the site boundary to the dwellings/buildings hereby permitted has been submitted to and agreed in writing by the local planning authority. Development shall be carried out in accordance with the approved details. Reason: To support the roll-out of digital communications infrastructure across Wales in accordance with Policy 13 of Future Wales.",
     "s78-section-question-25": "Do you consider other conditions, or amended versions of the above standard conditions, to be necessary?",
     "s78-section-question-25-hint": "If Yes, list them here or in an attached document. Include reasons and relevant development plan policies. If you intend to send suggested conditions alongside your 4 week statement, state this here.",
-    "s78-section-heading-five": "Before sending, have you attached or provided a web link to:",
+    "s78-section-heading-five": "Before sending, have you attached or provided a web link to",
     "s78-section-question-26": "A copy of the applicant’s certificate confirming that they notified persons with an interest in the land?",
     "s78-section-question-26-hint": "Insert weblink here if available online. If No, give reasons",
     "s78-section-question-27": "Evidence of any publicity given to the application, including site notices and local advertisement?**",
@@ -110,9 +110,9 @@
     "s78-section-question-onbehalf": "On behalf of",
     "s78-section-question-date": "Date",
     "enf-section-heading-one": "Appeal procedure and site visit",
-    "enf-section-question-1": "PEDW Reference: ",
-    "enf-section-question-2": "LPA reference:",
-    "enf-section-question-3": "Site Address: ",
+    "enf-section-question-1": "PEDW Reference",
+    "enf-section-question-2": "LPA reference",
+    "enf-section-question-3": "Site Address",
     "enf-section-question-4": "Which procedure do you consider the appeal should follow?",
     "enf-section-question-4-hint": "If Hearing or Inquiry, provide reasons here for why you consider this to be justified. If you consider an Inquiry is necessary, please state your estimated number of sitting days.",
     "enf-section-question-5": "Will the Inspector need to enter the appeal site/property?",
@@ -122,7 +122,7 @@
     "enf-section-question-7-hint": "If No, give reasons for why you consider an Accompanied Site Visit to be necessary",
     "enf-section-question-8": "Are you aware of any health and safety issues which would need to be considered when the Inspector visits the site?",
     "enf-section-question-8-hint": "If Yes, describe the health and safety issues to be considered",
-    "enf-section-question-9": "LPA contact for site visit, hearing or inquiry arrangements:",
+    "enf-section-question-9": "LPA contact for site visit, hearing or inquiry arrangements",
     "enf-section-question-9-hint": "If Yes, describe the health and safety issues to be considered",
     "enf-section-heading-two": "Deemed Application Fee",
     "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?",
@@ -142,7 +142,7 @@
     "enf-section-question-17": "Have permitted development rights been restricted by any previous planning condition?",
     "enf-section-question-17-hint": "If Yes, please provide details and submit any relevant documents, listing them here.",
     "enf-section-heading-four": "Supporting Documents",
-    "enf-section-question-18": "LPA’s adopted local development plan and Proposals Map:",
+    "enf-section-question-18": "LPA’s adopted local development plan and Proposals Map",
     "enf-section-question-18-hint": "Insert weblinks to the Written Statement of the adopted LDP/UDP, and the accompanying Proposals Map (including map key). Alternatively, list relevant policies here and attach excerpts.",
     "enf-section-question-19": "Adopted local guidance relevant to the proposal",
     "enf-section-question-19-hint": "Insert weblink(s) to any relevant any local guidance (e.g. Supplementary Planning Guidance, Conservation Area appraisals) which the LPA considers relevant, specifying the document name before the web link. Alternatively, list the relevant guidance and attach copies/excerpts.",
@@ -167,14 +167,14 @@
     "enf-section-question-30": "Have you received comments or directions from any government department/agency or statutory undertaker, including in response to a statutory notification or consultation?",
     "enf-section-question-30-hint": "If Yes, specify which and attach any relevant details",
     "enf-section-heading-six": "Suggested conditions",
-    "enf-section-question-31": "Review the following standard conditions and advise whether they would be necessary if permission/consent is granted (not applicable to Advertisement consent proposals):",
+    "enf-section-question-31": "Review the following standard conditions and advise whether they would be necessary if permission/consent is granted (not applicable to Advertisement consent proposals)",
     "enf-section-question-31a": "a) The development shall be carried out in accordance with the following approved plans and documents: ............................ Reason: To ensure the development is carried out in accordance with the approved documents, plans and drawings submitted with the application.",
     "enf-section-question-31a-hint": "If Yes, list the approved plans, documents and drawings here or list them in an attached document",
     "enf-section-question-31b": "b) No development shall take place until a scheme for biodiversity enhancement has been submitted to and agreed in writing by the local planning authority. Development shall be carried out in accordance with the approved details. Reason: In the interests of maintaining and enhancing biodiversity, in accordance with Future Wales Policy 9.",
     "enf-section-question-31c": "c) No development shall take place until a scheme to enable the provision of gigabit capable broadband infrastructure from the site boundary to the dwellings/buildings hereby permitted has been submitted to and agreed in writing by the local planning authority. Development shall be carried out in accordance with the approved details. Reason: To support the roll-out of digital communications infrastructure across Wales in accordance with Policy 13 of Future Wales.",
     "enf-section-question-32": "Do you consider other conditions, or amended versions of the above standard conditions, to be necessary?",
     "enf-section-question-32-hint": "If Yes, list them here or in an attached document. Include reasons and relevant development plan policies. If you intend to send suggested conditions alongside your 4 week statement, state this here.",
-    "enf-section-heading-seven": "Before sending, have you attached or provided a web link to:",
+    "enf-section-heading-seven": "Before sending, have you attached or provided a web link to",
     "enf-section-question-33": "A true copy of the enforcement notice?",
     "enf-section-question-33-hint": "Insert weblink here if available online. If No, give reasons",
     "enf-section-question-34": "The enforcement notice plan.",
diff --git a/pages/myportal/representation.js b/pages/myportal/representation.js
index d8b417fe..56e54c9a 100644
--- a/pages/myportal/representation.js
+++ b/pages/myportal/representation.js
@@ -1,6 +1,6 @@
 import useTranslation from "next-translate/useTranslation";
 import Head from "next/head";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 
 import { getSession, useSession } from "next-auth/react";
 import { useRouter } from "next/router";
@@ -60,6 +60,8 @@ const RepresentationF = (props) => {
 
     const dispatch = useDispatch();
 
+    const [showQuestionnaireSection, setShowQuestionnaireSection] = useState(1);
+
     // useEffect(() => {
     //     const updateAccountStore = async () => {
     //         const thisSession = await getSession();
@@ -158,7 +160,14 @@ const RepresentationF = (props) => {
                 <CookieBanner />
                 <Header />
                 <div className="govuk-width-container">
-                    <Breadcrumbs slug={appealtypes} props={props} />
+                    <Breadcrumbs
+                        slug={appealtypes}
+                        props={props}
+                        setShowQuestionnaireSection={
+                            setShowQuestionnaireSection
+                        }
+                        showQuestionnaireSection={showQuestionnaireSection}
+                    />
                     <ServiceBanner props={props} />
                     <Case
                         myCases={props.myCases.myCases}
@@ -189,6 +198,10 @@ const RepresentationF = (props) => {
                             props.searchResultsObj.representationsObj
                         }
                         props={props}
+                        setShowQuestionnaireSection={
+                            setShowQuestionnaireSection
+                        }
+                        showQuestionnaireSection={showQuestionnaireSection}
                     />
                 </div>
                 <Footer footerLinks={footerLinks} ticketnumber={props} />
@@ -251,7 +264,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
                 ? true
                 : false;
 
-        isLPA && store.dispatch(setRepresentationCapacity("lpa"));
+        //isLPA && store.dispatch(setRepresentationCapacity("lpa"));
 
         if (query.hasOwnProperty("state")) {
             console.log("is lpa?:", isLPA);
diff --git a/store/currentView/action.js b/store/currentView/action.js
index 386f9c85..95dadefb 100644
--- a/store/currentView/action.js
+++ b/store/currentView/action.js
@@ -76,7 +76,7 @@ export const setRepresentationReset = () => (dispatch) => {
         type: currentViewActionTypes.SETREPRESENTATIONRESET,
         representationCapacity: {},
         representationSubmit: "",
-        representationSubmitConfirmation: {},
+        representationSubmitConfirmation: false,
         representationMessageSent: false,
     });
 };
diff --git a/store/currentView/reducer.js b/store/currentView/reducer.js
index df8cdbae..e2bff8ac 100644
--- a/store/currentView/reducer.js
+++ b/store/currentView/reducer.js
@@ -5,7 +5,7 @@ const currentViewInitialState = {
     caseReference: {},
     representationCapacity: "",
     representationSubmit: "",
-    representationSubmitConfirmation: {},
+    representationSubmitConfirmation: false,
     representationMessageSent: false,
     linkedCaseReferences: {},
     currentPage: 1,
@@ -58,7 +58,7 @@ export default function reducer(state = currentViewInitialState, action) {
                 ...state,
                 representationCapacity: {},
                 representationSubmit: "",
-                representationSubmitConfirmation: {},
+                representationSubmitConfirmation: false,
                 representationMessageSent: false,
             };
         case currentViewActionTypes.SETCURRENTPAGE: