tannedcung/sbt-idp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix empty field handling

Browse Source
This commit is contained in:
Viet Anh Nguyen 2024-03-14 17:37:16 +07:00
parent 0383950c8e
commit a7fb22e3b7
3 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cope2n-fe/src/pages/inference/index.tsx
View File

@ -23,6 +23,7 @@ const ENABLE_REVIEW = true;
// Import the styles // Import the styles
import '@react-pdf-viewer/core/lib/styles/index.css'; import '@react-pdf-viewer/core/lib/styles/index.css';
import { normalizeData } from 'utils/field-value-process';
const siderStyle: React.CSSProperties = { const siderStyle: React.CSSProperties = {
@ -355,6 +356,7 @@ const InferencePage = () => {
setDataSource(newData); setDataSource(newData);
const newRevisedData = {}; const newRevisedData = {};
for (let i = 0; i < newData.length; i++) { for (let i = 0; i < newData.length; i++) {
newData[i].revised = normalizeData(newData[i].key, newData[i].revised);
newRevisedData[newData[i].key] = newData[i].revised; newRevisedData[newData[i].key] = newData[i].revised;
} }
updateRevisedData(newRevisedData).then(() => { updateRevisedData(newRevisedData).then(() => {
@ -370,30 +372,7 @@ const InferencePage = () => {
const newData = [...dataSource]; const newData = [...dataSource];
const newRevisedData = {}; const newRevisedData = {};
for (let i = 0; i < newData.length; i++) { for (let i = 0; i < newData.length; i++) {
if (newData[i].revised === "<empty>") { newData[i].revised = normalizeData(newData[i].key, newData[i].revised);
newData[i].revised = null;
}
if (typeof(newData[i].revised) === "string") {
newData[i].revised = newData[i].revised.trim();
}
if (newData[i].revised === "" || newData[i].revised === null || newData[i].revised === undefined) {
newData[i].revised = null;
}
if ((newData[i].key === "imei_number" || newData[i].key === "purchase_date") && typeof(newData[i].revised) === "string") {
// Convert to list
newData[i].revised = new Array(newData[i].revised.split(","));
}
if (Array.isArray(newData[i].revised)) {
// Trim all empty strings
for (let j = 0; j < newData[i].revised.length; j++) {
if (typeof(newData[i].revised[j]) === "string") {
newData[i].revised[j] = newData[i].revised[j].trim();
}
if (newData[i].revised[j] === "<empty>") {
newData[i].revised[j] = null;
}
}
}
newRevisedData[newData[i].key] = newData[i].revised; newRevisedData[newData[i].key] = newData[i].revised;
} }
updateRevisedData(newRevisedData).then(() => { updateRevisedData(newRevisedData).then(() => {

28
cope2n-fe/src/pages/reviews/index.tsx
View File

@ -21,6 +21,8 @@ import { Viewer } from '@react-pdf-viewer/core';
// Import the styles // Import the styles
import '@react-pdf-viewer/core/lib/styles/index.css'; import '@react-pdf-viewer/core/lib/styles/index.css';
import { normalizeData } from 'utils/field-value-process';
const siderStyle: React.CSSProperties = { const siderStyle: React.CSSProperties = {
backgroundColor: '#fafafa', backgroundColor: '#fafafa',
@ -415,6 +417,7 @@ const ReviewPage = () => {
setDataSource(newData); setDataSource(newData);
const newRevisedData = {}; const newRevisedData = {};
for (let i = 0; i < newData.length; i++) { for (let i = 0; i < newData.length; i++) {
newData[i].revised = normalizeData(newData[i].key, newData[i].revised);
newRevisedData[newData[i].key] = newData[i].revised; newRevisedData[newData[i].key] = newData[i].revised;
} }
updateRevisedData(newRevisedData).then(() => { updateRevisedData(newRevisedData).then(() => {
@ -430,30 +433,7 @@ const ReviewPage = () => {
const newData = [...dataSource]; const newData = [...dataSource];
const newRevisedData = {}; const newRevisedData = {};
for (let i = 0; i < newData.length; i++) { for (let i = 0; i < newData.length; i++) {
if (newData[i].revised === "<empty>") { newData[i].revised = normalizeData(newData[i].key, newData[i].revised);
newData[i].revised = null;
}
if (typeof(newData[i].revised) === "string") {
newData[i].revised = newData[i].revised.trim();
}
if (newData[i].revised === "" || newData[i].revised === null || newData[i].revised === undefined) {
newData[i].revised = null;
}
if ((newData[i].key === "imei_number" || newData[i].key === "purchase_date") && typeof(newData[i].revised) === "string") {
// Convert to list
newData[i].revised = new Array(newData[i].revised.split(","));
}
if (Array.isArray(newData[i].revised)) {
// Trim all empty strings
for (let j = 0; j < newData[i].revised.length; j++) {
if (typeof(newData[i].revised[j]) === "string") {
newData[i].revised[j] = newData[i].revised[j].trim();
}
if (newData[i].revised[j] === "<empty>") {
newData[i].revised[j] = null;
}
}
}
newRevisedData[newData[i].key] = newData[i].revised; newRevisedData[newData[i].key] = newData[i].revised;
} }
updateRevisedData(newRevisedData).then(() => { updateRevisedData(newRevisedData).then(() => {

32
cope2n-fe/src/utils/field-value-process.ts Normal file
View File

@ -0,0 +1,32 @@
const isAllSpaces = (text) => {
if (typeof (text) != "string") {
return false;
}
return text.trim().length === 0 || text === "<empty>";
};
const normalizeData = (key, value) => {
if (value === "<empty>") {
value = null;
}
if (typeof (value) === "string") {
value = value.trim();
}
if (value === "" || value === null || value === undefined) {
value = null;
}
if (isAllSpaces(value)) {
value = null;
}
if (["imei_number", "purchase_date"].includes(key) && typeof (value) === "string") {
value = value.split(",")
}
if (typeof (value) === "object" && value?.length > 0) {
for (let i = 0; i < value.length; i++) {
value[i] = normalizeData("text", value[i]);
}
}
return value;
}
export { normalizeData };