🐛 fix bug related to selection when teacher is selecting attendance

breatheco-de · Aug 28, 2024 · b6f1c38 · b6f1c38
1 parent ab13814
commit b6f1c38
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 32 deletions.
diff --git a/src/common/components/AttendanceModal/index.jsx b/src/common/components/AttendanceModal/index.jsx
@@ -72,11 +72,7 @@ function AttendanceModal({
   useEffect(() => {
     // Mark checkboxes with attendanceStudents {user.id}
     if (attendanceTaken?.attendanceStudents) {
-      let checkedStudents = attendanceTaken?.attendanceStudents.map((student) => String(student.user.id));
-      // If user is currently changing something prioritize the changes instead of data coming from db
-      const studentsBeforeRefresh = JSON.parse(localStorage.getItem('students_checked_status')) || [];
-      //if user have not edited anything at all, use the data from the db
-      if (studentsBeforeRefresh?.length > 0) checkedStudents = studentsBeforeRefresh;
+      const checkedStudents = attendanceTaken?.attendanceStudents.map((student) => String(student.user.id));
 
       setChecked(checkedStudents);
       if (autoSelect) {
@@ -219,19 +215,6 @@ function AttendanceModal({
     }
   }, [attendanceList, students, currModuleData, day]);
 
-  useEffect(() => {
-    // if user is currently editing save the changes until it closes the modal
-    const currentChecked = students?.filter((item) => checked.includes(String(item.user.id))).map((item) => String(item.user.id));
-    localStorage.setItem('students_checked_status', JSON.stringify(currentChecked));
-  }, [checked]);
-
-  useEffect(() => {
-    // if user change day or module, discart changes
-    localStorage.clear('students_checked_id', JSON.stringify(checked));
-  }, [currModuleData, day]);
-
-  console.log(JSON.parse(localStorage.getItem('students_checked_status')) || []);
-
   return (
     <Modal isOpen={isOpen} onClose={onClose}>
       <ModalOverlay />

diff --git a/src/common/components/LiveEvent/index.jsx b/src/common/components/LiveEvent/index.jsx
@@ -233,15 +233,16 @@ function LiveEvent({
 
   useEffect(() => {
     let intervalVar;
-    // applyFilters();
     updateTimes();
 
-    setTimeout(() => {
+    const timeoutId = setTimeout(() => {
       updateTimes();
-      intervalVar = setInterval(updateTimes(), 60 * 1000);
+      intervalVar = setInterval(updateTimes, 60 * 1000);
     }, secondsToNextMinute * 1000);
+
     return () => {
       clearInterval(intervalVar);
+      clearTimeout(timeoutId);
     };
   }, [mainClasses, otherEvents]);
 

diff --git a/src/pages/cohort/[cohortSlug]/[slug]/[version]/index.jsx b/src/pages/cohort/[cohortSlug]/[slug]/[version]/index.jsx
@@ -35,7 +35,6 @@ import {
   includesToLowerCase,
   getStorageItem,
   sortToNearestTodayDate,
-  syncInterval,
   getBrowserSize,
   calculateDifferenceDays,
   adjustNumberBeetwenMinMax,
@@ -266,16 +265,6 @@ function Dashboard() {
           },
         });
       });
-    syncInterval(() => {
-      setLiveClasses((prev) => {
-        const validatedEventList = prev?.length > 0
-          ? prev?.filter((l) => isValidDate(l?.starting_at) && isValidDate(l?.ending_at))
-          : [];
-        const sortDateToLiveClass = sortToNearestTodayDate(validatedEventList, TwelveHours);
-        const existentLiveClasses = sortDateToLiveClass?.filter((l) => l?.hash && l?.starting_at && l?.ending_at);
-        return existentLiveClasses;
-      });
-    });
   }, []);
 
   // Fetch cohort data with pathName structure