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
components/case/representation/index.js
+2
View File
@@ -343,6 +343,7 @@ let MakeRepresentation = (props) => {
setQuestionnaireCount={setQuestionnaireCount}
questionnaireCount={questionnaireCount}
setRepFileName={setRepFileName}
updateRepresentation={updateRepresentation}
/>
);
break;
@@ -632,6 +633,7 @@ let MakeRepresentation = (props) => {
};
const onHandleSubmit = (values) => {
window.scrollTo({ top: 0, behavior: "smooth" });
values = setRepFileName(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 (
<>
<label className="govuk-label " htmlFor={id} id={id + "_label"}>
{label}
</label>
{touched && error && (
<span id={id + "-error"} className="govuk-error-message">
<span className="govuk-visually-hidden">Error:</span>{" "}
{errorMsg}
</span>
)}
<input
{...input}
className={className}
name={name}
id={id}
type={type}
/>
<div
className={
touched && error
? "govuk-form-group govuk-form-group--error"
: "govuk-form-group "
}
>
<label className="govuk-label " htmlFor={id} id={id + "_label"}>
{label}
</label>
{touched && error && (
<span id={id + "-error"} className="govuk-error-message">
<span className="govuk-visually-hidden">Error:</span>{" "}
{errorMsg}
</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 blobList = jsonpath(
"$..[?(@.documentType=='" + field.documentTypeCode + "')]",
filelistObj
);
// const blobList = jsonpath(
// "$..[?(@.documentType=='" + field.documentTypeCode + "')]",
// 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 (
containerName,
@@ -1082,7 +1110,8 @@ export const RenderFileUpload = (field) => {
}
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>
</div>
))}{" "}
components/case/representation/representationLPA.js
+23 -13
View File
@@ -50,6 +50,7 @@ let RepLPA = (props) => {
questionnaireCount,
setQuestionnaireCount,
setRepFileName,
updateRepresentation,
} = props;
const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const files = acceptedFiles.map((file) => (
@@ -384,7 +385,11 @@ let RepLPA = (props) => {
props.props.caseReference
}
hint={"sdsd"}
fileList={[]}
fileList={
props.props.props.form[
"representationForm"
].values.filesList || []
}
setFilesForRepresentation={[]}
containerID={
props.props.props.accountDetails
@@ -406,17 +411,14 @@ let RepLPA = (props) => {
_.has(formObj, "values", "representationType")) &&
props.representationType == "Questionnaire" && (
<>
{showQuestionnaireSection}
{showQuestionnaireSection <=
{showQuestionnaireSection <
questionnaireCount && (
<button
// type="submit"
type="submit"
className="govuk-button"
data-module="govuk-button"
>
{t("common:continue-button")} www
{showQuestionnaireSection} -{" "}
{questionnaireCount}
{t("common:continue-button")}
</button>
// <a
// href="#"
@@ -437,16 +439,24 @@ let RepLPA = (props) => {
className="govuk-button"
data-module="govuk-button"
>
{t("common:continue-button")} -{" "}
{showQuestionnaireSection}
{t("common:continue-button")}
</button>
)}
{showQuestionnaireSection > 1 && (
<a
onClick={() => {
setShowQuestionnaireSection(
showQuestionnaireSection - 1
);
window.scrollTo({
top: 0,
behavior: "smooth",
});
setRepFileName(
props.formObj[
"representationForm"
].values
),
setShowQuestionnaireSection(
showQuestionnaireSection - 1
);
}}
className="govuk-link"
>
@@ -464,7 +474,7 @@ let RepLPA = (props) => {
className="govuk-button"
data-module="govuk-button"
>
{t("common:continue-button")} ==
{t("common:continue-button")}
</button>
<a
onClick={() => {
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+2 -1
View File
@@ -1120,6 +1120,7 @@ let Enforcement_Questionnaire = (props) => {
fileList={[]}
setFilesForRepresentation={[]}
containerID={props.containerID}
filenamePrefix={props}
/>
</div>
</fieldset>
@@ -1153,7 +1154,7 @@ let Enforcement_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(
components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
+12 -6
View File
@@ -381,7 +381,7 @@ let S78_Questionnaire = (props) => {
<Field
label={
"14. " +
t("myrepresentations:s78-section-question-13")
t("myrepresentations:s78-section-question-14")
}
name="LPAintentionToSubmitFullStatement"
id="LPAintentionToSubmitFullStatement"
@@ -945,9 +945,14 @@ let S78_Questionnaire = (props) => {
label={t("myrepresentations:add-files-label")}
ticketnumber={props.props.caseReference}
hint={"sdsd"}
fileList={[]}
fileList={
props.props.props.props.form[
"representationForm"
].values.filesList || []
}
setFilesForRepresentation={[]}
containerID={props.containerID}
filenamePrefix={props.props}
/>
</div>
</fieldset>
@@ -970,6 +975,7 @@ let S78_Questionnaire = (props) => {
"myrepresentations:s78-section-question-signed"
)}
validate={[required]}
errorMsg="Is required"
/>
</div>
<div className="govuk-form-group">
@@ -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"
/>
</div>
<Field
@@ -992,10 +998,10 @@ let S78_Questionnaire = (props) => {
id="signedDate"
label={t("myrepresentations:s78-section-question-date")}
component={RenderDatePicker}
//validate={[required]}
errorMsg="Select a date"
validate={[required]}
dateStart="0"
dateEnd="1-y"
errorMsg="Is required"
locale={locale}
/>
</fieldset>
components/case/representation/representationQuestionnairesCheck/representationLPAQuestionnaireCheck_s78.js
+138 -41
View File
@@ -141,9 +141,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{
repFormData.enterNeighbouringLandToViewSiteEvidence
}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.enterNeighbouringLandToViewSiteEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -207,9 +210,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{
repFormData.enterNeighbouringLandAccessRequired
}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.enterNeighbouringLandAccessRequired,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -271,7 +277,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.healthAndSafetyIssuesEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.healthAndSafetyIssuesEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -335,7 +346,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.LPAcaseFileAndReps}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.LPAcaseFileAndReps,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -367,7 +383,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.LPAldpAndMap}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.LPAldpAndMap,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -490,7 +511,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.ROWEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.ROWEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -551,7 +577,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.conservationAreaEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.conservationAreaEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -613,7 +644,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.affectListedBuildingEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.affectListedBuildingEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -674,7 +710,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.TPOEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.TPOEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -736,7 +777,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.natureConservationSiteEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.natureConservationSiteEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -797,7 +843,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.protectedSpeciesEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.protectedSpeciesEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -893,9 +944,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{
repFormData.governmentDepartmentCommentsEvidence
}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.governmentDepartmentCommentsEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -992,9 +1046,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{
repFormData.developmentCarriedOutInAccordanceEvidence
}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.developmentCarriedOutInAccordanceEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -1098,9 +1155,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{
repFormData.developmentNotTakePlaceBroadbandEvidence
}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.developmentNotTakePlaceBroadbandEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -1162,9 +1222,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{
repFormData.developmentAnyOtherConditionsEvidence
}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.developmentAnyOtherConditionsEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -1226,9 +1289,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{
repFormData.copyOfApplicantsCertificateEvidence
}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.copyOfApplicantsCertificateEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -1290,7 +1356,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.advertismentGivenEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.advertismentGivenEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -1352,9 +1423,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{
repFormData.copyOfLetterOfAppealNotificationEvidence
}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.copyOfLetterOfAppealNotificationEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -1415,7 +1489,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.lpaEIAOSEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.lpaEIAOSEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -1479,9 +1558,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{
repFormData.advertismentConsentDiscontinuanceNoticeEvidence
}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.advertismentConsentDiscontinuanceNoticeEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -1544,7 +1626,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.detailsOfOtherAppeals}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.detailsOfOtherAppeals,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -1606,7 +1693,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.detailsOfPreviousAppealsEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.detailsOfPreviousAppealsEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">
@@ -1667,7 +1759,12 @@ let RepLPAQuestionnaireCheck_s78 = (props) => {
</dt>
<dd className="govuk-summary-list__value">
{repFormData.otherRelevantInformationEvidence}
<div
className="govuk-summary-list-check-ellipsis"
dangerouslySetInnerHTML={{
__html: repFormData.otherRelevantInformationEvidence,
}}
/>
</dd>
<dd className="govuk-summary-list__actions">