diff --git a/src/components/dashboard/Dashboard.js b/src/components/dashboard/Dashboard.js index 9202fd7d0543db2f0e8165709309917981aa9617..0f0ea35f461e08cf066dfaf9ad763bd2b241a408 100644 --- a/src/components/dashboard/Dashboard.js +++ b/src/components/dashboard/Dashboard.js @@ -67,8 +67,8 @@ class Dashboard extends Component { if (response2.statusInfo.statusCode === APP.CODE.SUCCESS) { this.setState({ myApplications: - response2.responseData.length > 6 - ? response2.responseData.splice(0, 6) + response2.responseData.length > 8 + ? response2.responseData.splice(0, 8) : response2.responseData, }); // console.log(response2.responseData); diff --git a/src/components/form/fields/Input.js b/src/components/form/fields/Input.js index 9b30caead12c8db1982781a5e507bd25110c3cdd..58b1b2989debbb71c405354867744c2dc0696f6f 100644 --- a/src/components/form/fields/Input.js +++ b/src/components/form/fields/Input.js @@ -54,10 +54,11 @@ class Input extends Component { </span> )} </label> + <input type={ this.props.field.fieldType === - LANG.FIELD_TYPES.numeric.toLowerCase() + LANG.FIELD_TYPES.numeric ? "number" : this.state.fieldType } diff --git a/src/layouts/Regulator/ReviewApplicationLayout.tsx b/src/layouts/Regulator/ReviewApplicationLayout.tsx index ccb98fad8e9e7fa85446344f050e5b1a6e74b02a..3c2a197b83209417e170dbf1bc43dd8e9ab3b404 100644 --- a/src/layouts/Regulator/ReviewApplicationLayout.tsx +++ b/src/layouts/Regulator/ReviewApplicationLayout.tsx @@ -162,6 +162,7 @@ export const ReviewApplicationLayout = ({ if (arrThree.length !== 0) { tempArray.map((i: any, n: number) => { arrThree.map((m: any, l: number) => { + if (m.sideMenu === i.sideMenu) { m.fields.map((k: any, y: number) => { if (!applicationData.inspectorDataObject) { @@ -171,7 +172,7 @@ export const ReviewApplicationLayout = ({ sideMenu: m.sideMenu, label: k.label, value: i.fields[k.label], - defaultValues: k.values, + defaultValues: k.defaultValues, fieldType: k.fieldType, isCorrect: "", inspectionValue: "", @@ -184,7 +185,7 @@ export const ReviewApplicationLayout = ({ sideMenu: m.sideMenu, label: k.label, value: i.fields[k.label], - defaultValues: k.values, + defaultValues: k.defaultValues, fieldType: k.fieldType, isCorrect: tempArrayTwo[n].fields[k.label]["value"] === "correct" @@ -210,7 +211,7 @@ export const ReviewApplicationLayout = ({ sideMenu: i.sideMenu, label: m.name, value: i.fields[m.name], - defaultValues: m.values, + defaultValues: m.defaultValues, fieldType: m.fieldType, isCorrect: "", inspectionValue: "",