diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 37889f5f..e282c0c1 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -56,7 +56,7 @@
     "REMOVE": "Remove",
     "SEND_REQUEST": "Send Request",
     "MARK_DROP_OUT": "Mark as Drop Out",
-    "MARK_ALL_AS":"Mark All As",
+    "MARK_ALL_AS": "Mark All As",
     "UNMARK_DROP_OUT": "Unmark as Drop Out",
     "SOMETHING_WENT_WRONG": "Something went wrong",
     "NO_GO_BACK": "No, go back",
@@ -126,7 +126,8 @@
     "CREATE": "Create",
     "OKAY": "Okay",
     "HELD_EVERY_WEEK_ON": "Held every week on {{days}}",
-    "SESSION_SCHEDULED_SUCCESSFULLY": "Session has been scheduled successfully!"
+    "SESSION_SCHEDULED_SUCCESSFULLY": "Session has been scheduled successfully!",
+    "CENTER": "Center"
   },
   "LOGIN_PAGE": {
     "USERNAME": "Username",
@@ -286,7 +287,7 @@
     "STEP_4": "Use this button to view a detailed overview of center attendance and see a list of learners categorized by low, average, and good attendance for any custom date range.",
     "STEP_5": "Update your preferred language anytime from here.",
     "STEP_6": "Access your teaching centers and manage tasks like adding, editing, or removing learners, marking dropouts, and reassigning centers or blocks. You can also easily schedule online or offline sessions for your subjects.",
-    "STEP_7":"Access the full academic year’s course plan for each subject, along with resources like videos and documents for every topic. Track your teaching progress by updating topic completion status.",
+    "STEP_7": "Access the full academic year’s course plan for each subject, along with resources like videos and documents for every topic. Track your teaching progress by updating topic completion status.",
     "STEP_8": "View detailed scores and summaries of Pre and Post tests for each learner. Track which students have completed, are in progress or yet to start the test.",
     "PREVIOUS": "Previous",
     "NEXT": "Next",
@@ -373,7 +374,6 @@
   "MANAGE_USERS": {
     "CENTERS_REQUESTED_SUCCESSFULLY": "Center Requested Successfully",
     "CENTERS_REQUEST_FAILED": "Center Requested Failed"
-
   },
   "FORM": {
     "FULL_NAME": "Full Name",
@@ -450,7 +450,14 @@
     "DROP_OUT_REASON": "Reason for Drop Out From School",
     "ASSIGN_CENTERS": "Assign Centers",
     "TYPE_OF_COHORT": "Center type",
-    "NOTE_THIS_WILL_BE_CENTER_NAME": "Note this will be Center name"
+    "NOTE_THIS_WILL_BE_CENTER_NAME": "Note this will be Center name",
+    "ENGLISH": "English",
+    "HOME_SCIENCE": "Home Science",
+    "MATH": "Math",
+    "LANGUAGE": "Language",
+    "SCIENCE": "Science",
+    "SOCIAL_SCIENCE": "Social Science",
+    "LIFE_SKILLS": "Life Skills"
   },
   "FORM_ERROR_MESSAGES": {
     "INVALID_INPUT": "Invalid Input.",
@@ -484,6 +491,7 @@
     "SUBMITTED_ON": "Submitted On",
     "CORRECT_ANSWER": "correct answers",
     "NO_DATA_FOUND": "No data found",
-    "SEARCH_STUDENT": "search student"
+    "SEARCH_STUDENT": "search student",
+    "NO_ASSESSMENTS_FOUND": "No assessments found"
   }
 }
