Issue #PS-1456 feat: API integration for re-assign Learners

tekdi · Sep 3, 2024 · a8394d5 · a8394d5
1 parent 55a36b6
commit a8394d5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 19 deletions.
diff --git a/src/components/CohortLearnerList.tsx b/src/components/CohortLearnerList.tsx
@@ -54,24 +54,23 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
             filters,
           });
           const resp = response?.result?.userDetails;
-
+                    
           if (resp) {
-            const userDetails = resp.map((user: any) => ({
-              name: toPascalCase(user.name),
-              userId: user.userId,
-              memberStatus: user.status,
-              statusReason: user.statusReason,
-              cohortMembershipId: user.cohortMembershipId,
-              enrollmentNumber: capitalizeEachWord(
-                getFieldValue(
-                  user?.customField,
-                  'fieldname',
-                  'Enrollment Number',
-                  'fieldvalues',
-                  '-'
-                )
-              ),
-            }));
+
+
+            const userDetails = resp.map((user: any) => {
+              const ageField = user.customField.find((field: { label: string }) => field.label === "AGE");
+              return {
+                name: toPascalCase(user?.name),
+                userId: user?.userId,
+                memberStatus: user?.status,
+                statusReason: user?.statusReason,
+                cohortMembershipId: user?.cohortMembershipId,
+                enrollmentNumber: user?.username,
+                age: ageField ? ageField.value : null, // Extract age for the specific user
+              };
+            });
+
             console.log(`userDetails`, userDetails);
             setUserData(userDetails);
           }
@@ -117,6 +116,7 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
                     userId={data.userId}
                     learnerName={data.name}
                     enrollmentId={data.enrollmentNumber}
+                    age={data.age}
                     cohortMembershipId={data.cohortMembershipId}
                     isDropout={data.memberStatus === Status.DROPOUT}
                     statusReason={data.statusReason}

diff --git a/src/components/LearnersListItem.tsx b/src/components/LearnersListItem.tsx
@@ -37,6 +37,7 @@ import reassignLearnerStore from '@/store/reassignLearnerStore';
 import { bulkCreateCohortMembers } from '@/services/CohortServices';
 import { capitalizeEachWord, filterMiniProfileFields } from '@/utils/Helper';
 import { useMediaQuery } from '@mui/material';
+import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
 
 type Anchor = 'bottom';
 
@@ -46,6 +47,7 @@ const LearnersListItem: React.FC<LearnerListProps> = ({
   learnerName,
   isDropout,
   enrollmentId,
+  age,
   cohortMembershipId,
   statusReason,
   reloadState,
@@ -561,7 +563,17 @@ const LearnersListItem: React.FC<LearnerListProps> = ({
                             color: theme.palette.warning['400'],
                           }}
                         >
-                          {enrollmentId}
+                          {age + ' y/o'}
+                        </Box>
+                        <FiberManualRecordIcon style={{ fontSize: '8px', color:'#CDC5BD' }} />
+                        <Box
+                          sx={{
+                            fontSize: '14px',
+                            fontWeight: '400',
+                            color: theme.palette.warning['400'],
+                          }}
+                        >
+                          {enrollmentId?.toUpperCase()}
                         </Box>
                       </>
                     )}

diff --git a/src/utils/Interfaces.ts b/src/utils/Interfaces.ts
@@ -324,7 +324,8 @@ export interface LearnerListProps {
   type?: string;
   userId: string;
   isDropout: boolean;
-  enrollmentId?: string | number;
+  enrollmentId?: any;
+  age: string | number;
   cohortMembershipId: string | number;
   learnerName: string;
   statusReason: string;