Merge pull request #174 from upendraTekdi/admin_uk

Task #225316: add type in center list , add space for reassign button on team leader and users tables
tekdi · Aug 29, 2024 · c4adbd4 · c4adbd4
2 parents 3409d1f + 618e8ec
commit c4adbd4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/data/tableColumns.ts b/src/data/tableColumns.ts
@@ -36,7 +36,7 @@ export const getUserTableColumns = (t: any, isMobile: boolean) => {
     // { key: "createdBy", titleKey: "TABLE_TITLE.CREATED_BY", width: 130, sortDirection: SortDirection.Ascend },
     // { key: "createdAt", titleKey: "TABLE_TITLE.CREATED_DATE", width: 160, sortDirection: SortDirection.Ascend },
     { key: "updatedAt", titleKey: "TABLE_TITLE.UPDATED_DATE", width: 160},
-    { key: "actions", titleKey: "TABLE_TITLE.ACTIONS", width: 150 , isSortable: false },
+    { key: "actions", titleKey: "TABLE_TITLE.ACTIONS", width: 170 , isSortable: false },
   ];
 
   return generateColumns(t, configs, isMobile);
@@ -53,7 +53,7 @@ export const getTLTableColumns = (t: any, isMobile: boolean) => {
     { key: "createdBy", titleKey: "TABLE_TITLE.CREATED_BY", width: 130,  },
     { key: "createdAt", titleKey: "TABLE_TITLE.CREATED_DATE", width: 160, },
     { key: "updatedAt", titleKey: "TABLE_TITLE.UPDATED_DATE", width: 160, },
-    { key: "actions", titleKey: "TABLE_TITLE.ACTIONS", width: 150 , isSortable: false},
+    { key: "actions", titleKey: "TABLE_TITLE.ACTIONS", width: 170 , isSortable: false},
   ];
 
   return generateColumns(t, configs, isMobile);

diff --git a/src/pages/centers.tsx b/src/pages/centers.tsx
@@ -217,9 +217,12 @@ const Center: React.FC = () => {
 
         result?.forEach((item: any, index: number) => {
           const cohortType =
-            item?.customFields?.map((field: any) =>
-              firstLetterInUpperCase(field?.value)
-            ) ?? "-";
+            item?.customFields?.find(
+              (field: any) => field.label === "TYPE_OF_COHORT"
+            )?.value ?? "-";
+
+          const formattedCohortType =
+            cohortType !== "-" ? firstLetterInUpperCase(cohortType) : "-";
 
           const counts = memberCounts[index] || {
             totalActiveMembers: 0,