diff --git a/src/components/CohortSelectionSection.tsx b/src/components/CohortSelectionSection.tsx
index a161b4cc..4658f247 100644
--- a/src/components/CohortSelectionSection.tsx
+++ b/src/components/CohortSelectionSection.tsx
@@ -1,6 +1,7 @@
 import {
   Box,
   FormControl,
+  InputLabel,
   MenuItem,
   Select,
   SelectChangeEvent,
@@ -37,12 +38,13 @@ interface CohortSelectionSectionProps {
   setManipulatedCohortData?: React.Dispatch<
     React.SetStateAction<Array<ICohort>>
   >;
-  blockName: string;
+  blockName?: string;
   isManipulationRequired?: boolean;
-  setBlockName: React.Dispatch<React.SetStateAction<string>>;
+  setBlockName?: React.Dispatch<React.SetStateAction<string>>;
   handleSaveHasRun?: boolean;
   setHandleSaveHasRun?: React.Dispatch<React.SetStateAction<boolean>>;
   isCustomFieldRequired?: boolean;
+  showFloatingLabel?: boolean;
 }
 
 interface ChildData {
@@ -78,6 +80,7 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
   handleSaveHasRun,
   setHandleSaveHasRun,
   isCustomFieldRequired = true,
+  showFloatingLabel = false,
 }) => {
   const router = useRouter();
   const theme = useTheme<any>();
@@ -217,8 +220,12 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
                 }
               }
             } else if (response[0].type === cohortHierarchy.BLOCK) {
-              setBlockName(response[0].name || response[0].cohortName);
-              setBlock(response[0].name || response[0].cohortName)
+              if (setBlockName) {
+                setBlockName(
+                  response?.[0]?.name || response?.[0]?.cohortName || ''
+                );
+              }
+              setBlock(response[0].name || response[0].cohortName);
               const filteredData = response[0].childData
                 ?.map((item: any) => {
                   const typeOfCohort = item?.customField?.find(
@@ -229,7 +236,7 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
                     cohortId: item?.cohortId,
                     parentId: item?.parentId,
                     name: item?.cohortName || item?.name,
-                    typeOfCohort: typeOfCohort || (t('ATTENDANCE.UNKNOWN')),
+                    typeOfCohort: typeOfCohort || t('ATTENDANCE.UNKNOWN'),
                   };
                 })
                 ?.filter(Boolean);
@@ -276,7 +283,7 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
   ]);
 
   const handleCohortSelection = (event: SelectChangeEvent<string>) => {
-    setClassId(event.target.value as string);
+    setClassId(event.target.value);
     ReactGA.event('cohort-selection-dashboard', {
       selectedCohortID: event.target.value,
     });
@@ -355,17 +362,21 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
                             {cohortsData?.length !== 0 ? (
                               manipulatedCohortData?.map((cohort) => (
                                 <MenuItem
-                                key={cohort.cohortId}
-                                value={cohort.cohortId}
-                                style={{
-                                  fontWeight: '500',
-                                  fontSize: '14px',
-                                  color: theme.palette.warning['A200'],
-                                  textTransform: 'capitalize',
-                                }}
-                              >
-                                {cohort.name} {cohort?.typeOfCohort === CenterType.REGULAR || CenterType.UNKNOWN &&`(${cohort.typeOfCohort})`}
-                              </MenuItem>
+                                  key={cohort.cohortId}
+                                  value={cohort.cohortId}
+                                  style={{
+                                    fontWeight: '500',
+                                    fontSize: '14px',
+                                    color: theme.palette.warning['A200'],
+                                    textTransform: 'capitalize',
+                                  }}
+                                >
+                                  {cohort.name}{' '}
+                                  {cohort?.typeOfCohort ===
+                                    CenterType.REGULAR ||
+                                    (CenterType.UNKNOWN &&
+                                      `(${cohort?.typeOfCohort?.toLowerCase()})`)}
+                                </MenuItem>
                               ))
                             ) : (
                               <Typography
@@ -395,16 +406,25 @@ const CohortSelectionSection: React.FC<CohortSelectionSectionProps> = ({
                     <Box sx={{ minWidth: 120, gap: '15px' }} display={'flex'}>
                       {cohortsData?.length > 1 ? (
                         <FormControl
-                          className="drawer-select "
+                          className={showFloatingLabel ? '' : "drawer-select"}
                           sx={{ m: 0, width: '100%' }}
                         >
+                          {showFloatingLabel && (
+                            <InputLabel id="center-select-label">
+                              {t('COMMON.CENTER')}
+                            </InputLabel>
+                          )}
                           <Select
+                            labelId="center-select-label"
+                            label={showFloatingLabel ? t('COMMON.CENTER') : ''}
                             value={classId}
                             onChange={handleCohortSelection}
-                            displayEmpty
+                            // displayEmpty
+                            // style={{ borderRadius: '4px' }}
+
                             inputProps={{ 'aria-label': 'Without label' }}
-                            className="select-languages fs-14 fw-500 bg-white"
-                            style={{
+                            className={showFloatingLabel ? '' : "select-languages fs-14 fw-500 bg-white"}
+                            style={showFloatingLabel ? {borderRadius: '4px'} : {
                               borderRadius: '0.5rem',
                               color: theme.palette.warning['200'],
                               width: '100%',
diff --git a/src/components/DynamicForm.tsx b/src/components/DynamicForm.tsx
index b8801741..34d68847 100644
--- a/src/components/DynamicForm.tsx
+++ b/src/components/DynamicForm.tsx
@@ -101,7 +101,7 @@ const DynamicForm: React.FC<DynamicFormProps> = ({
               schema.properties?.[property]?.validation?.includes('numeric')
             ) {
               error.message = t('FORM_ERROR_MESSAGES.MUST_BE_LESS_THAN', {
-                fieldname: property,
+                fieldname: t('FIELDS.AGE'),
                 maxLength: schema.properties?.[property]?.maxLength,
               });
             }
diff --git a/src/pages/assessments/index.tsx b/src/pages/assessments/index.tsx
index 7548d278..4e1f0485 100644
--- a/src/pages/assessments/index.tsx
+++ b/src/pages/assessments/index.tsx
@@ -1,4 +1,22 @@
+import CohortSelectionSection from '@/components/CohortSelectionSection';
 import Header from '@/components/Header';
+import Loader from '@/components/Loader';
+import SortingModal from '@/components/SortingModal';
+import { showToastMessage } from '@/components/Toastify';
+import {
+  getAssessmentStatus,
+  getDoIdForAssessmentDetails,
+} from '@/services/AssesmentService';
+import { getMyCohortMemberList } from '@/services/MyClassDetailsService';
+import { toPascalCase } from '@/utils/Helper';
+import { ICohort } from '@/utils/Interfaces';
+import { Role, Status } from '@/utils/app.constant';
+import ArrowDropDownSharpIcon from '@mui/icons-material/ArrowDropDownSharp';
+import CheckCircleIcon from '@mui/icons-material/CheckCircle';
+import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight';
+import RadioButtonUncheckedIcon from '@mui/icons-material/RadioButtonUnchecked';
+import RemoveIcon from '@mui/icons-material/Remove';
+import SearchIcon from '@mui/icons-material/Search';
 import {
   Box,
   Button,
@@ -7,23 +25,16 @@ import {
   IconButton,
   InputBase,
   InputLabel,
+  MenuItem,
   Paper,
   Select,
   Typography,
 } from '@mui/material';
-import React, { useEffect } from 'react';
-import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 import { useTheme } from '@mui/material/styles';
 import { useTranslation } from 'next-i18next';
-import SearchIcon from '@mui/icons-material/Search';
-import CheckCircleIcon from '@mui/icons-material/CheckCircle';
-import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight';
-import ArrowDropDownSharpIcon from '@mui/icons-material/ArrowDropDownSharp';
-import SortingModal from '@/components/SortingModal';
+import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 import { useRouter } from 'next/router';
-import RemoveIcon from '@mui/icons-material/Remove';
-import RadioButtonUncheckedIcon from '@mui/icons-material/RadioButtonUnchecked';
-import { updateAssessment } from '@/services/UpdateAssesmentService';
+import React, { useEffect } from 'react';
 
 const Assessments = () => {
   const theme = useTheme<any>();
@@ -33,6 +44,194 @@ const Assessments = () => {
   const [modalOpen, setModalOpen] = React.useState(false);
 
   const [assessmentList, setAssessmentList] = React.useState([]);
+  const [classId, setClassId] = React.useState('');
+  const [userId, setUserId] = React.useState<string | null>(null);
+  const [isAuthenticated, setIsAuthenticated] = React.useState(false);
+  const [loading, setLoading] = React.useState(false);
+  const [isLoading, setIsLoading] = React.useState(false);
+  const [cohortsData, setCohortsData] = React.useState<Array<ICohort>>([]);
+  const [manipulatedCohortData, setManipulatedCohortData] =
+    React.useState<Array<ICohort>>(cohortsData);
+
+  const [assessmentType, setAssessmentType] = React.useState<string>('pre');
+  const [cohortMembers, setCohortMembers] = React.useState<any>([]);
+  const [learnerList, setLearnerList] = React.useState<any>([]);
+  const [testCompletionCount, setTestCompletionCount] = React.useState<any>({
+    completionCount: 0,
+    totalCount: 0,
+  });
+
+  useEffect(() => {
+    if (typeof window !== 'undefined' && window.localStorage) {
+      const token = localStorage.getItem('token');
+      const storedUserId = localStorage.getItem('userId');
+      setClassId(localStorage.getItem('classId') ?? '');
+      if (token) {
+        setIsAuthenticated(true);
+      } else {
+        router.push('/login');
+      }
+      setUserId(storedUserId);
+    }
+  }, []);
+
+  useEffect(() => {
+    const getCohortMemberList = async () => {
+      setIsLoading(true);
+      try {
+        const filters = {
+          cohortId: classId,
+          role: Role.STUDENT,
+          status: [Status.ACTIVE],
+        };
+        const response = await getMyCohortMemberList({
+          limit: 300,
+          page: 0,
+          filters,
+        });
+        const resp = response?.result?.userDetails;
+
+        if (resp) {
+          const userDetails = resp.map((user: any) => ({
+            ...user,
+            name: toPascalCase(user.name),
+            userId: user.userId,
+            // percentageString: '0%',
+            // percentage: 0,
+            // status: 'Not_Started',
+          }));
+          console.log(`userDetails`, userDetails);
+          setCohortMembers(userDetails);
+        }
+      } catch (error) {
+        console.error('Error fetching cohort list:', error);
+        showToastMessage(t('COMMON.SOMETHING_WENT_WRONG'), 'error');
+        setIsLoading(false);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    if (classId) {
+      getCohortMemberList();
+      console.log('call API', classId);
+    }
+  }, [classId]);
+
+  useEffect(() => {
+    const getDoIdForAssessmentReport = async () => {
+      const stateName = localStorage.getItem('stateName') || 'Maharashtra';
+
+      const filters = {
+        program: ['Second chance'],
+        se_boards: [stateName],
+        // subject: [subjects || subject],
+        assessment1: assessmentType === 'pre' ? 'Pre Test' : 'Post Test',
+      };
+      try {
+        if (stateName) {
+          if (filters) {
+            setIsLoading(true);
+            setLearnerList([]);
+            setAssessmentList([]);
+            const searchResults = await getDoIdForAssessmentDetails({
+              filters,
+            });
+
+            if (searchResults?.responseCode === 'OK') {
+              const result = searchResults?.result;
+              if (result) {
+                console.log(
+                  'Result found from getDoIdForAssessmentDetails ',
+                  result
+                );
+                if (result?.QuestionSet?.length > 0) {
+                  const assessmentIds = result.QuestionSet.map((item: any) => {
+                    return item?.IL_UNIQUE_ID;
+                  });
+                  console.log('assessmentIds', assessmentIds);
+                  setAssessmentList(assessmentIds);
+                } else {
+                  setAssessmentList([]);
+                }
+              } else {
+                console.log(
+                  'NO Result found from getDoIdForAssessmentDetails '
+                );
+              }
+            }
+          } else {
+            console.log('NO Data found from getDoIdForAssessmentDetails ');
+          }
+        } else {
+          console.log('NO State Found');
+        }
+      } catch (error) {
+        showToastMessage(t('COMMON.SOMETHING_WENT_WRONG'), 'error');
+        console.error(
+          'Error fetching getDoIdForAssessmentDetails results:',
+          error
+        );
+      } finally {
+        setIsLoading(false);
+      }
+    };
+    getDoIdForAssessmentReport();
+    console.log('call API', classId, assessmentType);
+  }, [assessmentType]);
+
+  useEffect(() => {
+    const getAssessmentsForLearners = async () => {
+      if (assessmentList?.length > 0) {
+        try {
+          const options = {
+            userId: cohortMembers?.map((user: any) => user.userId),
+            contentId: assessmentList,
+            batchId: classId,
+          };
+          const assessmentStatus = await getAssessmentStatus(options);
+          console.log('assessmentStatus', assessmentStatus);
+          let completionCount = 0;
+          if (assessmentStatus) {
+            const userList = cohortMembers.map((user: any) => {
+              const assessment = assessmentStatus?.find(
+                (item: any) => item.userId === user.userId
+              );
+
+              if (assessment) {
+                if (assessment?.status === 'Completed') {
+                  completionCount++;
+                }
+                return {
+                  ...user,
+                  percentageString: assessment?.percentageString,
+                  percentage: assessment?.percentage,
+                  status: assessment?.status,
+                };
+              }
+              return user;
+            });
+            console.log('userList', userList);
+            setLearnerList(userList);
+          }
+
+          setTestCompletionCount({
+            completionCount,
+            totalCount: cohortMembers?.length,
+          });
+
+          setIsLoading(false);
+          console.log('assessmentStatus', learnerList);
+        } catch (e: any) {
+          setIsLoading(false);
+          console.log('Error in getAssessmentStatus', e);
+        }
+      }
+    };
+    if (assessmentList.length && cohortMembers.length) {
+      getAssessmentsForLearners();
+    }
+  }, [assessmentList, cohortMembers]);
 
   const handleScrollDown = () => {
     if (inputRef.current) {
@@ -52,15 +251,60 @@ const Assessments = () => {
     setModalOpen(false);
   };
 
-  useEffect(() => {
-    const res: any = updateAssessment();
-    setAssessmentList(res);
-  }, []);
-
   const handleAssessmentDetails = (userId: string) => {
     router.push(`${router.pathname}/user/${userId}`);
   };
 
+  const MemberListItemIcon = ({ status }: { status: string }) => {
+    switch (status) {
+      case 'Not_Started':
+        return <RemoveIcon sx={{ color: theme.palette.warning[300] }} />;
+      case 'In_Progress':
+        return (
+          <RadioButtonUncheckedIcon
+            sx={{ color: theme.palette.warning[300] }}
+          />
+        );
+      case 'Completed':
+        return <CheckCircleIcon sx={{ color: theme.palette.warning[300] }} />;
+      default:
+        return null;
+    }
+  };
+
+  const ProgressStatus = ({
+    status,
+    percentage,
+  }: {
+    status: string;
+    percentage: string | number;
+  }) => {
+    let color = 'black';
+    percentage = Number(percentage);
+    if (percentage < 33) {
+      color = 'red';
+    } else if (percentage >= 33 && percentage < 66) {
+      color = 'orange';
+    } else if (percentage >= 66) {
+      color = 'green';
+    }
+
+    switch (status) {
+      case 'Not_Started':
+        return <Box>Not Started</Box>;
+      case 'In_Progress':
+        return <Box>In Progress</Box>;
+      case 'Completed':
+        return (
+          <Box>
+            Overall Score: <span style={{ color: color }}>{percentage}%</span>
+          </Box>
+        );
+      default:
+        return null;
+    }
+  };
+
   return (
     <>
       <Box>
@@ -112,7 +356,7 @@ const Assessments = () => {
       <Grid container>
         <Grid item xs={12} md={6}>
           <Box sx={{ mt: 2, px: '20px' }}>
-            <FormControl fullWidth>
+            {/* <FormControl fullWidth>
               <InputLabel
                 style={{
                   color: theme?.palette?.warning['A200'],
@@ -130,9 +374,28 @@ const Assessments = () => {
                 label={t('ASSESSMENTS.CENTER')}
                 style={{ borderRadius: '4px' }}
               >
-                {/* <MenuItem value={'Mathematics'}>Mathematics</MenuItem> */}
               </Select>
-            </FormControl>
+            </FormControl> */}
+            <Box className="w-100 d-md-flex">
+              <CohortSelectionSection
+                classId={classId}
+                setClassId={setClassId}
+                userId={userId}
+                setUserId={setUserId}
+                isAuthenticated={isAuthenticated}
+                setIsAuthenticated={setIsAuthenticated}
+                loading={loading}
+                setLoading={setLoading}
+                cohortsData={cohortsData}
+                // setBlockName={() => { }}
+                setCohortsData={setCohortsData}
+                manipulatedCohortData={manipulatedCohortData}
+                setManipulatedCohortData={setManipulatedCohortData}
+                isManipulationRequired={false}
+                isCustomFieldRequired={true}
+                showFloatingLabel={true}
+              />
+            </Box>
           </Box>
         </Grid>
         <Grid item xs={12} md={6}>
@@ -154,160 +417,159 @@ const Assessments = () => {
                 id="demo-simple-select"
                 label={t('ASSESSMENTS.ASSESSMENT_TYPE')}
                 style={{ borderRadius: '4px' }}
+                onChange={(e) => setAssessmentType(e.target.value)}
+                defaultValue={'pre'}
+                value={assessmentType}
               >
-                {/* <MenuItem value={'Mathematics'}>Mathematics</MenuItem> */}
+                <MenuItem value={'pre'}>{t('PROFILE.PRE_TEST')}</MenuItem>
+                <MenuItem value={'post'}>{t('PROFILE.POST_TEST')}</MenuItem>
               </Select>
             </FormControl>
           </Box>
         </Grid>
       </Grid>
-      <Grid
-        sx={{
-          mt: 2,
-          px: '20px',
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'center',
-          mb: 2,
-        }}
-        container
-      >
-        <Grid
-          xs={8}
-          item
-          sx={{
-            fontSize: '14px',
-            fontWeight: '500',
-            color: theme?.palette?.warning['400'],
-          }}
-        >
-          20/24 {t('ASSESSMENTS.COMPLETED_THE_ASSESSMENT')}
-        </Grid>
-        <Grid sx={{ display: 'flex', justifyContent: 'flex-end' }} xs={4} item>
-          <Button
-            onClick={handleOpenModal}
-            sx={{
-              color: theme.palette.warning.A200,
+      {isLoading && (
+        <Box sx={{ display: 'flex', width: '100%', mt: 2, flexDirection: 'column', alignItems: 'center' }}>
+          <Loader showBackdrop={false} loadingText="Loading" />
+        </Box>
+      )}
+
+      {!isLoading && !assessmentList?.length && (
+        <Box sx={{ mt: 2, px: '20px' }}>
+          <Typography textAlign="center" fontSize="16px">
+            {t('ASSESSMENTS.NO_ASSESSMENTS_FOUND')}
+          </Typography>
+        </Box>
+      )}
 
-              borderRadius: '10px',
-              fontSize: '14px',
+      {!isLoading && learnerList?.length > 0 && (
+        <>
+          <Grid
+            sx={{
+              mt: 2,
+              px: '20px',
+              display: 'flex',
+              justifyContent: 'space-between',
+              alignItems: 'center',
+              mb: 2,
             }}
-            endIcon={<ArrowDropDownSharpIcon />}
-            size="small"
-            variant="outlined"
+            container
           >
-            {t('COMMON.SORT_BY').length > 7
-              ? `${t('COMMON.SORT_BY').substring(0, 6)}...`
-              : t('COMMON.SORT_BY')}
-          </Button>
-        </Grid>
-      </Grid>
-
-      <Box sx={{ background: '#FBF4E4', padding: '20px' }}>
-        <Grid container spacing={2}>
-          {assessmentList.map((assessment: any) => (
-            <Grid item xs={12} sm={6} md={4} key={assessment.userId}>
-              <Box
+            <Grid
+              xs={8}
+              item
+              sx={{
+                fontSize: '14px',
+                fontWeight: '500',
+                color: theme?.palette?.warning['400'],
+              }}
+            >
+              {`${testCompletionCount.completionCount}/${testCompletionCount.totalCount}`}{' '}
+              {t('ASSESSMENTS.COMPLETED_THE_ASSESSMENT')}
+            </Grid>
+            <Grid
+              sx={{ display: 'flex', justifyContent: 'flex-end' }}
+              xs={4}
+              item
+            >
+              <Button
+                onClick={handleOpenModal}
                 sx={{
-                  border: `1px solid ${theme?.palette?.warning['A100']}`,
-                  display: 'flex',
-                  justifyContent: 'space-between',
-                  borderRadius: '8px',
-                  gap: '5px',
-                  background: theme.palette.warning['A400']
+                  color: theme.palette.warning.A200,
+
+                  borderRadius: '10px',
+                  fontSize: '14px',
                 }}
-                onClick={() => handleAssessmentDetails(assessment.userId)}
+                endIcon={<ArrowDropDownSharpIcon />}
+                size="small"
+                variant="outlined"
               >
-                <Box
-                  sx={{
-                    flexBasis: '20%',
-                    background: theme?.palette?.primary?.light,
-                    display: 'flex',
-                    justifyContent: 'center',
-                    alignItems: 'center',
-                    padding: '7px',
-                  }}
-                >
-                  {/* Todo : replaced with proper flag coming from backend  */}
-                  {assessment.progress === 'Overall score :' ? (
-                    <CheckCircleIcon
-                      sx={{ color: theme.palette.warning[300] }}
-                    />
-                  ) : assessment.progress === 'Not Started' ? (
-                    <RemoveIcon sx={{ color: theme.palette.warning[300] }} />
-                  ) : assessment.progress === 'In Progress' ? (
-                    <RadioButtonUncheckedIcon
-                      sx={{ color: theme.palette.warning[300] }}
-                    />
-                  ) : null}
-                </Box>
-                <Box sx={{ flexBasis: '80%' }}>
+                {t('COMMON.SORT_BY').length > 7
+                  ? `${t('COMMON.SORT_BY').substring(0, 6)}...`
+                  : t('COMMON.SORT_BY')}
+              </Button>
+            </Grid>
+          </Grid>
+
+          <Box sx={{ background: '#FBF4E4', padding: '20px' }}>
+            <Grid container spacing={2}>
+              {learnerList?.map((member: any) => (
+                <Grid item xs={12} sm={6} md={4} key={member?.userId}>
                   <Box
                     sx={{
-                      px: '10px',
+                      border: `1px solid ${theme?.palette?.warning['A100']}`,
                       display: 'flex',
                       justifyContent: 'space-between',
-                      alignItems: 'center',
-                      padding: '7px',
+                      borderRadius: '8px',
+                      gap: '5px',
+                      background: theme.palette.warning['A400'],
                     }}
+                    onClick={() => handleAssessmentDetails(member?.userId)}
                   >
-                    <Box>
-                      <Box
-                        sx={{
-                          color: theme.palette.warning[300],
-                          fontSize: '16px',
-                          fontWeight: '400',
-                        }}
-                      >
-                        {assessment.studentName}
-                      </Box>
+                    <Box
+                      sx={{
+                        flexBasis: '20%',
+                        background: theme?.palette?.primary?.light,
+                        display: 'flex',
+                        justifyContent: 'center',
+                        alignItems: 'center',
+                        padding: '7px',
+                      }}
+                    >
+                      {/* Todo : replaced with proper flag coming from backend  */}
+
+                      <MemberListItemIcon status={member.status} />
+                    </Box>
+                    <Box sx={{ flexBasis: '80%' }}>
                       <Box
                         sx={{
-                          gap: '4px',
+                          px: '10px',
                           display: 'flex',
+                          justifyContent: 'space-between',
                           alignItems: 'center',
+                          padding: '7px',
                         }}
                       >
-                        <Box
-                          sx={{
-                            color: theme.palette.warning[300],
-                            fontSize: '14px',
-                            fontWeight: '500',
-                            py: '2px',
-                          }}
-                        >
-                          {assessment.progress}
-                        </Box>
-                        {assessment.progress === 'Overall score :' && (
+                        <Box>
                           <Box
                             sx={{
-                              color: theme.palette.success.main,
-                              fontSize: '14px',
-                              fontWeight: '500',
+                              color: theme.palette.warning[300],
+                              fontSize: '16px',
+                              fontWeight: '400',
                             }}
                           >
-                            {assessment.score}%
+                            {member?.name}
                           </Box>
-                        )}
+                          <Box
+                            sx={{
+                              gap: '4px',
+                              display: 'flex',
+                              alignItems: 'center',
+                            }}
+                          >
+                            <ProgressStatus
+                              status={member?.status}
+                              percentage={member?.percentage}
+                            />
+                          </Box>
+                        </Box>
+
+                        <KeyboardArrowRightIcon
+                          sx={{ color: theme.palette.warning[300] }}
+                        />
                       </Box>
                     </Box>
-
-                    <KeyboardArrowRightIcon
-                      sx={{ color: theme.palette.warning[300] }}
-                    />
                   </Box>
-                </Box>
-              </Box>
+                </Grid>
+              ))}
             </Grid>
-          ))}
-        </Grid>
-      </Box>
-      <SortingModal
-        isModalOpen={modalOpen}
-        handleCloseModal={handleCloseModal}
-      // handleSorting={handleSorting}
-      // routeName={pathname}
-      />
+          </Box>
+          <SortingModal
+            isModalOpen={modalOpen}
+            handleCloseModal={handleCloseModal}
+          />
+        </>
+      )}
     </>
   );
 };
diff --git a/src/pages/learner/[userId].tsx b/src/pages/learner/[userId].tsx
index c3a7d8c7..cb4e35af 100644
--- a/src/pages/learner/[userId].tsx
+++ b/src/pages/learner/[userId].tsx
@@ -26,8 +26,8 @@ import {
 } from '@mui/material';
 import { useTheme } from '@mui/material/styles';
 import {
-  AssesmentListService,
-  getDoIdForAssesmentDetails,
+  getAssessmentList,
+  getDoIdForAssessmentDetails,
 } from '@/services/AssesmentService';
 import {
   classesMissedAttendancePercentList,
@@ -454,7 +454,7 @@ const LearnerProfile: React.FC<LearnerProfileProp> = ({
       if (stateName) {
         if (filters) {
           setLoading(true);
-          const searchResults = await getDoIdForAssesmentDetails({ filters });
+          const searchResults = await getDoIdForAssessmentDetails({ filters });
 
           if (searchResults?.responseCode === 'OK') {
             const result = searchResults?.result;
@@ -464,11 +464,11 @@ const LearnerProfile: React.FC<LearnerProfileProp> = ({
               setUniqueDoId(getUniqueDoId);
               testReportDetails(getUniqueDoId);
             } else {
-              console.log('NO Result found from getDoIdForAssesmentDetails ');
+              console.log('NO Result found from getDoIdForAssessmentDetails ');
             }
           }
         } else {
-          console.log('NO Data found from getDoIdForAssesmentDetails ');
+          console.log('NO Data found from getDoIdForAssessmentDetails ');
         }
       } else {
         console.log('NO State Found');
@@ -478,7 +478,7 @@ const LearnerProfile: React.FC<LearnerProfileProp> = ({
       setIsError(true);
       showToastMessage(t('COMMON.SOMETHING_WENT_WRONG'), 'error');
       console.error(
-        'Error fetching getDoIdForAssesmentDetails results:',
+        'Error fetching getDoIdForAssessmentDetails results:',
         error
       );
     } finally {
@@ -504,7 +504,7 @@ const LearnerProfile: React.FC<LearnerProfileProp> = ({
     };
 
     if (do_Id) {
-      const response = await AssesmentListService({
+      const response = await getAssessmentList({
         sort,
         pagination,
         filters,
@@ -527,7 +527,7 @@ const LearnerProfile: React.FC<LearnerProfileProp> = ({
       } else {
         setUniqueDoId('');
         console.log(
-          'AssesmentListService data',
+          'getAssessmentList data',
           response?.response?.statusText
         );
       }
diff --git a/src/services/AssesmentService.ts b/src/services/AssesmentService.ts
index 6c469ce6..f180626f 100644
--- a/src/services/AssesmentService.ts
+++ b/src/services/AssesmentService.ts
@@ -1,26 +1,27 @@
 import {
-  AssessmentListServiceParam,
+  AssessmentListParam,
   GetDoIdServiceParam,
+  IAssessmentStatusOptions,
 } from '@/utils/Interfaces';
 import { post } from './RestClient';
 
-export const AssesmentListService = async ({
+export const getAssessmentList = async ({
   sort,
   pagination,
   filters,
-}: AssessmentListServiceParam): Promise<any> => {
-  const apiUrl: string = `${process.env.NEXT_PUBLIC_TRACKING_API_URL}/tracking-assessment/v1/list`;
+}: AssessmentListParam): Promise<any> => {
+  const apiUrl: string = `${process.env.NEXT_PUBLIC_TRACKING_API_URL}/tracking/v1/list`;
   try {
     const response = await post(apiUrl, { pagination, filters, sort });
     return response?.data;
   } catch (error) {
-    console.error('error in getting Assesment List Service list', error);
+    console.error('error in getting Assessment List Service list', error);
 
     return error;
   }
 };
 
-export const getDoIdForAssesmentDetails = async ({
+export const getDoIdForAssessmentDetails = async ({
   filters,
 }: GetDoIdServiceParam): Promise<any> => {
   const apiUrl: string =
@@ -31,7 +32,7 @@ export const getDoIdForAssesmentDetails = async ({
       filters: {
         program: filters.program,
         se_boards: filters.se_boards,
-        subject: filters.subject,
+        // subject: filters.subject,
         assessment1: filters.assessment1,
       },
     },
@@ -42,7 +43,19 @@ export const getDoIdForAssesmentDetails = async ({
     const response = await post(apiUrl, data);
     return response?.data;
   } catch (error) {
-    console.error('Error in getDoIdForAssesmentDetails Service', error);
+    console.error('Error in getDoIdForAssessmentDetails Service', error);
+    return error;
+  }
+};
+
+export const getAssessmentStatus = async (body: IAssessmentStatusOptions) => {
+  const apiUrl: string = `${process.env.NEXT_PUBLIC_TRACKING_API_URL}/v1/tracking/assessment/search/status`;
+  try {
+    const response = await post(apiUrl, body);
+    return response?.data?.data;
+  } catch (error) {
+    console.error('error in getting Assessment Status Service list', error);
+
     return error;
   }
 };
diff --git a/src/services/MyClassDetailsService.ts b/src/services/MyClassDetailsService.ts
index 422e2ae8..29191022 100644
--- a/src/services/MyClassDetailsService.ts
+++ b/src/services/MyClassDetailsService.ts
@@ -54,9 +54,9 @@ export const getMyCohortMemberList = async ({
   filters,
 }: CohortMemberList): Promise<any> => {
   const studentFilters = {
-    ...filters,
     role: Role.STUDENT,
     status: [Status.DROPOUT, Status.ACTIVE],
+    ...filters,
   };
   return fetchCohortMemberList({ limit, page, filters: studentFilters });
 };
diff --git a/src/utils/Interfaces.ts b/src/utils/Interfaces.ts
index be77af4b..71f8490c 100644
--- a/src/utils/Interfaces.ts
+++ b/src/utils/Interfaces.ts
@@ -239,7 +239,7 @@ export interface MarksObtainedCardProps {
   data: { question: string; mark_obtained: number; totalMarks: number }[];
 }
 
-export interface AssessmentListServiceParam {
+export interface AssessmentListParam {
   filters: {
     userId: string;
   };
@@ -581,4 +581,10 @@ export interface BottomDrawerProps {
   setAnchorEl: React.Dispatch<React.SetStateAction<null | HTMLElement>>;
   anchorEl: null | HTMLElement;
   isMobile: boolean;
+}
+
+export interface IAssessmentStatusOptions {
+  userId: string[],
+  contentId: string[],
+  batchId: string
 }
\ No newline at end of file