From 68d25af56d71c6ca38d60496f748bf7ab5979107 Mon Sep 17 00:00:00 2001
From: BharathTarento <bharath.kumar@tarento.cocom>
Date: Thu, 10 Nov 2022 12:42:56 +0530
Subject: [PATCH] changes of the label and status name
---
src/components/modal/InspectionScheduleModal.tsx | 4 ++--
src/components/modal/ModalOne.tsx | 4 ++--
src/components/status-bar/StatusBar.tsx | 4 ++--
src/components/status-bar/StatusBarLarge.tsx | 6 +++---
src/constants/LangConstants.ts | 4 ++++
src/layouts/Inspector/FormView.tsx | 5 +++--
src/layouts/Inspector/InspectionCompleteLayout.tsx | 3 ++-
src/pages/Regulator/RegulatorAllApplications.tsx | 10 +++++-----
src/pages/Reviewer/ReviewerApplications.tsx | 6 +++---
src/pages/Reviewer/ReviewerHome.tsx | 4 ++--
10 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/components/modal/InspectionScheduleModal.tsx b/src/components/modal/InspectionScheduleModal.tsx
index 9df24f8..fb87368 100644
--- a/src/components/modal/InspectionScheduleModal.tsx
+++ b/src/components/modal/InspectionScheduleModal.tsx
@@ -7,7 +7,7 @@ import { SelectField, TextField } from "../form-elements";
import { BtnOne } from "../buttons";
import { HeadingFive } from "../headings";
import moment from "moment";
-import { APP } from "../../constants";
+import { APP, LANG } from "../../constants";
import { ReviewService } from "../../services";
import Notify from "../../helpers/notify";
import { useHistory } from "react-router-dom";
@@ -322,7 +322,7 @@ export const InspectionScheduleModal = ({
ReviewService.assignToInspection(payload).then(
(response) => {
if (response.statusInfo.statusCode === APP.CODE.SUCCESS) {
- Notify.success("Sent for inspection.");
+ Notify.success(`${LANG.FORM_STATUS_TEXT.sentForInspection}.`);
history.push(APP.ROUTES.DASHBOARD);
setCuratedAssitingInspectors([]);
setCuratedLeadInspectors([]);
diff --git a/src/components/modal/ModalOne.tsx b/src/components/modal/ModalOne.tsx
index 77bd0c4..5c76fb4 100644
--- a/src/components/modal/ModalOne.tsx
+++ b/src/components/modal/ModalOne.tsx
@@ -20,7 +20,7 @@ export const ModalOne = ({ heading, list, id, ariaLabel }: ModalOneProps) => {
let formatedStatus = "";
switch (status) {
case LANG.FORM_STATUS.INSPECTION_COMPLETED:
- formatedStatus = "Inspection completed";
+ formatedStatus = `${LANG.FORM_STATUS_TEXT.inspectionCompleted}`;
break;
case LANG.FORM_STATUS.RETURNED:
formatedStatus = "Returned";
@@ -47,7 +47,7 @@ export const ModalOne = ({ heading, list, id, ariaLabel }: ModalOneProps) => {
formatedStatus = "Unpublished";
break;
case LANG.FORM_STATUS.SENT_FOR_INSPECTION:
- formatedStatus = "Sent for inspection";
+ formatedStatus = `${LANG.FORM_STATUS_TEXT.sentForInspection}`;
break;
default:
formatedStatus = "";
diff --git a/src/components/status-bar/StatusBar.tsx b/src/components/status-bar/StatusBar.tsx
index 51a621b..0cc28e3 100644
--- a/src/components/status-bar/StatusBar.tsx
+++ b/src/components/status-bar/StatusBar.tsx
@@ -41,12 +41,12 @@ export const StatusBar = ({ label, status }: StatusBarProps) => {
{status && status === LANG.FORM_STATUS.SENT_FOR_INSPECTION && (
<label
className={`${styles.status_two_label} px-3 m-0`}
- >{`Status: Sent for inspection`}</label>
+ >{`Status: ${LANG.FORM_STATUS_TEXT.sentForInspection}`}</label>
)}
{status && status === LANG.FORM_STATUS.INSPECTION_COMPLETED && (
<label
className={`${styles.status_one_label} px-3 m-0`}
- >{`Status: Inspection completed`}</label>
+ >{`Status: ${LANG.FORM_STATUS_TEXT.inspectionCompleted}`}</label>
)}
{status && status === LANG.FORM_STATUS.APPROVED && (
<label
diff --git a/src/components/status-bar/StatusBarLarge.tsx b/src/components/status-bar/StatusBarLarge.tsx
index 3f92338..102456f 100644
--- a/src/components/status-bar/StatusBarLarge.tsx
+++ b/src/components/status-bar/StatusBarLarge.tsx
@@ -72,14 +72,14 @@ export const StatusBarLarge = ({
<div
className={`${styles.status_bar_large_indicator} text-center mx-3 mt-3 ${styles.status_bar_large_amber}`}
>
- <label>{`Status: Sent for inspection`}</label>
+ <label>{`Status: ${LANG.FORM_STATUS_TEXT.sentForInspection}`}</label>
</div>
)}
{status === LANG.FORM_STATUS.INSPECTION_COMPLETED && (
<div
className={`${styles.status_bar_large_indicator} text-center mx-3 mt-3 ${styles.status_bar_large_green}`}
>
- <label>{`Status: Inspection completed`}</label>
+ <label>{`Status: ${LANG.FORM_STATUS_TEXT.inspectionCompleted}`}</label>
</div>
)}
{status === LANG.FORM_STATUS.APPROVED && (
@@ -134,7 +134,7 @@ export const StatusBarLarge = ({
</>
)}
{label && label === LANG.FORM_STATUS.INSPECTION_COMPLETED && (
- <p className="text-center pt-3">Inspection completed!</p>
+ <p className="text-center pt-3">{`${LANG.FORM_STATUS_TEXT.inspectionCompleted}`}!</p>
)}
{label && label === LANG.FORM_STATUS.APPROVED && (
<p className="text-center pt-3">
diff --git a/src/constants/LangConstants.ts b/src/constants/LangConstants.ts
index 42189d3..a9b78c5 100644
--- a/src/constants/LangConstants.ts
+++ b/src/constants/LangConstants.ts
@@ -54,4 +54,8 @@ export const LANG = {
CONFIRM_TO_REMOVE: "Confirm to remove",
HEADING_REMOVAL_WARNING: "Are you sure deleting the header?",
CONFIRM_TO_REMOVE_2: "This action will move the question section to the general header category.",
+ FORM_STATUS_TEXT: {
+ sentForInspection:"Sent for assessment",
+ inspectionCompleted: "Assessment completed"
+ }
};
diff --git a/src/layouts/Inspector/FormView.tsx b/src/layouts/Inspector/FormView.tsx
index cf640c5..e3102ca 100644
--- a/src/layouts/Inspector/FormView.tsx
+++ b/src/layouts/Inspector/FormView.tsx
@@ -26,6 +26,7 @@ import {
dataObjectFileUpload as dataObjectFileUploadAtom,
} from "../../states/atoms";
import { useHistory } from "react-router-dom";
+import { LANG } from "../../constants";
/**
* FormView component renders
@@ -2497,7 +2498,7 @@ export const FormView = ({ applicationData, formData }: FormViewProps) => {
/>
) : enableInspectioComplete ? (
<BtnTwo
- label="Inspection completed"
+ label={`${LANG.FORM_STATUS_TEXT.inspectionCompleted}`}
btnType="button"
isLink={true}
link={`/inspection-summary/${formData.id}/${applicationData.applicationId}`}
@@ -2513,7 +2514,7 @@ export const FormView = ({ applicationData, formData }: FormViewProps) => {
className={`${btnStylesTwo.btn_two_disabled}`}
disabled={true}
>
- Inspection completed
+ {`${LANG.FORM_STATUS_TEXT.inspectionCompleted}`}
</button>
)}
</div>
diff --git a/src/layouts/Inspector/InspectionCompleteLayout.tsx b/src/layouts/Inspector/InspectionCompleteLayout.tsx
index 992c0c4..af8c3ab 100644
--- a/src/layouts/Inspector/InspectionCompleteLayout.tsx
+++ b/src/layouts/Inspector/InspectionCompleteLayout.tsx
@@ -1,5 +1,6 @@
import { BtnTwo } from "../../components/buttons";
import { HeadingOne } from "../../components/headings";
+import { LANG } from "../../constants";
import styles from "./InspectionCompleteLayout.module.css";
/**
@@ -24,7 +25,7 @@ export const InspectionCompleteLayout = ({
</div>
</div>
<div className="">
- <HeadingOne heading="Inspection completed" />
+ <HeadingOne heading={`${LANG.FORM_STATUS_TEXT.inspectionCompleted}`} />
</div>
<div className="mt-4">
<BtnTwo label="View pending applications" showIcon={false} isLink={true} isModal={false} btnType="button" link="/all-applications" />
diff --git a/src/pages/Regulator/RegulatorAllApplications.tsx b/src/pages/Regulator/RegulatorAllApplications.tsx
index 1f42f98..3a5764a 100644
--- a/src/pages/Regulator/RegulatorAllApplications.tsx
+++ b/src/pages/Regulator/RegulatorAllApplications.tsx
@@ -11,7 +11,7 @@ import {
} from "../../states/atoms";
import Helper from "./../../helpers/auth";
import { FormService } from "./../../services/form.service";
-import { APP } from "./../../constants";
+import { APP, LANG } from "./../../constants";
import Notify from "./../../helpers/notify";
/**
@@ -55,13 +55,13 @@ export const RegulatorAllApplications = ({
},
{
id: "sentForInspection",
- label: "Sent for inspection",
+ label: `${LANG.FORM_STATUS_TEXT.sentForInspection}`,
ariaLabelled: "sent-for-inpection-tab",
children: <AllApplicationsTab />,
},
{
id: "inspectionCompleted",
- label: "Inspection completed",
+ label: `${LANG.FORM_STATUS_TEXT.inspectionCompleted}`,
ariaLabelled: "inspection-completed-tab",
children: <AllApplicationsTab />,
},
@@ -144,11 +144,11 @@ export const RegulatorAllApplications = ({
tempStatus = "returned";
break;
- case "Sent for inspection":
+ case `${LANG.FORM_STATUS_TEXT.sentForInspection}`:
tempStatus = "sentforins";
break;
- case "Inspection completed":
+ case `${LANG.FORM_STATUS_TEXT.inspectionCompleted}`:
tempStatus = "inscompleted";
break;
diff --git a/src/pages/Reviewer/ReviewerApplications.tsx b/src/pages/Reviewer/ReviewerApplications.tsx
index 853aef0..e55f9f1 100644
--- a/src/pages/Reviewer/ReviewerApplications.tsx
+++ b/src/pages/Reviewer/ReviewerApplications.tsx
@@ -2,7 +2,7 @@ import { Component, Fragment } from "react";
import Header from "./../../components/common/Header";
import { Link } from "react-router-dom";
import { FormService } from "./../../services/form.service";
-import { APP } from "./../../constants";
+import { APP, LANG } from "./../../constants";
import Notify from "./../../helpers/notify";
import Helper from "./../../helpers/auth";
import { ViewApplications } from "..";
@@ -40,8 +40,8 @@ const FORM_STATUS = [
"New",
"Under review",
"Returned",
- "Sent for inspection",
- "Inspection completed",
+ `${LANG.FORM_STATUS_TEXT.sentForInspection}`,
+ `${LANG.FORM_STATUS_TEXT.inspectionCompleted}`,
"Approved"
];
class ReviewerApplications extends Component<ReviewerApplicationsProps, ReviewerApplicationsState> {
diff --git a/src/pages/Reviewer/ReviewerHome.tsx b/src/pages/Reviewer/ReviewerHome.tsx
index b931554..ea96b7c 100644
--- a/src/pages/Reviewer/ReviewerHome.tsx
+++ b/src/pages/Reviewer/ReviewerHome.tsx
@@ -125,10 +125,10 @@ export const ReviewerHome = ({ data }: ReviewerProps) => {
lowerLabel = "Under review";
return lowerLabel;
case "Sentforins":
- lowerLabel = "Sent for inspection";
+ lowerLabel = `${LANG.FORM_STATUS_TEXT.sentForInspection}`;
return lowerLabel;
case "Inscompleted":
- lowerLabel = "Inspection completed";
+ lowerLabel = `${LANG.FORM_STATUS_TEXT.inspectionCompleted}`;
return lowerLabel;
default:
return lowerLabel;
--
GitLab