Issue feat: UI changes

tekdi · Nov 29, 2024 · 006b93b · 006b93b
1 parent 106fa4c
commit 006b93b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 13 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -141,7 +141,8 @@
     "PAGE_NOT_FOUND": "Page not found",
     "ACCESS_DENIED": "Access Denied",
     "YOU_DONT_HAVE_PERMISSION_TO_ACCESS_THIS_PAGE": "You don't have access to this page",
-    "RETURN_TO_LOGIN": "Return to Login"
+    "RETURN_TO_LOGIN": "Return to Login",
+    "COHORT_CODE_EXISTS": "Cohort code already exists"
 
   },
   "LOGIN_PAGE": {

diff --git a/src/components/DeleteUserModal.tsx b/src/components/DeleteUserModal.tsx
@@ -41,16 +41,18 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
   centers,
   userId,
   userName,
-  userType
+  userType,
 }) => {
-  console.log(centers)
+  console.log(centers);
   const { t } = useTranslation();
   const theme = useTheme<any>();
   const reasons = [
     { value: "Incorrect Data Entry", label: t("COMMON.INCORRECT_DATA_ENTRY") },
     { value: "Duplicated User", label: t("COMMON.DUPLICATED_USER") },
   ];
-  const [checkedCohortDeletion, setCheckedCohortDeletion] = useState<boolean>(centers === "-" ? true : false);
+  const [checkedCohortDeletion, setCheckedCohortDeletion] = useState<boolean>(
+    centers === "-" ? true : false
+  );
 
   useEffect(() => {
     if (centers === "-") {
@@ -89,7 +91,7 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
 
   return (
     <CustomModal
-    width="25%"
+      width="25%"
       open={open}
       handleClose={handleClose}
       title={t("COMMON.DELETE_USER")}
@@ -112,7 +114,11 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
             variant="body1"
             sx={{ marginBottom: "12px", fontWeight: "bold", color: "#333" }}
           >
-            {userType===Role.TEAM_LEADERS?t("COMMON.USER_BLOCK", { name: userName }): centers.split(', ').length===1 ? t("COMMON.USER_CENTER", { name: userName }) : t("COMMON.USER_CENTERS", { name: userName })}
+            {userType === Role.TEAM_LEADERS
+              ? t("COMMON.USER_BLOCK", { name: userName })
+              : centers.split(", ").length === 1
+                ? t("COMMON.USER_CENTER", { name: userName })
+                : t("COMMON.USER_CENTERS", { name: userName })}
           </Typography>
 
           <Box
@@ -137,8 +143,13 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
                 color="primary"
               />
             }
-            label={userType===Role.TEAM_LEADERS?t("COMMON.DELETE_FROM_BLOCK_WARNING"): centers.split(', ').length===1 ? t("COMMON.DELETE_FROM_CENTER_WARNING") : t("COMMON.DELETE_FROM_CENTERS_WARNING")}
-
+            label={
+              userType === Role.TEAM_LEADERS
+                ? t("COMMON.DELETE_FROM_BLOCK_WARNING")
+                : centers.split(", ").length === 1
+                  ? t("COMMON.DELETE_FROM_CENTER_WARNING")
+                  : t("COMMON.DELETE_FROM_CENTERS_WARNING")
+            }
             sx={{ marginTop: "12px", color: "#555" }}
           />
         </Box>

diff --git a/src/components/ReassignCenterModal.tsx b/src/components/ReassignCenterModal.tsx
@@ -372,7 +372,8 @@ const ReassignCenterModal: React.FC<ReassignCohortModalProps> = ({
           setReassignAlertModal(true);
           setAssignedTeamLeader(resp?.userDetails?.length);
           setSelectedBlockForTL(checkedCenters[0]);
-          const userNames = resp?.userDetails?.map((user: any) => user.name);
+          const userNames = resp?.userDetails?.map((user: any) => firstLetterInUpperCase(user.name));
+
           setSelectedTLUserID(userId);
           setAssignedTeamLeaderNames(userNames);
         } else {

diff --git a/src/components/SendCredentialModal.tsx b/src/components/SendCredentialModal.tsx
@@ -115,8 +115,9 @@ const SendCredentialModal: React.FC<SendCredentialModalProps> = ({
         <Box
           p="18px"
           display="flex"
-          justifyContent="space-between"
-          alignItems="center"
+         justifyContent="flex-end"
+         gap="8px"
+  alignItems="center"
         >
           {userType === Role.STUDENT ? (
             <Button

diff --git a/src/utils/useLocationState.tsx b/src/utils/useLocationState.tsx
@@ -10,6 +10,7 @@ import { useTranslation } from "react-i18next";
 import { useQueryClient } from "@tanstack/react-query";
 import { formatedBlocks, formatedDistricts } from "@/services/formatedCohorts";
 import { cohortMemberList } from "@/services/UserList";
+import { firstLetterInUpperCase} from "@/utils/Helper";
 type FilterDetails = {
   role: any;
   status?: any;
@@ -206,8 +207,8 @@ export const useLocationState = (
                  // setcreateTLAlertModal(true)
                   setAssignedTeamLeader(resp?.userDetails?.length)
                //   setSelectedBlockForTL(selectedBlock[0])
-                  const userNames = resp?.userDetails?.map((user: any )=> user.name);
-                  //setSelectedTLUserID(userId)
+               const userNames = resp?.userDetails?.map((user: any) => firstLetterInUpperCase(user.name));
+               //setSelectedTLUserID(userId)
                  setAssignedTeamLeaderNames(userNames)
                  }
                  else{