Merge pull request #221 from Aar-if/bugFixes

Issue #0000 chore: resolved build issue
tekdi · Sep 3, 2024 · 5a77b4e · 5a77b4e
2 parents 72c1c09 + 00dbe56
commit 5a77b4e
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/src/components/CohortFacilitatorList.tsx b/src/components/CohortFacilitatorList.tsx
@@ -57,22 +57,19 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
           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);
           }
@@ -113,6 +110,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}