diff --git a/src/components/MarkBulkAttendance.tsx b/src/components/MarkBulkAttendance.tsx index b10052d91..728f48ce1 100644 --- a/src/components/MarkBulkAttendance.tsx +++ b/src/components/MarkBulkAttendance.tsx @@ -139,11 +139,18 @@ const MarkBulkAttendance: React.FC = ({ }); const resp = response?.result?.userDetails; if (resp) { - const nameUserIdArray = resp?.map((entry: any) => ({ - userId: entry.userId, - name: toPascalCase(entry.name), - memberStatus: entry.status, - })); + let nameUserIdArray = resp + .map((entry: any) => ({ + userId: entry.userId, + name: toPascalCase(entry.name), + memberStatus: entry.status, + createdAt: entry.createdAt, + })) + .filter((member: { createdAt: string | number | Date }) => { + const createdAt = new Date(member.createdAt); + return createdAt <= selectedDate; + }); + if (nameUserIdArray && selectedDate) { const formatSelectedDate = shortDateFormat(selectedDate); const userAttendanceStatusList = async () => { @@ -227,7 +234,7 @@ const MarkBulkAttendance: React.FC = ({ }); } }); - if (newArray.length != 0) { + if (newArray.length !== 0) { setNumberOfCohortMembers(newArray?.length); setCohortMemberList(newArray); const hasDropout = newArray.some( diff --git a/src/pages/attendance-history.tsx b/src/pages/attendance-history.tsx index 1f636b660..1bae5d92e 100644 --- a/src/pages/attendance-history.tsx +++ b/src/pages/attendance-history.tsx @@ -184,8 +184,12 @@ const UserAttendanceHistory = () => { const nameUserIdArray = resp?.map((entry: any) => ({ userId: entry.userId, name: toPascalCase(entry.name), - memberStatus: entry.status, - })); + memberStatus: entry.status,createdAt: entry.createdAt, + })) + .filter((member: { createdAt: string | number | Date }) => { + const createdAt = new Date(member.createdAt); + return createdAt <= selectedDate; + }); if (nameUserIdArray && (selectedDate || currentDate)) { const userAttendanceStatusList = async () => { const attendanceStatusData: AttendanceStatusListProps = {