Better Home Lessons

src/services/pronote/chats.ts

@@ -56,7 +56,7 @@ export const createDiscussionRecipients = async (account: PronoteAccount): Promi
   const recipientsALL = await Promise.all([
     pronote.EntityKind.Teacher,
     pronote.EntityKind.Personal
-  ].map(kind => pronote.newDiscussionRecipients(account.instance!, user, kind)));
+  ].map(kind => pronote.newDiscussionRecipients(account.instance!, kind)));
 
   const recipients = recipientsALL.flat();
   info("PRONOTE->createDiscussionRecipients(): OK", "pronote");

src/utils/format/holidayEmoji.ts

@@ -0,0 +1,54 @@
+export const getHolidayEmoji = (date: Date = new Date()): string => {
+  const year = date.getFullYear();
+
+  const holidays = [
+    { start: new Date(`${year}-01-01`), end: new Date(`${year}-01-01`), emoji: "🎉" }, // Nouvel An
+    { start: new Date(`${year}-05-01`), end: new Date(`${year}-05-01`), emoji: "🌹" }, // Fête du Travail
+    { start: new Date(`${year}-05-08`), end: new Date(`${year}-05-08`), emoji: "🇫🇷" }, // Armistice 1945
+    { start: new Date(`${year}-07-14`), end: new Date(`${year}-07-14`), emoji: "🎇" }, // Fête Nationale
+    { start: new Date(`${year}-11-01`), end: new Date(`${year}-11-01`), emoji: "🕯️" }, // Toussaint
+    { start: new Date(`${year}-11-11`), end: new Date(`${year}-11-11`), emoji: "🕊️" }, // Armistice
+    { start: new Date(`${year}-12-25`), end: new Date(`${year}-12-25`), emoji: "🎄" }, // Noël
+  ];
+
+  const schoolHolidays = [
+    {
+      start: new Date(`${year}-10-19`),
+      end: new Date(`${year}-11-04`),
+      emoji: "🍂", // Vacances de la Toussaint
+    },
+    {
+      start: new Date(`${year}-12-21`),
+      end: new Date(`${year + 1}-01-06`),
+      emoji: "❄️", // Vacances de Noël
+    },
+    {
+      start: new Date(`${year + 1}-02-08`),
+      end: new Date(`${year + 1}-03-10`),
+      emoji: "⛷️", // Vacances d'hiver 
+    },
+    {
+      start: new Date(`${year + 1}-04-05`),
+      end: new Date(`${year + 1}-04-28`),
+      emoji: "🌸", // Vacances de printemps 
+    },
+    {
+      start: new Date(`${year + 1}-07-05`),
+      end: new Date(`${year + 1}-09-01`),
+      emoji: "🏖️", // Grandes vacances
+    },
+  ];
+
+  // Combine jours fériés et vacances scolaires
+  const allPeriods = [...holidays, ...schoolHolidays];
+
+  // Vérifie si la date donnée se trouve dans l'une des périodes
+  for (const period of allPeriods) {
+    if (date >= period.start && date <= period.end) {
+      return period.emoji;
+    }
+  }
+
+  // Emoji par défaut 
+  return "📚";
+};

src/views/account/Home/Elements/TimetableElement.tsx

@@ -10,12 +10,16 @@ import RedirectButton from "@/components/Home/RedirectButton";
 import { updateTimetableForWeekInCache } from "@/services/timetable";
 import MissingItem from "@/components/Global/MissingItem";
 import { TimetableItem } from "../../Lessons/Atoms/Item";
+import { getHolidayEmoji } from "@/utils/format/holidayEmoji";
+
+
 
 interface TimetableElementProps {
-  onImportance: (value: number) => unknown
+  onImportance: (value: number) => unknown;
 }
 
 const TimetableElement: React.FC<TimetableElementProps> = ({ onImportance }) => {
+  const emoji = getHolidayEmoji();
   const account = useCurrentAccount((store) => store.account!);
   const timetables = useTimetableStore((store) => store.timetables);
 
@@ -57,41 +61,45 @@ const TimetableElement: React.FC<TimetableElementProps> = ({ onImportance }) =>
     );
   };
 
