Merge pull request #2868 from AkshataKatwal16/feat-c2c-onboard

Issue feat: Resolve scp timetable and dropout learner issues

Author: rushi-tekdi

mfes/scp-teacher-repo/src/components/CohortLearnerList.tsx

@@ -56,7 +56,7 @@ const CohortLearnerList: React.FC<CohortLearnerListProp> = ({
       try {
         if (cohortId) {
           const page = 0;
-          const filters = { cohortId: cohortId };
+          const filters = { cohortId: cohortId , status: [Status.ACTIVE, Status.DROPOUT]};
           const response = await getMyCohortMemberListLearner({
             limit,
             page,

mfes/scp-teacher-repo/src/pages/dashboard.tsx

@@ -937,7 +937,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
               after: afterDate,
               before: beforeDate,
             },
-            // cohortId: classId,
+            cohortId: classId,
             createdBy: userId,
             status: ['live'],
           };
@@ -967,7 +967,7 @@ const Dashboard: React.FC<DashboardProps> = () => {
       }
     };
 
-    if (userId && myCohortList) {
+    if (userId && myCohortList && classId) {
       getSessionsData();
     }
   }, [

mfes/scp-teacher-repo/src/services/MyClassDetailsService.ts

@@ -72,8 +72,9 @@ export const getMyCohortMemberListLearner = async ({
   limit,
   page,
   filters,
-}: CohortMemberList & { includeArchived?: boolean }): Promise<any> => {
-  const statusFilters = [ Status.ACTIVE];
+  status = [Status.ACTIVE],
+}: CohortMemberList & { includeArchived?: boolean; status?: string[] }): Promise<any> => {
+  const statusFilters = status;
 
   const studentFilters = {
     role: Role.STUDENT,

mfes/scp-teacher-repo/src/utils/Interfaces.ts

@@ -107,6 +107,7 @@ export interface CohortMemberList {
     tenantStatus?: string[];
     name?: string | undefined;
     firstName?: string;
+    status?: string[];
   };
   includeArchived?: boolean;
 }