From a9ae6549573cdfaf698998dc815dd1e47b9486aa Mon Sep 17 00:00:00 2001 From: phanphan Date: Thu, 6 Jun 2024 11:05:05 +0700 Subject: [PATCH 1/3] improve some ui --- cope2n-fe/package.json | 1 + cope2n-fe/src/pages/reviews2/FileCard.tsx | 40 +++++++++++++--------- cope2n-fe/src/pages/reviews2/api.ts | 2 +- cope2n-fe/src/pages/reviews2/index.tsx | 41 ++++++++++++++--------- 4 files changed, 51 insertions(+), 33 deletions(-) diff --git a/cope2n-fe/package.json b/cope2n-fe/package.json index 9cfce13..06c2cfc 100644 --- a/cope2n-fe/package.json +++ b/cope2n-fe/package.json @@ -41,6 +41,7 @@ "history": "^5.3.0", "lodash-es": "^4.17.21", "mousetrap": "^1.6.5", + "openseadragon": "^4.1.1", "pdfjs-dist": "^3.11.174", "process": "^0.11.10", "react": "^18.3.1", diff --git a/cope2n-fe/src/pages/reviews2/FileCard.tsx b/cope2n-fe/src/pages/reviews2/FileCard.tsx index 7156e9d..79efa76 100644 --- a/cope2n-fe/src/pages/reviews2/FileCard.tsx +++ b/cope2n-fe/src/pages/reviews2/FileCard.tsx @@ -8,10 +8,9 @@ import { Button, Tag } from 'antd'; const FileCard = ({ file, isSelected, onClick }) => { const fileName = file['File Name']; const extensionType = fileName.split('.').pop(); - let status = true; - if (file['Is Required'] && !file['Is Reviewed']) { - status = false; - } + const isRequired = file['Is Required']; + const isReviewd = file['Is Reviewed']; + return (
{ > {fileName ? fileName.substring(0, 25).replace('temp_', '') - : fileName} - {' '}({extensionType}) + : fileName}{' '} + ({extensionType})
- : - } - style={{ display: 'inline-block', fontWeight: 'bold' }} - // bordered={false} - > - {status ? 'Good' : 'Warning'}{' '} - +
+ + Required: {isRequired.toString()} + + + + + Reviewed: {isReviewd.toString()} + + +
@@ -721,7 +730,7 @@ const ReviewPage = () => { } } catch (error) {} return ( -
+
{ }} onClick={submitRevisedData} > - Update File + (U) Update File
From edf8966fccfde1ea829a3b1fef1bc373d62c0d4d Mon Sep 17 00:00:00 2001 From: phanphan Date: Thu, 6 Jun 2024 11:08:18 +0700 Subject: [PATCH 2/3] improve some ui --- cope2n-fe/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/cope2n-fe/package.json b/cope2n-fe/package.json index 06c2cfc..9cfce13 100644 --- a/cope2n-fe/package.json +++ b/cope2n-fe/package.json @@ -41,7 +41,6 @@ "history": "^5.3.0", "lodash-es": "^4.17.21", "mousetrap": "^1.6.5", - "openseadragon": "^4.1.1", "pdfjs-dist": "^3.11.174", "process": "^0.11.10", "react": "^18.3.1", From 44c34f95f5d6b66edcae0545710e5cbe12851e8e Mon Sep 17 00:00:00 2001 From: phanphan Date: Thu, 6 Jun 2024 13:56:05 +0700 Subject: [PATCH 3/3] fix some bugs --- cope2n-fe/src/pages/reviews2/index.tsx | 45 +++++++++++++++++--------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/cope2n-fe/src/pages/reviews2/index.tsx b/cope2n-fe/src/pages/reviews2/index.tsx index cd03908..9b19d8f 100644 --- a/cope2n-fe/src/pages/reviews2/index.tsx +++ b/cope2n-fe/src/pages/reviews2/index.tsx @@ -126,11 +126,11 @@ const ReviewPage = () => { } }, []); - useEffect(() => { - if (reason) { - setSolution(counter_measure_map[reason]); - } - }, [reason]); + // useEffect(() => { + // if (reason) { + // setSolution(counter_measure_map[reason]); + // } + // }, [reason]); const updateSelectedFileDataSource = (fileContent) => { let tempData = {}; @@ -144,13 +144,14 @@ const ReviewPage = () => { if (isEmpty(tempData[k][REVIEWED_RESULT])) { isEmptyResult = true; } - if (tempData[k][REVIEWED_RESULT].length > 0) { + if (Array.isArray(tempData[k][REVIEWED_RESULT]) && tempData[k][REVIEWED_RESULT].length > 0) { isEmptyResult = tempData[k][REVIEWED_RESULT].every((r: any) => isEmpty(r), ); } if (isEmptyResult) { tempData[k][REVIEWED_RESULT] = tempData[k][PREDICTED_RESULT]; + } } }); @@ -174,16 +175,20 @@ const ReviewPage = () => { if (!reason) { setReason(null); + setOtherReason(null); } else if (REASON_BAD_QUALITY.some((r) => r.value === reason)) { setReason(reason); + setOtherReason(null); } else { setReason('other'); setOtherReason(reason); } if (!solution) { setSolution(null); + setOtherSolution(null); } else if (SOLUTION_BAD_QUALITY.some((r) => r.value === solution)) { setSolution(solution); + setOtherSolution(null); } else { setSolution('other'); setOtherSolution(solution); @@ -198,7 +203,6 @@ const ReviewPage = () => { setImageLoading(false); } }; - const loadCurrentRequest = (requestIndex) => { setLoading(true); setImageLoading(true); @@ -306,11 +310,18 @@ const ReviewPage = () => { let request_file_result = {}; SOURCE_KEYS.forEach((k) => { request_file_result[k] = selectedFileDataSource[k][REVIEWED_RESULT]; + if(Array.isArray(selectedFileDataSource[k][REVIEWED_RESULT])){ + request_file_result[k] = selectedFileDataSource[k][REVIEWED_RESULT].toString(); + }else{ + request_file_result[k] = selectedFileDataSource[k][REVIEWED_RESULT]; + } + + }); let data = { request_file_result, - reason: reason ? reason : otherReason, - solution: solution ? solution : otherSolution, + reason: reason !== 'other' ? reason : otherReason, + solution: solution !== 'other' ? solution : otherSolution, }; try { await updateRevisedDataByFile(currentRequest?.RequestID, fileId, data); @@ -344,10 +355,10 @@ const ReviewPage = () => { const [lightBox, setLightBox] = useState(false); - const updateRevised = (fieldName) => { + const updateRevisedByFeedback = (fieldName) => { setSelectedFileDataSource((prevData) => { prevData[fieldName][REVIEWED_RESULT] = - prevData[fieldName][FEEDBACK_RESULT]; + prevData[fieldName][FEEDBACK_RESULT]; return { ...prevData, }; @@ -675,7 +686,7 @@ const ReviewPage = () => { style={{ minWidth: '120px' }} onClick={handleConfirmReview} > - (C) Confirm request + Confirm request
@@ -746,7 +757,7 @@ const ReviewPage = () => { ghost icon={} size='small' - onClick={() => updateRevised(data)} + onClick={() => updateRevisedByFeedback(data)} /> { placeholder='Select a reason' style={{ width: 170, flexBasis: '50%', height: '32px' }} options={REASON_BAD_QUALITY} - onChange={setReason} + onChange={(value) => { + let newReason = value; + setReason(newReason); + setSolution(counter_measure_map[newReason]); + }} value={reason} /> {reason === 'other' && ( @@ -837,7 +852,7 @@ const ReviewPage = () => { }} onClick={submitRevisedData} > - (U) Update File + Update File