-  const fetchTimetable = async () => {
-    if (!timetables[currentWeekNumber] && account.instance) {
-      setLoading(true);
-      try {
-        await updateTimetableForWeekInCache(account, currentWeekNumber);
-      } finally {
-        setLoading(false);
-      }
-    }
+  const isWeekend = () => {
+    const today = new Date().getDay();
+    return today === 6 || today === 0; // 6 = Saturday, 0 = Sunday
   };
 
+  const isVacation = (courses: TimetableClass[]) =>
+    courses.length === 1 && courses[0].type === "vacation";
+
   const filterAndSortCourses = (weekCourses: TimetableClass[]): TimetableClass[] => {
     const now = Date.now();
     const todayCourses = weekCourses
-      .filter(c => isToday(c.startTimestamp) && c.endTimestamp > now)
+      .filter((c) => isToday(c.startTimestamp) && c.endTimestamp > now)
       .sort((a, b) => a.startTimestamp - b.startTimestamp);
-
     if (todayCourses.length > 0) {
       return todayCourses;
     }
-
     const tomorrowCourses = weekCourses
-      .filter(c => isTomorrow(c.startTimestamp))
+      .filter((c) => isTomorrow(c.startTimestamp))
       .sort((a, b) => a.startTimestamp - b.startTimestamp);
-
     if (tomorrowCourses.length > 0) {
       return tomorrowCourses.slice(0, 3);
     }
-
     return weekCourses
-      .filter(c => c.startTimestamp > now)
+      .filter((c) => c.startTimestamp > now)
       .sort((a, b) => a.startTimestamp - b.startTimestamp)
       .slice(0, 3);
   };
 
+  const fetchTimetable = async () => {
+    if (!timetables[currentWeekNumber] && account.instance) {
+      setLoading(true);
+      try {
+        await updateTimetableForWeekInCache(account, currentWeekNumber);
+      } finally {
+        setLoading(false);
+      }
+    }
+  };
+
   const updateNextCourses = () => {
     if (!account.instance || !timetables[currentWeekNumber]) {
       return;
@@ -134,6 +142,44 @@ const TimetableElement: React.FC<TimetableElementProps> = ({ onImportance }) =>
     );
   }
 
+  if (isWeekend()) {
+    return (
+      <NativeList
+        animated
+        key="weekend"
+        entering={FadeInDown.springify().mass(1).damping(20).stiffness(300)}
+        exiting={FadeOut.duration(300)}
+      >
+        <NativeItem animated style={{ paddingVertical: 10 }}>
+          <MissingItem
+            emoji="🌴"
+            title="C'est le week-end !"
+            description="Profitez de votre week-end, il n'y a pas de cours aujourd'hui."
+          />
+        </NativeItem>
+      </NativeList>
+    );
+  }
+
+  if (isVacation(nextCourses)) {
+    return (
+      <NativeList
+        animated
+        key="vacation"
+        entering={FadeInDown.springify().mass(1).damping(20).stiffness(300)}
+        exiting={FadeOut.duration(300)}
+      >
+        <NativeItem animated style={{ paddingVertical: 10 }}>
+          <MissingItem
+            emoji={emoji}
+            title="C'est les vacances !"
+            description="Profitez de vos vacances, à bientôt."
+          />
+        </NativeItem>
+      </NativeList>
+    );
+  }
+
   if (hidden || nextCourses.length === 0) {
     return (
       <NativeList
@@ -156,8 +202,8 @@ const TimetableElement: React.FC<TimetableElementProps> = ({ onImportance }) =>
   const label = isToday(nextCourses[0].startTimestamp)
     ? "Emploi du temps"
     : isTomorrow(nextCourses[0].startTimestamp)
-      ? "Cours de demain"
-      : "Prochains cours";
+    ? "Cours de demain"
+    : "Prochains cours";
 
   return (
     <>
@@ -166,10 +212,7 @@ const TimetableElement: React.FC<TimetableElementProps> = ({ onImportance }) =>
         label={label}
         trailing={<RedirectButton navigation={PapillonNavigation.current} redirect="Lessons" />}
       />
-      <Reanimated.View
-        layout={LinearTransition}
-        style={{ marginTop: 24, gap: 10 }}
-      >
+      <Reanimated.View layout={LinearTransition} style={{ marginTop: 24, gap: 10 }}>
         {nextCourses.map((course, index) => (
           <React.Fragment key={course.id || index}>
             <TimetableItem item={course} index={index} small />

src/views/account/Lessons/Atoms/Page.tsx

@@ -17,6 +17,9 @@ import { Timetable, TimetableClass } from "@/services/shared/Timetable";
 import { animPapillon } from "@/utils/ui/animations";
 import LessonsLoading from "./Loading";
 import MissingItem from "@/components/Global/MissingItem";
+import { getHolidayEmoji } from "@/utils/format/holidayEmoji";
+
+const emoji = getHolidayEmoji();
 
 const RefreshControl = createNativeWrapper(RNRefreshControl, {
   disallowInterruption: true,
@@ -120,7 +123,7 @@ export const Page = ({ day, date, current, paddingTop, refreshAction, loading, w
       )}
 
       {day.length === 1 && current && !loading && (day[0].type === "vacation" ? <MissingItem
-        emoji="🏝️"
+        emoji={emoji}
         title="C'est les vacances !"
         description="Profitez de vos vacances, à bientôt."
         entering={animPapillon(FadeInDown)}