diff --git a/src/constants/LangConstants.ts b/src/constants/LangConstants.ts index 7de3d5a506565d307983a2e195b411f827d0007b..bec48d016568fd932876775da5373ef1bb54667a 100644 --- a/src/constants/LangConstants.ts +++ b/src/constants/LangConstants.ts @@ -57,6 +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" + SEND_FOR_INSPECTION:"Send for assessment", + 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 549bcae3c50a33c98680258deed953103ac825f7..15f6691fb92cf52502e47e11e72e6694e6d3d098 100644 --- a/src/helpers/util.ts +++ b/src/helpers/util.ts @@ -1,4 +1,4 @@ -import { APP } from "../constants"; +import { APP, LANG } from "../constants"; const getRoleLabel = (roleName: string) => { @@ -13,5 +13,25 @@ const getRoleLabel = (roleName: string) => { return APP.ROLE_LABEL.SUPER_ADMIN; } } - -export default { getRoleLabel }; \ No newline at end of file +// Function to format the status label +export const formatLabel = (labelStatus: string) => { + let lowerLabel = labelStatus.toLowerCase(); + lowerLabel = lowerLabel.charAt(0).toUpperCase() + lowerLabel.slice(1); + switch (lowerLabel) { + case `${LANG.METRIC_LABEL_KEY.UNDER_REVIEW}`: + lowerLabel = `${LANG.FORM_STATUS_TEXT.UNDER_REVIEW}`; + return lowerLabel; + case `${LANG.METRIC_LABEL_KEY.SENT_FOR_INS}`: + lowerLabel = `${LANG.FORM_STATUS_TEXT.SENT_FOR_INSPECTION}`; + return lowerLabel; + case `${LANG.METRIC_LABEL_KEY.INS_COMPLETED}`: + lowerLabel = `${LANG.FORM_STATUS_TEXT.INSPECTION_COMPLETED}`; + return lowerLabel; + case `${LANG.METRIC_LABEL_KEY.INSPECTOR_TOTAL_PENDING}`: + lowerLabel = `${LANG.FORM_STATUS_TEXT.INSPECTOR_TOTAL_PENDING}`; + return lowerLabel; + default: + return lowerLabel; + } + } +export default { getRoleLabel, formatLabel }; \ No newline at end of file diff --git a/src/pages/Inspector/InspectorHome.tsx b/src/pages/Inspector/InspectorHome.tsx index 3bf40495481926ebb0a96a3b36d3b0bdc86dce68..48b3a7441d5875befe6b9042107f1182b3d82462 100644 --- a/src/pages/Inspector/InspectorHome.tsx +++ b/src/pages/Inspector/InspectorHome.tsx @@ -7,6 +7,7 @@ import { FormService } from "./../../services/form.service"; import { APP, LANG } from "./../../constants"; import Notify from "./../../helpers/notify"; import moment from "moment"; +import { formatLabel } from "../../helpers/util"; /** * Inspector component renders @@ -174,7 +175,7 @@ export const InspectorHome = ({ data }: InspectorProps) => { className="col-sm-12 col-md-4 col-lg-2 col-xl-2 col-xxl-2 mt-2 mt-sm-2 mt-md-2 mt-lg-0 mt-xl-0 mt-xxl-0" key={j} > - <CardOne count={i.value} title={i.key} /> + <CardOne count={i.value} title={formatLabel(i.key)} /> </div> ); })} diff --git a/src/pages/Reviewer/ReviewerHome.tsx b/src/pages/Reviewer/ReviewerHome.tsx index 0b28b4915618e1e78b076693aec7d718fc1a9cf4..7571da93210fc780b542ae00388f4d214052227c 100644 --- a/src/pages/Reviewer/ReviewerHome.tsx +++ b/src/pages/Reviewer/ReviewerHome.tsx @@ -6,6 +6,7 @@ import { FormService } from "../../services/form.service"; import { APP, LANG } from "../../constants"; import { BtnOne } from "../../components/buttons"; import { useHistory } from "react-router-dom"; +import { formatLabel } from "../../helpers/util"; /** * Reviewer component renders @@ -115,26 +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; - default: - return lowerLabel; - } - }; - return ( <Fragment> <div className="container-fluid">