Merge pull request #78 from Rushikesh-Sonawane99/release-1.0.0

Issue #PS-1460 feat: Implemented Attendance tracking of newly added learner on dashboard and attendance history page
tekdi · Aug 2, 2024 · 0871334 · 0871334
2 parents 56c893f + 96c56de
commit 0871334
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/components/MarkBulkAttendance.tsx b/src/components/MarkBulkAttendance.tsx
@@ -139,11 +139,18 @@ const MarkBulkAttendance: React.FC<MarkBulkAttendanceProps> = ({
           });
           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<MarkBulkAttendanceProps> = ({
                           });
                         }
                       });
-                      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
@@ -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 = {