Merge pull request #365 from AkshataKatwal16/relese-changes

Issue feat: UI changes
tekdi · Nov 29, 2024 · eaa4421 · eaa4421
2 parents 3e7b7c5 + b4853d8
commit eaa4421
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 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": "Code already exists"
 
   },
   "LOGIN_PAGE": {

diff --git a/src/components/DeleteUserModal.tsx b/src/components/DeleteUserModal.tsx
@@ -183,4 +183,4 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({
   );
 };
 
-export default DeleteUserModal;
+export default DeleteUserModal;
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{
-Original file line number
+Diff line change
@@ Expand Up / @@ -183,4 +183,4 @@ const DeleteUserModal: React.FC<DeleteUserModalProps> = ({ @@
       );
     };
-    export default DeleteUserModal;
+    export default DeleteUserModal;