From bcac76f22683455c6219b10a0b74d0bf24c59794 Mon Sep 17 00:00:00 2001 From: BharathTarento <bharath.kumar@tarento.cocom> Date: Thu, 10 Nov 2022 17:31:46 +0530 Subject: [PATCH] removed commented one and added constants in Lan --- src/constants/LangConstants.ts | 9 ++++++++- src/helpers/util.ts | 12 ++++++------ src/pages/Reviewer/ReviewerHome.tsx | 22 ---------------------- 3 files changed, 14 insertions(+), 29 deletions(-) diff --git a/src/constants/LangConstants.ts b/src/constants/LangConstants.ts index 70a8c3a..bec48d0 100644 --- a/src/constants/LangConstants.ts +++ b/src/constants/LangConstants.ts @@ -57,7 +57,14 @@ export const LANG = { FORM_STATUS_TEXT: { SENT_FOR_INSPECTION:"Sent for assessment", INSPECTION_COMPLETED: "Assessment completed", + INSPECTOR_TOTAL_PENDING:"Assessment total pending", + UNDER_REVIEW:"Under review" }, SEND_FOR_INSPECTION:"Send for assessment", - INSPECTOR_TOTAL_PENDING:"Assessment total pending" + METRIC_LABEL_KEY: { + UNDER_REVIEW:"Underreview", + SENT_FOR_INS:"Sentforins", + INS_COMPLETED:"Inscompleted", + INSPECTOR_TOTAL_PENDING:"Inspector total pending" + } }; diff --git a/src/helpers/util.ts b/src/helpers/util.ts index 35fb752..15f6691 100644 --- a/src/helpers/util.ts +++ b/src/helpers/util.ts @@ -18,17 +18,17 @@ export const formatLabel = (labelStatus: string) => { let lowerLabel = labelStatus.toLowerCase(); lowerLabel = lowerLabel.charAt(0).toUpperCase() + lowerLabel.slice(1); switch (lowerLabel) { - case "Underreview": - lowerLabel = "Under review"; + case `${LANG.METRIC_LABEL_KEY.UNDER_REVIEW}`: + lowerLabel = `${LANG.FORM_STATUS_TEXT.UNDER_REVIEW}`; return lowerLabel; - case "Sentforins": + case `${LANG.METRIC_LABEL_KEY.SENT_FOR_INS}`: lowerLabel = `${LANG.FORM_STATUS_TEXT.SENT_FOR_INSPECTION}`; return lowerLabel; - case "Inscompleted": + case `${LANG.METRIC_LABEL_KEY.INS_COMPLETED}`: lowerLabel = `${LANG.FORM_STATUS_TEXT.INSPECTION_COMPLETED}`; return lowerLabel; - case "Inspector total pending": - lowerLabel = `${LANG.INSPECTOR_TOTAL_PENDING}`; + case `${LANG.METRIC_LABEL_KEY.INSPECTOR_TOTAL_PENDING}`: + lowerLabel = `${LANG.FORM_STATUS_TEXT.INSPECTOR_TOTAL_PENDING}`; return lowerLabel; default: return lowerLabel; diff --git a/src/pages/Reviewer/ReviewerHome.tsx b/src/pages/Reviewer/ReviewerHome.tsx index d812656..7571da9 100644 --- a/src/pages/Reviewer/ReviewerHome.tsx +++ b/src/pages/Reviewer/ReviewerHome.tsx @@ -116,28 +116,6 @@ export const ReviewerHome = ({ data }: ReviewerProps) => { ); }; - // Function to format the status label - // const formatLabel = (labelStatus: string) => { - // let lowerLabel = labelStatus.toLowerCase(); - // lowerLabel = lowerLabel.charAt(0).toUpperCase() + lowerLabel.slice(1); - // switch (lowerLabel) { - // case "Underreview": - // lowerLabel = "Under review"; - // return lowerLabel; - // case "Sentforins": - // lowerLabel = `${LANG.FORM_STATUS_TEXT.SENT_FOR_INSPECTION}`; - // return lowerLabel; - // case "Inscompleted": - // lowerLabel = `${LANG.FORM_STATUS_TEXT.INSPECTION_COMPLETED}`; - // return lowerLabel; - // case "Inspector total pending": - // lowerLabel = `${LANG.INSPECTOR_TOTAL_PENDING}`; - // return lowerLabel; - // default: - // return lowerLabel; - // } - // }; - return ( <Fragment> <div className="container-fluid"> -- GitLab