@@ -978,13 +984,13 @@ let S78_Questionnaire = (props) => {
className="govuk-input govuk-!-width-one-half"
id="onBehalfOfLPA"
name="onBehalfOfLPA"
- data-aria-controls="caseOfficer"
+ data-aria-controls="onBehalfOfLPA"
type="text"
component={RenderTextfield}
label={t(
"myrepresentations:s78-section-question-onbehalf"
)}
- validate={[required]}
+ errorMsg="Is required"
/>
- wwww
{
};
const getDocumentType = (docCode) => {
+ const repDate = new Date();
+
+ let day = repDate.getDate();
+ let month = repDate.getMonth() + 1;
+ let year = repDate.getFullYear();
+
+ const pdfFileNameDateStamp = year + "-" + month + "-" + day;
+
switch (docCode) {
+ case "000000":
+ return pdfFileNameDateStamp + "_-_Statement_of_Case";
case "000001":
- return "000001";
+ return pdfFileNameDateStamp + "_-_Application_Form";
break;
case "000002":
- return "000002";
+ return pdfFileNameDateStamp + "_-_Site_Ownership_Certificate";
break;
case "000003":
- return "000003";
+ return pdfFileNameDateStamp + "_-_Decision_Notice";
break;
case "000004":
- return "000004";
+ return pdfFileNameDateStamp + "_-_Site_Location_Plan";
break;
case "000005":
- return "000005";
+ return pdfFileNameDateStamp + "_-_Plans_Drawing_Documents";
break;
case "000006":
- return "000006";
+ return (
+ pdfFileNameDateStamp +
+ "_-_Additional_Plans_Drawings_Documents"
+ );
break;
case "000007":
- return "000007";
+ return pdfFileNameDateStamp + "_-_Design_and_Access_Statement";
break;
case "000008":
- return "000008";
+ return (
+ pdfFileNameDateStamp + "_-_Green_Infrastructure_Statement"
+ );
break;
case "000009":
- return "000009";
+ return pdfFileNameDateStamp + "_-_LPA_Correspondence";
break;
case "000010":
- return "000010";
+ return pdfFileNameDateStamp + "_-_LPA_Original_Permission";
break;
case "000011":
- return "000011";
+ return pdfFileNameDateStamp + "_-_LPA's_Registration_Letter";
break;
case "000012":
- return "000012";
+ return pdfFileNameDateStamp + +"_-_Environmental_Statement";
break;
case "000013":
- return "000013";
+ return pdfFileNameDateStamp + "_-_Cost_of_Application";
break;
case "000014":
- return "000014";
+ return pdfFileNameDateStamp + "_-_Other_Relevant_Material";
break;
case "000015":
- return "000015";
+ return (
+ pdfFileNameDateStamp +
+ "_-_S106_Agreement_or_Unilateral_Undertaking"
+ );
break;
default:
- return "000000";
+ return pdfFileNameDateStamp + "_-_000000_-_";
}
};
@@ -1649,6 +1666,7 @@ const RenderFileUpload = (field) => {
"$..[?(@.documentType=='" + field.documentTypeCode + "')]",
filelistObj
);
+ //const blobList = filelistObj;
const deleteThisBlob = async (
containerName,
@@ -1688,7 +1706,7 @@ const RenderFileUpload = (field) => {
(file) =>
new File(
[file],
- `${getDocumentType(field.documentTypeCode)}_${
+ `${getDocumentType(field.documentTypeCode)}_-_${
file.name
}`,
{
@@ -1755,53 +1773,55 @@ const RenderFileUpload = (field) => {
)}
)}
- {blobList.map((blob, i) => (
-
{finaliseAppealProcess ? (
diff --git a/components/newappeal/buildsection.js b/components/newappeal/buildsection.js
index e7d73b50..bc92e2ff 100644
--- a/components/newappeal/buildsection.js
+++ b/components/newappeal/buildsection.js
@@ -177,6 +177,21 @@ let BuildSection = (props) => {
"\n////////////////////////\n"
);
+ // let pdfObj = values;
+
+ // Object.assign(pdfObj, {
+ // "containerID": props.props.accountDetails.containerID,
+ // "casefolderID": props.appealType.caseReference.ticketnumber,
+ // });
+
+ // generateAppealPDF(
+ // pdfObj,
+ // props.props.accountDetails.containerID,
+ // props.appealType.caseReference.ticketnumber,
+ // router.query.appealtypes,
+ // props.appealType.fileList
+ // ),
+
props.setNewAppealProgress(
getProgressObj(formXML, titleList, mandatoryFieldsData, props)
);
diff --git a/data/formsxml/planningappeals78.xml b/data/formsxml/planningappeals78.xml
index 17af76b4..fdfc1d9a 100644
--- a/data/formsxml/planningappeals78.xml
+++ b/data/formsxml/planningappeals78.xml
@@ -392,7 +392,7 @@
-
+ )
+ )}{" "}
);
};
diff --git a/components/newappeal/buildCheckfield.js b/components/newappeal/buildCheckfield.js
index 23bd2d81..6ca59f1c 100644
--- a/components/newappeal/buildCheckfield.js
+++ b/components/newappeal/buildCheckfield.js
@@ -62,7 +62,19 @@ export default function BuildField(props) {
return <>{fieldValue};
break;
case "{16D63FD6-119B-4353-BDCA-18358721C3FE}":
- return <> docs {fieldValue};
+ return <> {fieldValue};
+ break;
+ case "{E0DECE4B-6666-4a8f-A065-082708572369}":
+ return (
+ <>
+
+
+ );
break;
default:
diff --git a/components/newappeal/buildcheckrow.js b/components/newappeal/buildcheckrow.js
index 78ffa703..d4701aed 100644
--- a/components/newappeal/buildcheckrow.js
+++ b/components/newappeal/buildcheckrow.js
@@ -169,7 +169,14 @@ let BuildCheckRow = (props) => {
)
: fieldtype[0].value ==
"{16D63FD6-119B-4353-BDCA-18358721C3FE}"
- ? "ssss"
+ ? (console.log(
+ props.props.form[
+ "appealForm"
+ ].values[
+ datafieldname[0].value
+ ]
+ ),
+ (
- {
- deleteThisBlob(
- field.containerID,
- blob.name,
- blob.hasheddeletepath,
- blob.hashgetblobs,
- field.ticketnumber
- );
- }}
- title="Remove this file"
+ {blobList.map(
+ (blob, i) =>
+ blob.documentType == field.documentTypeCode && (
+ })
+
-
- {blob.name.slice(blob.name.indexOf("_") + 1)}(
- {bytesToSize(blob.contentLength)})
-
-
- ))}{" "}
+
+ {blob.name} ({bytesToSize(blob.contentLength)})
+
+
- −
-
-
-
+ {
+ deleteThisBlob(
+ field.containerID,
+ blob.name,
+ blob.hasheddeletepath,
+ blob.hashgetblobs,
+ field.ticketnumber
+ );
+ }}
+ title="Remove this file "
+ >
+ −
+
+
+ sdfsd eeefsdfs
))
: fieldtype[0].value ==
"{0273EDBD-AC1D-40d3-9FB2-095C621B552D}"
? props.props.form[
diff --git a/components/newappeal/buildchecksection.js b/components/newappeal/buildchecksection.js
index b7eb1245..195bfcac 100644
--- a/components/newappeal/buildchecksection.js
+++ b/components/newappeal/buildchecksection.js
@@ -95,6 +95,14 @@ let BuildCheckSection = (props) => {
}
}
+ props.props.form.appealForm.values.filesList.hasOwnProperty("value")
+ ? (buildAppealFilesArray = buildAppealFilesArray.concat(
+ props.props.form.appealForm.values.filesList.value[0]
+ ))
+ : (buildAppealFilesArray = buildAppealFilesArray.filesList);
+
+ console.log(buildAppealFilesArray);
+
let pdfObj = props.props.form.appealForm.values;
Object.assign(pdfObj, {
@@ -169,58 +177,58 @@ let BuildCheckSection = (props) => {
))}
-
-
-
- {buildAppealFilesArray.length > 0
- ? buildAppealFilesArray.map((blob, i) => {
- console.log(
- "thetre blbo:",
- buildAppealFilesArray,
- blob
- );
- return (
- -+
0 + ? buildAppealFilesArray.map((blob, i) => { + return ( + <> +
+- ); - }) - : ""} - -- +
+++- + + {blob.name} ( + {bytesToSize( + blob.size || + blob.contentLength )} - alt={blob.name.slice( - blob.name.indexOf( - "_" - ) + 1 - )} - width="50" - /> - - - {blob.name.slice( - blob.name.indexOf( - "_" - ) + 1 - )} - ({bytesToSize(blob?.size)} ) -
- - { - updateCurrentSection(sectionCount); - }} - > - {t("newappeal:change-link-label")} - -
-
+ - +
- + { + updateCurrentSection( + sectionCount + ); + }} + > + {t( + "newappeal:change-link-label" + )} + + +
-
+
+ );
+ })
+ : ""}