Merge pull request #473 from mahajanmahesh935/oblf

TASK #00000 : Add program field in list view for student and teacher
tekdi · Jan 20, 2025 · b5c0fdd · b5c0fdd
2 parents 092f220 + f6e4754
commit b5c0fdd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -424,7 +424,8 @@
     "TO_TIME": "To Time",
     "CLUSTER_NAME_REQUIRED": "Cluster Name Required",
     "SCHOOL_CODE_NOT_UNIQUE": "School Code Not Unique",
-    "GRADE":"Grade"
+    "GRADE":"Grade",
+    "SUPERVISOR":"Supervisor"
   },
   "FORM_ERROR_MESSAGES": {
     "INVALID_INPUT": "Invalid Input.",
@@ -464,6 +465,7 @@
     "ARCHIVED_MEMBERS": "Archived Members",
     "ACTIVE_MEMBERS": "Active Members",
     "ACTIVE_LEARNERS": "Active Students",
-    "ARCHIVED_LEARNERS": " Archived Students"
+    "ARCHIVED_LEARNERS": " Archived Students",
+    "PROGRAM":"Program"
   }
 }
diff --git a/src/components/UserTable.tsx b/src/components/UserTable.tsx
@@ -724,6 +724,9 @@ const UserTable: React.FC<UserTableProps> = ({
           const stateField = user?.customFields?.find(
             (field: any) => field?.label === "STATES"
           );
+
+          const programField = user?.customFields.find((field: any) => field.label === "PROGRAM");
+          const program = programField?.value || "-";
 
           return {
             userId: user.userId,
@@ -752,6 +755,7 @@ const UserTable: React.FC<UserTableProps> = ({
             stateCode: stateField?.code,
             districtCode: districtField?.code,
             blockCode: blockField?.code,
+            program :program
             // centers: null,
             // Programs: null,
           };

diff --git a/src/data/tableColumns.ts b/src/data/tableColumns.ts
@@ -32,6 +32,7 @@ export const getUserTableColumns = (t: any, isMobile: boolean) => {
     // { key: "district", titleKey: "TABLE_TITLE.DISTRICT_BLOCK", width: 160 },
     // { key: "blocks", titleKey: "TABLE_TITLE.BLOCK", width: 130},
     { key: "centers", titleKey: "TABLE_TITLE.CENTER", width: 180 },
+    { key: "program", titleKey: "TABLE_TITLE.PROGRAM", width: 180 },
     // { key: "updatedBy", titleKey: "TABLE_TITLE.UPDATED_BY", width: 160 },
     { key: "createdBy", titleKey: "TABLE_TITLE.CREATED_BY", width: 130, sortDirection: SortDirection.Ascend },
     // { key: "createdAt", titleKey: "TABLE_TITLE.CREATED_DATE", width: 160, sortDirection: SortDirection.Ascend },
@@ -51,6 +52,7 @@ export const getTeacherColumns = (t: any, isMobile: boolean) => {
     // { key: "district", titleKey: "TABLE_TITLE.DISTRICT_BLOCK", width: 160 },
     // { key: "blocks", titleKey: "TABLE_TITLE.BLOCK", width: 130},
     { key: "centers", titleKey: "TABLE_TITLE.CENTER", width: 180 },
+    { key: "program", titleKey: "TABLE_TITLE.PROGRAM", width: 180 },
     // { key: "updatedBy", titleKey: "TABLE_TITLE.UPDATED_BY", width: 160 },
     // { key: "createdBy", titleKey: "TABLE_TITLE.CREATED_BY", width: 130, sortDirection: SortDirection.Ascend },
     // { key: "createdAt", titleKey: "TABLE_TITLE.CREATED_DATE", width: 160, sortDirection: SortDirection.Ascend },