From 614b40b39f163bcaede36d01a8ec3f6f2408b4d3 Mon Sep 17 00:00:00 2001 From: amit-s19 Date: Mon, 15 Jan 2024 15:07:16 +0530 Subject: [PATCH] Forest Form Changes --- src/pages/submissions/SubmissionsEdit.tsx | 83 +++++++++++++++++++++-- src/pages/submissions/SubmissionsView.tsx | 17 +++-- 2 files changed, 88 insertions(+), 12 deletions(-) diff --git a/src/pages/submissions/SubmissionsEdit.tsx b/src/pages/submissions/SubmissionsEdit.tsx index 66d0337..28788fa 100644 --- a/src/pages/submissions/SubmissionsEdit.tsx +++ b/src/pages/submissions/SubmissionsEdit.tsx @@ -83,7 +83,7 @@ const SubmissionsEdit = () => { : handleFeedbackClick(`plotNumber${el + 1}`)} fontSize="large" /> : null} - {feedbackState?.[`plotNumber${el + 1}`] || flag != TITLE_STATUS.PFA ? : <>} + {feedbackState?.[`plotNumber${el + 1}`] || flag != TITLE_STATUS.PFA ? : <>} ) return <> @@ -245,17 +245,86 @@ const SubmissionsEdit = () => {
- - {flag == TITLE_STATUS.PFA ? feedbackState?.fraPlotsClaimed ? - handleFeedbackClick("fraPlotsClaimed")} /> - : handleFeedbackClick("fraPlotsClaimed")} fontSize="large" /> + + {flag == TITLE_STATUS.PFA ? feedbackState?.boundariesDesc ? + handleFeedbackClick("boundariesDesc")} /> + : handleFeedbackClick("boundariesDesc")} fontSize="large" /> : null}
- {feedbackState?.fraPlotsClaimed || flag != TITLE_STATUS.PFA ? : <>} + {feedbackState?.boundariesDesc || flag != TITLE_STATUS.PFA ? : <>} +
+ + {flag == TITLE_STATUS.PFA ? feedbackState?.forestLandType ? + handleFeedbackClick("forestLandType")} /> + : handleFeedbackClick("forestLandType")} fontSize="large" /> + : null} +
+ {feedbackState?.forestLandType || flag != TITLE_STATUS.PFA ? : <>} + + { + if (record?.submissionData?.forestLandType == 'revenueForest') { + return <> +
+ + {flag == TITLE_STATUS.PFA ? feedbackState?.typeOfBlock ? + handleFeedbackClick("typeOfBlock")} /> + : handleFeedbackClick("typeOfBlock")} fontSize="large" /> + : null} +
+ {feedbackState?.typeOfBlock || flag != TITLE_STATUS.PFA ? : <>} + + } + }} /> + + { + if (record?.submissionData?.forestLandType == 'revenueForest' && record?.submissionData?.typeOfBlock == 'jungleBlock') { + return <> +
+ + {flag == TITLE_STATUS.PFA ? feedbackState?.compartmentNo ? + handleFeedbackClick("compartmentNo")} /> + : handleFeedbackClick("compartmentNo")} fontSize="large" /> + : null} +
+ {feedbackState?.compartmentNo || flag != TITLE_STATUS.PFA ? : <>} + + } + }} /> + + { + if (record?.submissionData?.forestLandType == 'revenueForest' && record?.submissionData?.typeOfBlock == 'revenueBlock') { + return <> +
+ + {flag == TITLE_STATUS.PFA ? feedbackState?.fraPlotsClaimed ? + handleFeedbackClick("fraPlotsClaimed")} /> + : handleFeedbackClick("fraPlotsClaimed")} fontSize="large" /> + : null} +
+ {feedbackState?.fraPlotsClaimed || flag != TITLE_STATUS.PFA ? : <>} + + {PlotInputs()} + + } + }} /> + + { + if (record?.submissionData?.forestLandType == 'reservedForest') { + return <> +
+ + {flag == TITLE_STATUS.PFA ? feedbackState?.compartmentNo ? + handleFeedbackClick("compartmentNo")} /> + : handleFeedbackClick("compartmentNo")} fontSize="large" /> + : null} +
+ {feedbackState?.compartmentNo || flag != TITLE_STATUS.PFA ? : <>} + + } + }} /> - {PlotInputs()}
diff --git a/src/pages/submissions/SubmissionsView.tsx b/src/pages/submissions/SubmissionsView.tsx index c5921d2..0de7a0f 100644 --- a/src/pages/submissions/SubmissionsView.tsx +++ b/src/pages/submissions/SubmissionsView.tsx @@ -97,11 +97,18 @@ const SubmissionsView = () => { - - { - //@ts-ignore - [...Array(Number(subData?.fraPlotsClaimed))?.keys()]?.map(el => ) - } + + + {subData?.forestLandType == 'revenueForest' && } + {subData?.forestLandType == 'revenueForest' && subData?.typeOfBlock == 'jungleBlock' && } + {subData?.forestLandType == 'revenueForest' && subData?.typeOfBlock == 'revenueBlock' && <> + + { + //@ts-ignore + [...Array(Number(subData?.fraPlotsClaimed))?.keys()]?.map(el => ) + } + } + {subData?.forestLandType == 'reservedForest' && } openImageViewer(index, setRorImageViewer)}> {rorImages?.map((el: string) => )}