@@ -98,41 +131,30 @@ let BuildCheckSection = (props) => {
-
- {props.props.appealType.fileList.value.length >
- 0
- ? props.props.appealType.fileList.value.map(
- (blob, i) => (
- -+ )) : ""}
+ {buildAppealFilesArray.length > 0 + ? buildAppealFilesArray.map((blob, i) => ( +
+- ) - ) + + {blob.name.slice( + blob.name.indexOf("_") + 1 + )} + ({bytesToSize(blob?.size)}) + + -
@@ -153,7 +175,16 @@ let BuildCheckSection = (props) => {
setCurrentSection(9999)}
+ onClick={() => {
+ setCurrentSection(9999),
+ generateAppealPDF(
+ pdfObj,
+ props.props.accountDetails.containerID,
+ props.appealType.caseReference.ticketnumber,
+ router.query.appealtypes,
+ props.appealType.fileList
+ );
+ }}
>
{t("newappeal:submit-appeal-button")}
diff --git a/components/newappeal/buildsection.js b/components/newappeal/buildsection.js
index a182b897..47f1b9e0 100644
--- a/components/newappeal/buildsection.js
+++ b/components/newappeal/buildsection.js
@@ -115,9 +115,9 @@ let BuildSection = (props) => {
var dataObj = values;
- for (let key in dataObj) {
- _.includes(key, "pinswg_fileUpload") == true && delete dataObj[key];
- }
+ // for (let key in dataObj) {
+ // _.includes(key, "pinswg_fileUpload") == true && delete dataObj[key];
+ // }
uploadFiles(
dataObj,
@@ -177,23 +177,9 @@ 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)
- );
+ props.setNewAppealProgress(
+ getProgressObj(formXML, titleList, mandatoryFieldsData, props)
+ );
let appTypeCollection = getFormCollectionByID(
props.appealType.appealTypeID
@@ -270,6 +256,31 @@ let BuildSection = (props) => {
const onHandleSubmit = (values) => {
//if (currentSection == sectionCount) {
let valuesObj = values || {};
+ let buildAppealFilesArray = [];
+ let filesUplaodObj = Object.keys(values)
+ .filter(function (k) {
+ return k.indexOf("pinswg_fileUpload") == 0;
+ })
+ .reduce(function (newData, k) {
+ newData[k] = values[k];
+ return newData;
+ }, {});
+
+ console.log(filesUplaodObj);
+
+ for (let key in filesUplaodObj) {
+ for (let j in filesUplaodObj[key]) {
+ buildAppealFilesArray.push({
+ "name": filesUplaodObj[key][j].name,
+ "size": filesUplaodObj[key][j].size,
+ });
+ }
+ }
+
+ console.log(buildAppealFilesArray);
+ setFilesForAppeal(buildAppealFilesArray);
+
+ // Object.assign(values, { "filesList": buildAppealFilesArray });
delete valuesObj["_pinswg_appellant_value"];
console.log("has errors:", props.invalid);
diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js
index d65ba695..75dab272 100644
--- a/components/newappeal/createCase.js
+++ b/components/newappeal/createCase.js
@@ -17,6 +17,351 @@ import Aboutyou from "./aboutyou";
import { createNewCase, createNewCaseBlob, consoleLogger } from "../../actions";
import { FieldsTranslations } from "../elements";
+const RenderLPAList = ({
+ name,
+ input,
+ optionsObj,
+ meta: { touched, error },
+ label,
+ errorMsg,
+}) => {
+ let { t } = useTranslation();
+ const router = useRouter();
+
+ return (
+ <>
+ + {" "} + + {touched && error && ( + + Error:{" "} + {errorMsg} + + )} ++ + ); +}; + +const RenderAppealTypeList = ({ + name, + input, + optionsObj, + meta: { touched, error }, + label, + errorMsg, +}) => { + let { t } = useTranslation(); + const router = useRouter(); + return ( + <> ++ +++ + {touched && error && ( + + Error:{" "} + {errorMsg} + + )} ++ + ); +}; + +const RenderRadio = ({ + datafieldname, + name, + label, + id, + errorMsg, + options, + input: { onChange, value }, + meta: { touched, error }, + ...custom +}) => { + let { t } = useTranslation(); + const required = (value) => (value ? undefined : "Required"); + return ( + <> ++ +++ ++ + ); +}; + +function Radiofield(props) { + const { + name, + label, + datafieldname, + parentField, + form, + formProps, + parentFieldShowOnValue, + validation, + } = props; + + const router = useRouter(); + const required = (value) => (value ? undefined : "Required"); + // console.log(props.options); + + const fieldOptions = props.options + .slice(1, props.options.length - 1) + .split(","); + + //parentFieldShowOnValue + var showIfHasParentShowValue = parentField != false; + //debugger; + // parentField != false && + // !_.isEmpty(formProps[form]) && + // _.has(formProps[form].values, parentField) && + // parentFieldShowOnValue.indexOf( + // formProps[form].values[parentField].toString() + // ) > -1; + + (showIfHasParentShowValue == parentField) != false && + showIfHasParentShowValue; + + // console.log( + // datafieldname, + // showIfHasParentShowValue, + // formProps[form].values[parentField] + // ); + + return ( + <> + {parentField != false ? ( + showIfHasParentShowValue && ( +
+ ) + ) : ( + + )} + + ); +} + let CreateCase = (props) => { // useEffect(() => { // window.scrollTo(0, 0); @@ -49,368 +394,6 @@ let CreateCase = (props) => { ? [{}] : props.LPAData.LPAData.value; - const RenderLPAList = ({ - name, - input, - optionsObj, - meta: { touched, error }, - label, - errorMsg, - }) => { - return ( - <> - - {" "} - - {touched && error && ( - - - Error: - {" "} - {errorMsg} - - )} -- - ); - }; - - const RenderAppealTypeList = ({ - name, - input, - optionsObj, - meta: { touched, error }, - label, - errorMsg, - }) => { - return ( - <> -- --- - {touched && error && ( - - - Error: - {" "} - {errorMsg} - - )} -- - ); - }; - - const RenderRadio = ({ - datafieldname, - name, - label, - id, - errorMsg, - options, - input: { onChange, value }, - meta: { touched, error }, - ...custom - }) => { - let { t } = useTranslation(); - const required = (value) => (value ? undefined : "Required"); - return ( - <> -- --- -- - ); - }; - - function Radiofield(props) { - const { - name, - label, - datafieldname, - parentField, - form, - formProps, - parentFieldShowOnValue, - validation, - } = props; - - const router = useRouter(); - const required = (value) => (value ? undefined : "Required"); - // console.log(props.options); - - const fieldOptions = props.options - .slice(1, props.options.length - 1) - .split(","); - - //parentFieldShowOnValue - var showIfHasParentShowValue = parentField != false; - //debugger; - // parentField != false && - // !_.isEmpty(formProps[form]) && - // _.has(formProps[form].values, parentField) && - // parentFieldShowOnValue.indexOf( - // formProps[form].values[parentField].toString() - // ) > -1; - - (showIfHasParentShowValue == parentField) != false && - showIfHasParentShowValue; - - // console.log( - // datafieldname, - // showIfHasParentShowValue, - // formProps[form].values[parentField] - // ); - - return ( - <> - {parentField != false ? ( - showIfHasParentShowValue && ( -- ) - ) : ( - - )} - - ); - } - const required = (value) => (value ? undefined : "Required"); const [formStep, setFormStep] = useState(0); diff --git a/components/utils/index.js b/components/utils/index.js index 085cbde8..ef279b0f 100644 --- a/components/utils/index.js +++ b/components/utils/index.js @@ -228,8 +228,14 @@ export const getProgressObj = ( "totalFields": formObj[key].fieldsTotal, "allFieldsComplete": titleList[key].value == "Upload documents" - ? _.has(props.props.appealType.fileList, "value") && - props.props.appealType.fileList.value.length > 0 + ? (_.has(props.props.appealType.fileList, "value") && + props.props.appealType.fileList.value.length > + 0) || + (_.has(props.props.form.appealForm, "values") && + Object.keys( + props.props.form.appealForm.values + ).filter((k) => k.startsWith("pinswg_fileUpload")) + .length > 0) : rowCount == formObj[key].fieldsTotal, }; }); diff --git a/package.json b/package.json index d5e1e866..9ca1499e 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "react-quill": "^2.0.0", "react-redux": "^7.2.6", "redux": "^4.2.1", - "redux-form": "^8.3.9", + "redux-form": "^8.3.10", "redux-persist": "^6.0.0", "redux-thunk": "^2.4.2", "sass": "1.69", @@ -90,4 +90,4 @@ "next-translate-plugin": "^2.6.2", "prisma": "^5.0.0" } -} \ No newline at end of file +} diff --git a/store/appealType/reducer.js b/store/appealType/reducer.js index f6eca85b..060cf079 100644 --- a/store/appealType/reducer.js +++ b/store/appealType/reducer.js @@ -9,7 +9,7 @@ const appealTypeDataInitialState = { caseReference: {}, formComplete: "false", documentList: {}, - fileList: {}, + fileList: [], progress: [], }; diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss index 3635f36f..ec673b4d 100644 --- a/styles/sass/welshgov/_application.scss +++ b/styles/sass/welshgov/_application.scss @@ -432,6 +432,7 @@ textarea, background-color: #fff; padding: 7px 15px; border: 1px solid #666666; + min-width: 15rem; &:focus { outline: 2px solid #ffdd00;