chore: merge pull request PapillonApp#326 from tom-theret/timetables/infos

Timetables/infos

Author: Vexcited

package-lock.json

@@ -26,7 +26,7 @@
     "buffer": "^6.0.3",
     "cal-parser": "^1.0.2",
     "date-fns": "^3.6.0",
-    "esup-multi.js": "^1.0.1",
+    "esup-multi.js": "^1.0.2",
     "expo": "^51.0.36",
     "expo-asset": "^10.0.10",
     "expo-auth-session": "~5.5.2",

package.json

@@ -1,5 +1,5 @@
 import type { MultiAccount } from "@/stores/account/types";
-import type { Timetable, TimetableClass} from "../../shared/Timetable";
+import { TimetableClassStatus, type Timetable, type TimetableClass} from "../../shared/Timetable";
 import { weekNumberToDateRange } from "@/utils/epochWeekNumber";
 import type { EventResponse } from "esup-multi.js";
 import { ErrorServiceUnauthenticated } from "@/services/shared/errors";
@@ -11,10 +11,15 @@ const decodeTimetableClass = (c: EventResponse): TimetableClass => ({
   title: c.course.label,
   startTimestamp: new Date(c.startDateTime).getTime(),
   endTimestamp: new Date(c.endDateTime).getTime(),
-  room: c.course.online ? "En ligne" : c.rooms.map((room: any) => room.label).join(", "),
-  teacher: c.teachers.map((teacher: any) => teacher.displayname).join(", "),
+  room: c.rooms.map((room: any) => room.label).join(", ") || void 0,
+  building: c.rooms.map((room: any) => room.building).filter((building: any) => building).join(", ") || void 0,
+  teacher: c.teachers.map((teacher: any) => teacher.displayname).join(", ") || void 0,
+  group: c.groups.map((group: any) => group.label).join(", ") || void 0,
   backgroundColor: c.course.color,
+  status: c.course.online ? TimetableClassStatus.ONLINE : void 0,
+  statusText: c.course.online ? TimetableClassStatus.ONLINE : void 0,
   source: "UPHF",
+  url: c.course.url,
 });
 
 export const getTimetableForWeek = async (account: MultiAccount, weekNumber: number): Promise<Timetable> => {
@@ -30,9 +35,9 @@ export const getTimetableForWeek = async (account: MultiAccount, weekNumber: num
       course: event.course,
       rooms: event.rooms,
       teachers: event.teachers,
-      groups: event.groups
+      groups: event.groups,
     }))
   );
 
-  return await eventsList.map(decodeTimetableClass); // TODO for Papillon team: add the group to the timetable
+  return await eventsList.map(decodeTimetableClass);
 };

src/services/multi/data/timetable.ts

@@ -11,7 +11,7 @@ const decodeTimetableClass = (c: pronote.TimetableClassLesson | pronote.Timetabl
     startTimestamp: c.startDate.getTime(),
     endTimestamp: c.endDate.getTime(),
     additionalNotes: c.notes,
-    backgroundColor: c.backgroundColor
+    backgroundColor: c.backgroundColor,
   };
 
   if (c.is === "lesson") {
@@ -22,6 +22,7 @@ const decodeTimetableClass = (c: pronote.TimetableClassLesson | pronote.Timetabl
       subject: c.subject!.name,
       room: c.classrooms.join(", ") || void 0,
       teacher: c.teacherNames?.join(", ") ?? void 0,
+      group: c.groupNames.join(", ") || void 0,
       status: c.status === "Cours annulé" || c.status === "Prof. absent" || c.status === "Classe absente" || c.status === "Prof./pers. absent" || c.status === "Sortie pédagogique" ? TimetableClassStatus.CANCELED : c.test ? TimetableClassStatus.TEST : void 0,
       statusText: c.test ? "Devoir Surveillé" : c.status,
       ...base

src/services/pronote/timetable.ts

@@ -7,18 +7,22 @@ export interface TimetableClass {
   startTimestamp: number
   endTimestamp: number
   additionalNotes?: string
+  building?: string
   room?: string
   teacher?: string
+  group?: string
   backgroundColor?: string,
   status?: TimetableClassStatus,
   statusText?: string,
   source?: string
+  url?: string
 }
 
 export type Timetable = Array<TimetableClass>;
 
 export enum TimetableClassStatus {
   CANCELED = "Annulé",
   MODIFIED = "Modifié",
+  ONLINE = "En ligne",
   TEST = "ds",
 }

src/services/shared/Timetable.ts

@@ -10,6 +10,7 @@ import {
   ScrollView,
   Text,
   Platform,
+  Linking,
 } from "react-native";
 import { Homework, HomeworkReturnType } from "@/services/shared/Homework";
 import { getSubjectData } from "@/services/shared/Subject";
@@ -18,16 +19,19 @@ import { Screen } from "@/router/helpers/types";
 import { formatDistance } from "date-fns";
 import { fr } from "date-fns/locale";
 import {
+  Building,
   Clock,
   DoorOpen,
   FileText,
   Hourglass,
   Info,
+  LinkIcon,
   PersonStanding,
+  Users,
 } from "lucide-react-native";
 
 import * as WebBrowser from "expo-web-browser";
-import { useTheme } from "@react-navigation/native";
+import { Link, useTheme } from "@react-navigation/native";
 import RenderHTML from "react-native-render-html";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { PapillonModernHeader } from "@/components/Global/PapillonModernHeader";
@@ -134,21 +138,44 @@ const LessonDocument: Screen<"LessonDocument"> = ({ route, navigation }) => {
         },
       ],
     },
+    {
+      title: "Cours en ligne",
+      informations: [
+        {
+          icon: <LinkIcon />,
+          text: "URL du cours",
+          value: lesson.url,
+          enabled: lesson.url != null,
+        },
+      ]
+    },
     {
       title: "Contexte",
       informations: [
+        {
+          icon: <Building />,
+          text: lesson.building?.includes(",") ? "Bâtiments" : "Bâtiment",
+          value: lesson.building,
+          enabled: lesson.building != null,
+        },
         {
           icon: <DoorOpen />,
-          text: "Salle de classe",
+          text: lesson.room?.includes(",") ? "Salles de classe" : "Salle de classe",
           value: lesson.room,
           enabled: lesson.room != null,
         },
         {
           icon: <PersonStanding />,
-          text: "Professeur",
+          text: lesson.teacher?.includes(",") ? "Professeurs" : "Professeur",
           value: lesson.teacher,
           enabled: lesson.teacher != null,
         },
+        {
+          icon: <Users />,
+          text: lesson.group?.includes(",") ? "Groupes" : "Groupe",
+          value: lesson.group,
+          enabled: lesson.group != null
+        },
       ],
     },
     {
@@ -226,7 +253,11 @@ const LessonDocument: Screen<"LessonDocument"> = ({ route, navigation }) => {
                   }
 
                   return (
-                    <NativeItem key={index} icon={item.icon}>
+                    <NativeItem
+                      key={index}
+                      icon={item.icon}
+                      onPress={item.value && item.value.startsWith("http") ? () => Linking.openURL(item.value!) : void 0}
+                    >
                       <NativeText variant="subtitle">{item.text}</NativeText>
                       <NativeText variant="default">{item.value}</NativeText>
                     </NativeItem>