robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated file name prefixes

Browse Source
This commit is contained in:
robbond
2024-05-21 14:03:24 +01:00
parent f4c821a5d4
commit 6bf933b2f1
17 changed files with 503 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
actions/azurestorage.js
+75 -3
View File
@@ -164,6 +164,45 @@ export const getContainers = async () => {
} }
}; };
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;
};
export const getBlobs = async (containerName, casefolderID) => { export const getBlobs = async (containerName, casefolderID) => {
const containerToken = await createContainerSas(containerName); const containerToken = await createContainerSas(containerName);
const sasUrl = `${STORAGE_PATH}/${containerName}?${containerToken}`; const sasUrl = `${STORAGE_PATH}/${containerName}?${containerToken}`;
@@ -182,7 +221,9 @@ export const getBlobs = async (containerName, casefolderID) => {
blobObj.push({ blobObj.push({
"name": blob.name.split("/")[2], "name": blob.name.split("/")[2],
"path": blob.name, "path": blob.name,
"documentType": blobDocumentType, "documentType": getDocumentTypeFromFilename(
blob.name.split("/")[2]
),
"versionId": blob.versionId, "versionId": blob.versionId,
"caseObj": casefolderID + "/" + casefolderID + "_case.json", "caseObj": casefolderID + "/" + casefolderID + "_case.json",
"isCurrentVersion": blob.isCurrentVersion, "isCurrentVersion": blob.isCurrentVersion,
@@ -195,7 +236,7 @@ export const getBlobs = async (containerName, casefolderID) => {
"&casefolderID=" + "&casefolderID=" +
casefolderID + casefolderID +
"&blobname=" + "&blobname=" +
blob.name.split("/")[2], blob.name,
"hashedfilepath": hashAPIPath( "hashedfilepath": hashAPIPath(
"/api/file/downloadblob?container=" + "/api/file/downloadblob?container=" +
containerName + containerName +
@@ -479,7 +520,38 @@ export const uploadFile = async (formContent, containerName, foldername) => {
); );
let whichLocation = let whichLocation =
files[prop][0].fieldName.indexOf("_IP_") > 0 files[prop][0].fieldName.indexOf("_Statement_of_Case") > 0 ||
files[prop][0].fieldName.indexOf("_-_Statement_of_Case") > 0 ||
files[prop][0].fieldName.indexOf("_-_Application_Form") > 0 ||
files[prop][0].fieldName.indexOf("_-_Site_Ownership_Certificate") >
0 ||
files[prop][0].fieldName.indexOf("_-_Decision_Notice") > 0 ||
files[prop][0].fieldName.indexOf("_-_Site_Location_Plan") > 0 ||
files[prop][0].fieldName.indexOf("_-_Plans_Drawing_Documents") >
0 ||
files[prop][0].fieldName.indexOf(
"_-_Additional_Plans_Drawings_Documents"
) > 0 ||
files[prop][0].fieldName.indexOf("_-_Design_and_Access_Statement") >
0 ||
files[prop][0].fieldName.indexOf(
"_-_Green_Infrastructure_Statement"
) > 0 ||
files[prop][0].fieldName.indexOf("_-_LPA_Correspondence") > 0 ||
files[prop][0].fieldName.indexOf("_-_LPA_Original_Permission") >
0 ||
files[prop][0].fieldName.indexOf("_-_LPA's_Registration_Letter") >
0 ||
files[prop][0].fieldName.indexOf(+"_-_Environmental_Statement") >
0 ||
files[prop][0].fieldName.indexOf("_-_Cost_of_Application") > 0 ||
files[prop][0].fieldName.indexOf("_-_Other_Relevant_Material") >
0 ||
files[prop][0].fieldName.indexOf(
"_-_S106_Agreement_or_Unilateral_Undertaking" > 0
)
? "Main Party Submission"
: files[prop][0].fieldName.indexOf("_IP_") > 0
? "Interested Party Representations" ? "Interested Party Representations"
: files[prop][0].fieldName.indexOf("_Statement_") > 0 : files[prop][0].fieldName.indexOf("_Statement_") > 0
? "Main Party Statements" ? "Main Party Statements"
components/case/representation/index.js
+2
View File
@@ -343,6 +343,7 @@ let MakeRepresentation = (props) => {
setQuestionnaireCount={setQuestionnaireCount} setQuestionnaireCount={setQuestionnaireCount}
questionnaireCount={questionnaireCount} questionnaireCount={questionnaireCount}
setRepFileName={setRepFileName} setRepFileName={setRepFileName}
updateRepresentation={updateRepresentation}
/> />
); );
break; break;
@@ -632,6 +633,7 @@ let MakeRepresentation = (props) => {
}; };
const onHandleSubmit = (values) => { const onHandleSubmit = (values) => {
window.scrollTo({ top: 0, behavior: "smooth" });
values = setRepFileName(values); values = setRepFileName(values);
console.log("onHandleSubmit form values - ", JSON.stringify(values)); console.log("onHandleSubmit form values - ", JSON.stringify(values));
components/case/representation/representationElements.js
+50 -21
View File
@@ -534,22 +534,30 @@ export const RenderTextfield = ({
return ( return (
<> <>
<label className="govuk-label " htmlFor={id} id={id + "_label"}> <div
{label} className={
</label> touched && error
{touched && error && ( ? "govuk-form-group govuk-form-group--error"
<span id={id + "-error"} className="govuk-error-message"> : "govuk-form-group "
<span className="govuk-visually-hidden">Error:</span>{" "} }
{errorMsg} >
</span> <label className="govuk-label " htmlFor={id} id={id + "_label"}>
)} {label}
<input </label>
{...input} {touched && error && (
className={className} <span id={id + "-error"} className="govuk-error-message">
name={name} <span className="govuk-visually-hidden">Error:</span>{" "}
id={id} {errorMsg}
type={type} </span>
/> )}
<input
{...input}
className={className}
name={name}
id={id}
type={type}
/>
</div>
</> </>
); );
}; };
@@ -953,10 +961,30 @@ export const RenderFileUpload = (field) => {
const filelistObj = field.fileList || {}; const filelistObj = field.fileList || {};
const blobList = jsonpath( // const blobList = jsonpath(
"$..[?(@.documentType=='" + field.documentTypeCode + "')]", // "$..[?(@.documentType=='" + field.documentTypeCode + "')]",
filelistObj // filelistObj
); // );
let blobList = filelistObj;
// let buildAppealFilesArray = [];
// let filesUploadObj = field.input.value;
// for (let key in filesUploadObj) {
// for (let j in filesUploadObj[key]) {
// typeof filesUploadObj[key][j].name != "undefined" &&
// buildAppealFilesArray.push({
// "name": filesUploadObj[key][j].name,
// "size": filesUploadObj[key][j].size,
// });
// }
// }
// buildAppealFilesArray = buildAppealFilesArray.concat(blobList);
// blobList = buildAppealFilesArray;
const deleteThisBlob = async ( const deleteThisBlob = async (
containerName, containerName,
@@ -1082,7 +1110,8 @@ export const RenderFileUpload = (field) => {
} }
className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link" className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link"
> >
{blob.name}({bytesToSize(blob.contentLength)}) {blob.name} (
{bytesToSize(blob.contentLength || blob.size)}) ww
</Link> </Link>
</div> </div>
))}{" "} ))}{" "}
components/case/representation/representationLPA.js
+23 -13
View File
@@ -50,6 +50,7 @@ let RepLPA = (props) => {
questionnaireCount, questionnaireCount,
setQuestionnaireCount, setQuestionnaireCount,
setRepFileName, setRepFileName,
updateRepresentation,
} = props; } = props;
const { acceptedFiles, getRootProps, getInputProps } = useDropzone(); const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const files = acceptedFiles.map((file) => ( const files = acceptedFiles.map((file) => (
@@ -384,7 +385,11 @@ let RepLPA = (props) => {
props.props.caseReference props.props.caseReference
} }
hint={"sdsd"} hint={"sdsd"}
fileList={[]} fileList={
props.props.props.form[
"representationForm"
].values.filesList || []
}
setFilesForRepresentation={[]} setFilesForRepresentation={[]}
containerID={ containerID={
props.props.props.accountDetails props.props.props.accountDetails
@@ -406,17 +411,14 @@ let RepLPA = (props) => {
_.has(formObj, "values", "representationType")) && _.has(formObj, "values", "representationType")) &&
props.representationType == "Questionnaire" && ( props.representationType == "Questionnaire" && (
<> <>
{showQuestionnaireSection} {showQuestionnaireSection <
{showQuestionnaireSection <=
questionnaireCount && ( questionnaireCount && (
<button <button
// type="submit" type="submit"
className="govuk-button" className="govuk-button"
data-module="govuk-button" data-module="govuk-button"
> >
{t("common:continue-button")} www {t("common:continue-button")}
{showQuestionnaireSection} -{" "}
{questionnaireCount}
</button> </button>
// <a // <a
// href="#" // href="#"
@@ -437,16 +439,24 @@ let RepLPA = (props) => {
className="govuk-button" className="govuk-button"
data-module="govuk-button" data-module="govuk-button"
> >
{t("common:continue-button")} -{" "} {t("common:continue-button")}
{showQuestionnaireSection}
</button> </button>
)} )}
{showQuestionnaireSection > 1 && ( {showQuestionnaireSection > 1 && (
<a <a
onClick={() => { onClick={() => {
setShowQuestionnaireSection( window.scrollTo({
showQuestionnaireSection - 1 top: 0,
); behavior: "smooth",
});
setRepFileName(
props.formObj[
"representationForm"
].values
),
setShowQuestionnaireSection(
showQuestionnaireSection - 1
);
}} }}
className="govuk-link" className="govuk-link"
> >
@@ -464,7 +474,7 @@ let RepLPA = (props) => {
className="govuk-button" className="govuk-button"
data-module="govuk-button" data-module="govuk-button"
> >
{t("common:continue-button")} == {t("common:continue-button")}
</button> </button>
<a <a
onClick={() => { onClick={() => {
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+2 -1
View File
@@ -1120,6 +1120,7 @@ let Enforcement_Questionnaire = (props) => {
fileList={[]} fileList={[]}
setFilesForRepresentation={[]} setFilesForRepresentation={[]}
containerID={props.containerID} containerID={props.containerID}
filenamePrefix={props}
/> />
</div> </div>
</fieldset> </fieldset>
@@ -1153,7 +1154,7 @@ let Enforcement_Questionnaire = (props) => {
className="govuk-input govuk-!-width-one-half" className="govuk-input govuk-!-width-one-half"
id="onBehalfOfLPA" id="onBehalfOfLPA"
name="onBehalfOfLPA" name="onBehalfOfLPA"
data-aria-controls="caseOfficer" data-aria-controls="onBehalfOfLPA"
type="text" type="text"
component={RenderTextfield} component={RenderTextfield}
label={t( label={t(
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
+12 -6
View File
@@ -381,7 +381,7 @@ let S78_Questionnaire = (props) => {
<Field <Field
label={ label={
"14. " + "14. " +
t("myrepresentations:s78-section-question-13") t("myrepresentations:s78-section-question-14")
} }
name="LPAintentionToSubmitFullStatement" name="LPAintentionToSubmitFullStatement"
id="LPAintentionToSubmitFullStatement" id="LPAintentionToSubmitFullStatement"
@@ -945,9 +945,14 @@ let S78_Questionnaire = (props) => {
label={t("myrepresentations:add-files-label")} label={t("myrepresentations:add-files-label")}
ticketnumber={props.props.caseReference} ticketnumber={props.props.caseReference}
hint={"sdsd"} hint={"sdsd"}
fileList={[]} fileList={
props.props.props.props.form[
"representationForm"
].values.filesList || []
}
setFilesForRepresentation={[]} setFilesForRepresentation={[]}
containerID={props.containerID} containerID={props.containerID}
filenamePrefix={props.props}
/> />
</div> </div>
</fieldset> </fieldset>
@@ -970,6 +975,7 @@ let S78_Questionnaire = (props) => {
"myrepresentations:s78-section-question-signed" "myrepresentations:s78-section-question-signed"
)} )}
validate={[required]} validate={[required]}
errorMsg="Is required"
/> />
</div> </div>
<div className="govuk-form-group"> <div className="govuk-form-group">
@@ -978,13 +984,13 @@ let S78_Questionnaire = (props) => {
className="govuk-input govuk-!-width-one-half" className="govuk-input govuk-!-width-one-half"
id="onBehalfOfLPA" id="onBehalfOfLPA"
name="onBehalfOfLPA" name="onBehalfOfLPA"
data-aria-controls="caseOfficer" data-aria-controls="onBehalfOfLPA"
type="text" type="text"
component={RenderTextfield} component={RenderTextfield}
label={t( label={t(
"myrepresentations:s78-section-question-onbehalf" "myrepresentations:s78-section-question-onbehalf"
)} )}
validate={[required]} errorMsg="Is required"
/> />
</div> </div>
<Field <Field
@@ -992,10 +998,10 @@ let S78_Questionnaire = (props) => {
id="signedDate" id="signedDate"
label={t("myrepresentations:s78-section-question-date")} label={t("myrepresentations:s78-section-question-date")}
component={RenderDatePicker} component={RenderDatePicker}
//validate={[required]} validate={[required]}
errorMsg="Select a date"
dateStart="0" dateStart="0"
dateEnd="1-y" dateEnd="1-y"
errorMsg="Is required"
locale={locale} locale={locale}
/> />
</fieldset> </fieldset>
components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js
+138 -41
View File
@@ -141,9 +141,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{ <div
repFormData.enterNeighbouringLandToViewSiteEvidence className="govuk-summary-list-check-ellipsis"
} dangerouslySetInnerHTML={{
__html: repFormData.enterNeighbouringLandToViewSiteEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -207,9 +210,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{ <div
repFormData.enterNeighbouringLandAccessRequired className="govuk-summary-list-check-ellipsis"
} dangerouslySetInnerHTML={{
__html: repFormData.enterNeighbouringLandAccessRequired,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -271,7 +277,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.healthAndSafetyIssuesEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.healthAndSafetyIssuesEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -335,7 +346,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.LPAcaseFileAndReps} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.LPAcaseFileAndReps,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -367,7 +383,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.LPAldpAndMap} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.LPAldpAndMap,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -490,7 +511,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.ROWEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.ROWEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -551,7 +577,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.conservationAreaEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.conservationAreaEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -613,7 +644,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.affectListedBuildingEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.affectListedBuildingEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -674,7 +710,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.TPOEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.TPOEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -736,7 +777,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.natureConservationSiteEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.natureConservationSiteEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -797,7 +843,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.protectedSpeciesEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.protectedSpeciesEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -893,9 +944,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{ <div
repFormData.governmentDepartmentCommentsEvidence className="govuk-summary-list-check-ellipsis"
} dangerouslySetInnerHTML={{
__html: repFormData.governmentDepartmentCommentsEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -992,9 +1046,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{ <div
repFormData.developmentCarriedOutInAccordanceEvidence className="govuk-summary-list-check-ellipsis"
} dangerouslySetInnerHTML={{
__html: repFormData.developmentCarriedOutInAccordanceEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -1098,9 +1155,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{ <div
repFormData.developmentNotTakePlaceBroadbandEvidence className="govuk-summary-list-check-ellipsis"
} dangerouslySetInnerHTML={{
__html: repFormData.developmentNotTakePlaceBroadbandEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -1162,9 +1222,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{ <div
repFormData.developmentAnyOtherConditionsEvidence className="govuk-summary-list-check-ellipsis"
} dangerouslySetInnerHTML={{
__html: repFormData.developmentAnyOtherConditionsEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -1226,9 +1289,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{ <div
repFormData.copyOfApplicantsCertificateEvidence className="govuk-summary-list-check-ellipsis"
} dangerouslySetInnerHTML={{
__html: repFormData.copyOfApplicantsCertificateEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -1290,7 +1356,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.advertismentGivenEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.advertismentGivenEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -1352,9 +1423,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{ <div
repFormData.copyOfLetterOfAppealNotificationEvidence className="govuk-summary-list-check-ellipsis"
} dangerouslySetInnerHTML={{
__html: repFormData.copyOfLetterOfAppealNotificationEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -1415,7 +1489,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.lpaEIAOSEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.lpaEIAOSEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -1479,9 +1558,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{ <div
repFormData.advertismentConsentDiscontinuanceNoticeEvidence className="govuk-summary-list-check-ellipsis"
} dangerouslySetInnerHTML={{
__html: repFormData.advertismentConsentDiscontinuanceNoticeEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -1544,7 +1626,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.detailsOfOtherAppeals} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.detailsOfOtherAppeals,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -1606,7 +1693,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.detailsOfPreviousAppealsEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.detailsOfPreviousAppealsEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
@@ -1667,7 +1759,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{repFormData.otherRelevantInformationEvidence} <div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.otherRelevantInformationEvidence,
}}
/>
</dd> </dd>
<dd className="govuk-summary-list__actions"> <dd className="govuk-summary-list__actions">
components/elements/index.js
+83 -63
View File
@@ -1379,7 +1379,6 @@ export function DecimalField(props) {
{parentField != false ? ( {parentField != false ? (
showIfHasParentShowValue && ( showIfHasParentShowValue && (
<div className="govuk-form-group"> <div className="govuk-form-group">
wwww
<Field <Field
name={props.name} name={props.name}
id={props.name} id={props.name}
@@ -1591,55 +1590,73 @@ const RenderFileUpload = (field) => {
}; };
const getDocumentType = (docCode) => { 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) { switch (docCode) {
case "000000":
return pdfFileNameDateStamp + "_-_Statement_of_Case";
case "000001": case "000001":
return "000001"; return pdfFileNameDateStamp + "_-_Application_Form";
break; break;
case "000002": case "000002":
return "000002"; return pdfFileNameDateStamp + "_-_Site_Ownership_Certificate";
break; break;
case "000003": case "000003":
return "000003"; return pdfFileNameDateStamp + "_-_Decision_Notice";
break; break;
case "000004": case "000004":
return "000004"; return pdfFileNameDateStamp + "_-_Site_Location_Plan";
break; break;
case "000005": case "000005":
return "000005"; return pdfFileNameDateStamp + "_-_Plans_Drawing_Documents";
break; break;
case "000006": case "000006":
return "000006"; return (
pdfFileNameDateStamp +
"_-_Additional_Plans_Drawings_Documents"
);
break; break;
case "000007": case "000007":
return "000007"; return pdfFileNameDateStamp + "_-_Design_and_Access_Statement";
break; break;
case "000008": case "000008":
return "000008"; return (
pdfFileNameDateStamp + "_-_Green_Infrastructure_Statement"
);
break; break;
case "000009": case "000009":
return "000009"; return pdfFileNameDateStamp + "_-_LPA_Correspondence";
break; break;
case "000010": case "000010":
return "000010"; return pdfFileNameDateStamp + "_-_LPA_Original_Permission";
break; break;
case "000011": case "000011":
return "000011"; return pdfFileNameDateStamp + "_-_LPA's_Registration_Letter";
break; break;
case "000012": case "000012":
return "000012"; return pdfFileNameDateStamp + +"_-_Environmental_Statement";
break; break;
case "000013": case "000013":
return "000013"; return pdfFileNameDateStamp + "_-_Cost_of_Application";
break; break;
case "000014": case "000014":
return "000014"; return pdfFileNameDateStamp + "_-_Other_Relevant_Material";
break; break;
case "000015": case "000015":
return "000015"; return (
pdfFileNameDateStamp +
"_-_S106_Agreement_or_Unilateral_Undertaking"
);
break; break;
default: default:
return "000000"; return pdfFileNameDateStamp + "_-_000000_-_";
} }
}; };
@@ -1649,6 +1666,7 @@ const RenderFileUpload = (field) => {
"$..[?(@.documentType=='" + field.documentTypeCode + "')]", "$..[?(@.documentType=='" + field.documentTypeCode + "')]",
filelistObj filelistObj
); );
//const blobList = filelistObj;
const deleteThisBlob = async ( const deleteThisBlob = async (
containerName, containerName,
@@ -1688,7 +1706,7 @@ const RenderFileUpload = (field) => {
(file) => (file) =>
new File( new File(
[file], [file],
`${getDocumentType(field.documentTypeCode)}_${ `${getDocumentType(field.documentTypeCode)}_-_${
file.name file.name
}`, }`,
{ {
@@ -1755,53 +1773,55 @@ const RenderFileUpload = (field) => {
)} )}
</ul> </ul>
)} )}
{blobList.map((blob, i) => ( {blobList.map(
<div (blob, i) =>
key={blob.name + "_" + i} blob.documentType == field.documentTypeCode && (
className="govuk-!-margin-bottom-5 fileThumb govuk-!-margin-top-5" <div
> key={blob.name + "_" + i}
<div key={"deleteLnk" + i} className=""> className="govuk-!-margin-bottom-5 fileThumb govuk-!-margin-top-5"
<span
className="govuk-summary-list__actionLink watched_link govuk-!-margin-right-5 govuk-!-text-align-left"
onClick={() => {
deleteThisBlob(
field.containerID,
blob.name,
blob.hasheddeletepath,
blob.hashgetblobs,
field.ticketnumber
);
}}
title="Remove this file"
> >
&minus; <div key={"deleteLnk" + i} className="">
</span> <span
</div> className="govuk-summary-list__actionLink watched_link govuk-!-margin-right-5 govuk-!-text-align-left"
<img onClick={() => {
src={getThumbnailIconByExtension(blob.name)} deleteThisBlob(
alt={blob.name} field.containerID,
width="50" blob.name,
/> blob.hasheddeletepath,
blob.hashgetblobs,
field.ticketnumber
);
}}
title="Remove this file "
>
&minus;
</span>
</div>
<img
src={getThumbnailIconByExtension(blob.name)}
alt={blob.name}
width="50"
/>
<Link <Link
key={"lnk" + i} key={"lnk" + i}
scroll={false} scroll={false}
href={ href={
"/api/file/downloadblob?container=" + "/api/file/downloadblob?container=" +
field.containerID + field.containerID +
"&casefolderID=" + "&casefolderID=" +
field.ticketnumber + field.ticketnumber +
"&blobname=" + "&blobname=" +
blob.name + blob.name +
blob.hashedfilepath blob.hashedfilepath
} }
className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link" className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link"
> >
{blob.name.slice(blob.name.indexOf("_") + 1)}( {blob.name} ({bytesToSize(blob.contentLength)})
{bytesToSize(blob.contentLength)}) </Link>
</Link> </div>
</div> )
))}{" "} )}{" "}
</> </>
); );
}; };
components/newappeal/buildCheckfield.js
+13 -1
View File
@@ -62,7 +62,19 @@ export default function BuildField(props) {
return <>{fieldValue}</>; return <>{fieldValue}</>;
break; break;
case "{16D63FD6-119B-4353-BDCA-18358721C3FE}": case "{16D63FD6-119B-4353-BDCA-18358721C3FE}":
return <> docs {fieldValue}</>; return <> {fieldValue}</>;
break;
case "{E0DECE4B-6666-4a8f-A065-082708572369}":
return (
<>
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: fieldValue,
}}
/>
</>
);
break; break;
default: default:
components/newappeal/buildcheckrow.js
+8 -1
View File
@@ -169,7 +169,14 @@ let BuildCheckRow = (props) => {
) )
: fieldtype[0].value == : fieldtype[0].value ==
"{16D63FD6-119B-4353-BDCA-18358721C3FE}" "{16D63FD6-119B-4353-BDCA-18358721C3FE}"
? "ssss" ? (console.log(
props.props.form[
"appealForm"
].values[
datafieldname[0].value
]
),
(<div>sdfsd eeefsdfs</div>))
: fieldtype[0].value == : fieldtype[0].value ==
"{0273EDBD-AC1D-40d3-9FB2-095C621B552D}" "{0273EDBD-AC1D-40d3-9FB2-095C621B552D}"
? props.props.form[ ? props.props.form[
components/newappeal/buildchecksection.js
+57 -49
View File
@@ -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; let pdfObj = props.props.form.appealForm.values;
Object.assign(pdfObj, { Object.assign(pdfObj, {
@@ -169,58 +177,58 @@ let BuildCheckSection = (props) => {
))} ))}
</dl> </dl>
<dl className="govuk-summary-list govuk-!-margin-bottom-9 at-summary-list"> <dl className="govuk-summary-list govuk-!-margin-bottom-9 at-summary-list">
<div className="govuk-summary-list__row" key={"9999"}> {buildAppealFilesArray.length > 0
<dt className="govuk-summary-list__key"> ? buildAppealFilesArray.map((blob, i) => {
{buildAppealFilesArray.length > 0 return (
? buildAppealFilesArray.map((blob, i) => { <>
console.log( <div
"thetre blbo:", className="govuk-summary-list__row"
buildAppealFilesArray, key={"9999"}
blob >
); <dt className="govuk-summary-list__key govuk-!-padding-left-5">
return ( <div
<div key={blob.name + "_" + i}
key={blob.name + "_" + i} className="govuk-!-margin-bottom-5 fileThumb "
className="govuk-!-margin-bottom-5 fileThumb " >
> <img
<img src={getThumbnailIconByExtension(
src={getThumbnailIconByExtension( blob.name
blob.name )}
alt={blob.name}
width="50"
/>
</div>
</dt>
<dt className="govuk-summary-list__value">
<span className="govuk-body govuk-!-font-size-14">
{blob.name} (
{bytesToSize(
blob.size ||
blob.contentLength
)} )}
alt={blob.name.slice(
blob.name.indexOf(
"_"
) + 1
)}
width="50"
/>
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
{blob.name.slice(
blob.name.indexOf(
"_"
) + 1
)}
({bytesToSize(blob?.size)}
) )
</span> </span>
</div> </dt>
); <dd className="govuk-summary-list__actions">
}) <a
: ""} className="govuk-link"
</dt> href="#"
<dd className="govuk-summary-list__actions"> onClick={() => {
<a updateCurrentSection(
className="govuk-link" sectionCount
href="#" );
onClick={() => { }}
updateCurrentSection(sectionCount); >
}} {t(
> "newappeal:change-link-label"
{t("newappeal:change-link-label")} )}
</a> </a>
</dd> </dd>
</div> </div>
</>
);
})
: ""}
</dl> </dl>
</div> </div>
{finaliseAppealProcess ? ( {finaliseAppealProcess ? (
components/newappeal/buildsection.js
+15
View File
@@ -177,6 +177,21 @@ let BuildSection = (props) => {
"\n////////////////////////\n" "\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( props.setNewAppealProgress(
getProgressObj(formXML, titleList, mandatoryFieldsData, props) getProgressObj(formXML, titleList, mandatoryFieldsData, props)
); );
data/formsxml/planningappeals78.xml
+3 -3
View File
@@ -392,7 +392,7 @@
</row> </row>
<row> <row>
<labels> <labels>
<label description="Additional plans, drawings or documents relating to the application but not previously seen by the LPA." ishareDocumentCode="000008" /> <label description="Additional plans, drawings or documents relating to the application but not previously seen by the LPA." ishareDocumentCode="000006" />
</labels> </labels>
<control id="pinswg_fileUpload8" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload8" disabled="false" /> <control id="pinswg_fileUpload8" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload8" disabled="false" />
</row> </row>
@@ -422,7 +422,7 @@
</row> </row>
<row> <row>
<labels> <labels>
<label description="Any other material you may deem relevant" ishareDocumentCode="000013" /> <label description="Any other material you may deem relevant" ishareDocumentCode="000014" />
</labels> </labels>
<control id="pinswg_fileUpload13" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload13" disabled="false" /> <control id="pinswg_fileUpload13" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload13" disabled="false" />
</row> </row>
@@ -434,7 +434,7 @@
</row> </row>
<row> <row>
<labels> <labels>
<label description="The S106 agreement or unilateral undertaking" ishareDocumentCode="000008" /> <label description="The S106 agreement or unilateral undertaking" ishareDocumentCode="000015" />
</labels> </labels>
<control id="pinswg_fileUpload15" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload15" disabled="false" /> <control id="pinswg_fileUpload15" classid="{16D63FD6-119B-4353-BDCA-18358721C3FE}" datafieldname="pinswg_fileUpload15" disabled="false" />
</row> </row>
pages/api/endpoint/getcase_api.js
+1 -1
View File
@@ -41,7 +41,7 @@ export default async function ApiProxy(req, res) {
incidentID + incidentID +
")?$select=ticketnumber,title,pinswg_appealcasetype"; ")?$select=ticketnumber,title,pinswg_appealcasetype";
console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl)); //console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
return axios return axios
.get( .get(
pages/api/file/downloadblob.js
+1 -2
View File
@@ -32,8 +32,7 @@ ApiProxy.get(async (req, res) => {
res.setHeader( res.setHeader(
"content-disposition", "content-disposition",
"attachment; filename=" + "attachment; filename=" + decodeURI(blobName)
decodeURI(blobName.slice(blobName.indexOf("_") + 1))
); );
return res.status(200).send(downloaded); return res.status(200).send(downloaded);
} else { } else {
pages/api/file/generateappealpdf.js
+9 -2
View File
@@ -158,8 +158,15 @@ export default async function handler(req, res) {
} }
); );
let newFileListArr = blobProgress.filesList.concat( let newFileListArr = [];
appealBodyObj.filesList[0] appealBodyObj.filesList.hasOwnProperty("value")
? (newFileListArr = blobProgress.filesList.concat(
appealBodyObj.filesList.value[0]
))
: (newFileListArr = blobProgress.filesList);
newFileListArr = newFileListArr.filter(
(value) => Object.keys(value).length !== 0
); );
Object.assign(blobProgress, { Object.assign(blobProgress, {
styles/sass/welshgov/_application.scss
+11 -1
View File
@@ -1030,6 +1030,16 @@ textarea,
} }
.govuk-summary-list-check-ellipsis {
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 5;
/* number of lines to show */
line-clamp: 5;
-webkit-box-orient: vertical;
}
.govuk-summary-list__value { .govuk-summary-list__value {
.multiline-elipsis { .multiline-elipsis {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
@@ -1197,7 +1207,7 @@ textarea,
} }
.govuk-summary-list__key { .govuk-summary-list__key {
width: 45%; width: 30%;
} }
.react-datepicker__input-container input { .react-datepicker__input-container input {