Merge pull request PapillonApp#154 from Vilerio/fix3

fix: saut d'un cours annulé pour le widget prochain cours
Louis-htmlcss · Sep 5, 2024 · 1e4eb8f · 1e4eb8f
2 parents a639a79 + 57207ed
commit 1e4eb8f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/widgets/Components/NextCourse.tsx b/src/widgets/Components/NextCourse.tsx
@@ -45,12 +45,12 @@ const NextCourseWidget = forwardRef(({ hidden, setHidden, loading, setLoading }:
       let nextCourse = null;
 
       nextCourse = allCourses
-        .filter(c => c.startTimestamp < today && c.endTimestamp > today)
+        .filter(c => c.startTimestamp < today && c.endTimestamp > today && c.status !== "Cours annulé")
         .sort((a, b) => b.endTimestamp - a.endTimestamp)[0];
 
       if (!nextCourse) {
         nextCourse = allCourses
-          .filter(c => c.startTimestamp > today)
+          .filter(c => c.startTimestamp > today && c.status !== "Cours annulé")
           .sort((a, b) => a.startTimestamp - b.startTimestamp)[0];
       }
 
@@ -61,7 +61,7 @@ const NextCourseWidget = forwardRef(({ hidden, setHidden, loading, setLoading }:
 
       setLoading(false);
     }();
-  }, [account.instance, timetables]);
+  }, [account.instance, timetables]);  
 
   return !hidden && (
     <View
@@ -250,4 +250,4 @@ const NextCourseLesson: React.FC<{
   );
 };
 
-export default NextCourseWidget;
+export default NextCourseWidget;