diff --git a/components/elements/index.js b/components/elements/index.js
index cbb9409a..49d756f6 100644
--- a/components/elements/index.js
+++ b/components/elements/index.js
@@ -581,7 +581,7 @@ const RenderDatePicker = ({
>
{FieldsTranslations(label)}
- {custom.hint != false && (
+ {custom.hasOwnProperty("hint") && (
{t(custom.hint)}
diff --git a/components/newappeal/buildcheckrow.js b/components/newappeal/buildcheckrow.js
index 595df026..2fc7f83d 100644
--- a/components/newappeal/buildcheckrow.js
+++ b/components/newappeal/buildcheckrow.js
@@ -191,9 +191,8 @@ let BuildCheckRow = (props) => {
}}
>
- {
- tenant.pinswg_agriculturaltenantname
- }
+ {tenant.pinswg_agriculturaltenantname ||
+ tenant.pinswg_owners}
Served:{" "}
diff --git a/components/pdftemplates/appealRow_pdf.js b/components/pdftemplates/appealRow_pdf.js
index 5dd85e0f..9f5c3dc5 100644
--- a/components/pdftemplates/appealRow_pdf.js
+++ b/components/pdftemplates/appealRow_pdf.js
@@ -55,6 +55,8 @@ export const AppealRow_pdf = (props) => {
borderColor: "#eee",
paddingLeft: 10,
backgroundColor: "white",
+ display: "flex",
+ flexWrap: "wrap",
},
questionAnswerMid: {
color: "#757575",
@@ -65,6 +67,8 @@ export const AppealRow_pdf = (props) => {
borderColor: "#eee",
paddingLeft: 10,
backgroundColor: "white",
+ display: "flex",
+ flexWrap: "wrap",
},
questionAnswerWide: {
color: "#757575",
@@ -103,10 +107,11 @@ export const AppealRow_pdf = (props) => {
textAlign: "center",
color: "grey",
},
-
+ documentList: {
+ fontSize: 10,
+ },
richArea: {
fontSize: 12,
- color: "red",
flexDirection: "column",
},
});
@@ -145,6 +150,47 @@ export const AppealRow_pdf = (props) => {
return labelTrans;
};
+ const getDocumentTypeFromFilename = (filename) => {
+ var doctypeCode = "000000";
+
+ if (filename.indexOf("_-_Statement_of_Case") > 0)
+ doctypeCode = "000000";
+ else if (filename.indexOf("_-_Application_Form") > 0)
+ doctypeCode = "000001";
+ else if (filename.indexOf("_-_Site_Ownership_Certificate") > 0)
+ doctypeCode = "000002";
+ else if (filename.indexOf("_-_Decision_Notice") > 0)
+ doctypeCode = "000003";
+ else if (filename.indexOf("_-_Site_Location_Plan") > 0)
+ doctypeCode = "000004";
+ else if (filename.indexOf("_-_Plans_Drawing_Documents") > 0)
+ doctypeCode = "000005";
+ else if (filename.indexOf("_-_Additional_Plans_Drawings_Documents") > 0)
+ doctypeCode = "000006";
+ else if (filename.indexOf("_-_Design_and_Access_Statement") > 0)
+ doctypeCode = "000007";
+ else if (filename.indexOf("_-_Green_Infrastructure_Statement") > 0)
+ doctypeCode = "000008";
+ else if (filename.indexOf("_-_LPA_Correspondence") > 0)
+ doctypeCode = "000009";
+ else if (filename.indexOf("_-_LPA_Original_Permission") > 0)
+ doctypeCode = "000010";
+ else if (filename.indexOf("_-_LPA's_Registration_Letter") > 0)
+ doctypeCode = "000010";
+ else if (filename.indexOf(+"_-_Environmental_Statement") > 0)
+ doctypeCode = "000012";
+ else if (filename.indexOf("_-_Cost_of_Application") > 0)
+ doctypeCode = "000013";
+ else if (filename.indexOf("_-_Other_Relevant_Material") > 0)
+ doctypeCode = "000014";
+ else if (
+ filename.indexOf("_-_S106_Agreement_or_Unilateral_Undertaking") > 0
+ )
+ doctypeCode = "000015";
+
+ return doctypeCode;
+ };
+
return (
<>
{Object.keys(rowXML).map((key, index) => {
@@ -364,12 +410,14 @@ export const AppealRow_pdf = (props) => {
);
break;
case "{16D63FD6-119B-4353-BDCA-18358721C3FE}":
- const blobList = jsonpath(
- "$..[?(@.documentType=='" +
- documentTypeCode[0].value +
- "')]",
- props.filesList
- );
+ // const blobList = jsonpath(
+ // "$..[?(@.documentType=='" +
+ // documentTypeCode[0].value +
+ // "')]",
+ // props.filesList
+ // );
+
+ const blobList = props.filesList;
return (
{
>
{blobList.map((blob, i) => (
- {blob.name} -{" "}
- {bytesToSize(
- blob.contentLength
+ {getDocumentTypeFromFilename(
+ blob.name
+ ) ===
+ documentTypeCode[0]
+ .value && (
+
+ {blob.name} -{" "}
+ {bytesToSize(
+ blob.size
+ )}{" "}
+ {"\n"}
+
)}
))}
@@ -469,9 +530,8 @@ export const AppealRow_pdf = (props) => {
"20",
}}
>
- {
- tenant.pinswg_agriculturaltenantname
- }
+ {tenant.pinswg_agriculturaltenantname ||
+ tenant.pinswg_owners}
{
);
+ case "{67FAC785-CD58-4f9f-ABB3-4B7DDC6ED5ED}":
+ return (
+
+
+ {rows[0].value}
+
+
+ {props.props[
+ datafieldname[0].value
+ ] == "true"
+ ? "Yes"
+ : "No"}
+
+
+ );
+ break;
default:
return (
{
{rows[0].value}
- {" "}
{
props.props[
datafieldname[0].value
diff --git a/components/pdftemplates/planningappeals78_pdf.js b/components/pdftemplates/planningappeals78_pdf.js
index 19875061..0970bc03 100644
--- a/components/pdftemplates/planningappeals78_pdf.js
+++ b/components/pdftemplates/planningappeals78_pdf.js
@@ -91,7 +91,6 @@ const styles = StyleSheet.create({
richArea: {
fontSize: 12,
- color: "red",
flexDirection: "column",
},
});
diff --git a/data/formsxml/planningappeals78.xml b/data/formsxml/planningappeals78.xml
index c3e7a791..4dc15fbc 100644
--- a/data/formsxml/planningappeals78.xml
+++ b/data/formsxml/planningappeals78.xml
@@ -144,14 +144,12 @@
-