Merge branch 'main' into chore/tsc

android/app/build.gradle

@@ -88,8 +88,8 @@ android {
         applicationId 'xyz.getpapillon.app'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 7820
-        versionName "7.8.2"
+        versionCode 7830
+        versionName "7.8.3"
     }
     signingConfigs {
         debug {

ios/Papillon.xcodeproj/project.pbxproj

@@ -453,7 +453,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = xyz.getpapillon.ios;
-				PRODUCT_NAME = Papillon;
+				PRODUCT_NAME = "Papillon";
 				SWIFT_OBJC_BRIDGING_HEADER = "Papillon/Papillon-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -486,7 +486,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = xyz.getpapillon.ios;
-				PRODUCT_NAME = Papillon;
+				PRODUCT_NAME = "Papillon";
 				SWIFT_OBJC_BRIDGING_HEADER = "Papillon/Papillon-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

ios/Papillon/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,38 +1,14 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "Icon-Light-1024x1024.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "Icon-Dark-1024x1024.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "tinted"
-        }
-      ],
-      "filename" : "Icon-Tinted-1024x1024.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
+      "filename": "App-Icon-1024x1024@1x.png",
+      "idiom": "universal",
+      "platform": "ios",
+      "size": "1024x1024"
     }
   ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "version": 1,
+    "author": "expo"
   }
-}
+}

ios/Papillon/Info.plist

@@ -19,7 +19,7 @@
     <key>CFBundlePackageType</key>
     <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
     <key>CFBundleShortVersionString</key>
-    <string>7.8.2</string>
+    <string>7.8.3</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "papillonvex",
-  "version": "7.8.2",
+  "version": "7.8.3",
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
     "start": "expo start",
@@ -12,6 +12,7 @@
   "dependencies": {
     "@birdwingo/react-native-reanimated-graph": "^1.1.3",
     "@candlefinance/app-icon": "^0.4.5",
+    "@howljs/calendar-kit": "^2.2.1",
     "@notifee/react-native": "^7.8.2",
     "@react-native-async-storage/async-storage": "1.23.1",
     "@react-native-community/datetimepicker": "8.0.1",

src/components/Home/AccountSwitcherContextMenu.tsx

@@ -136,8 +136,10 @@ const ContextMenu: React.FC<{
                   key={index}
                   onPress={() => {
                     Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Soft);
-                    switchTo(account).then(() => {
-                      setOpened(false);
+                    setOpened(false);
+
+                    requestAnimationFrame(() => {
+                      switchTo(account);
                     });
                   }}
                   style={({ pressed }) => [

src/consts/DefaultTabs.ts

@@ -63,5 +63,12 @@ export const defaultTabs = [
     description: "Tes compétences et évaluations",
     icon: require("@/../assets/lottie/tab_evaluations.json"),
     enabled: true,
-  }
+  },
+  {
+    tab: "Week",
+    label: "Semaine",
+    description: "Vue avancée de la semaine",
+    icon: require("@/../assets/lottie/tab_calendar.json"),
+    enabled: true,
+  },
 ] as const;

src/router/helpers/types.ts

@@ -87,6 +87,7 @@ export type RouteParameters = {
     autoAdd?: boolean;
   };
   LessonDocument: { lesson: Homework };
+  Week: { outsideNav?: boolean };
 
   Homeworks?: { outsideNav?: boolean };
   HomeworksDocument: { homework: Homework };

src/router/screens/account/index.tsx

@@ -1,5 +1,6 @@
 import createScreen from "@/router/helpers/create-screen";
 import Lessons from "@/views/account/Lessons/Lessons";
+import Week from "@/views/account/Week/Week";
 import Homeworks from "@/views/account/Homeworks/Homeworks";
 import HomeStackScreen from "./home";
 import Menu from "@/views/account/Restaurant/Menu";
@@ -21,6 +22,12 @@ export const screens = [
     tabBarLabel: "Cours",
     tabBarLottie: require("@/../assets/lottie/tab_calendar.json"),
   }),
+  createScreen("Week", Week, {
+    headerTitle: "Semaine",
+    headerShown: false,
+    tabBarLabel: "Semaine",
+    tabBarLottie: require("@/../assets/lottie/tab_calendar.json"),
+  }),
   createScreen("Homeworks", Homeworks, {
     headerTitle: "Devoirs",
     headerShown: false,

src/services/attendance.ts

@@ -33,17 +33,24 @@ export async function updateAttendancePeriodsInCache <T extends Account> (accoun
       break;
     }
     case AccountService.Local: {
-      periods = [
-        {
-          name: "Toutes",
-          startTimestamp: new Date("2021-09-01").getTime(), //not relevant to ED
-          endTimestamp: new Date("2022-06-30").getTime(),
-        },
-      ];
-
-      defaultPeriod = "Toutes";
+      if (account.identityProvider.identifier == "iut-lannion") {
+        const { saveIUTLanPeriods } = await import("./iutlan/grades");
+        const data = await saveIUTLanPeriods(account);
 
-      break;
+        periods = data.periods;
+        defaultPeriod = data.defaultPeriod;
+        break;
+      } else {
+        periods = [
+          {
+            name: "Toutes",
+            startTimestamp: 1609459200,
+            endTimestamp: 1622505600,
+          },
+        ];
+        defaultPeriod = "Toutes";
+        break;
+      }
     }
     case AccountService.Skolengo: {
       const { getPeriod } = await import("./skolengo/data/period");
@@ -86,7 +93,7 @@ export async function updateAttendanceInCache <T extends Account> (account: T, p
     case AccountService.Local: {
       if (account.identityProvider.identifier == "iut-lannion") {
         const { saveIUTLanAttendance } = await import("./iutlan/attendance");
-        const data = await saveIUTLanAttendance(account);
+        const data = await saveIUTLanAttendance(account, periodName);
 
         attendance = {
           delays: data.delays,

src/services/iutlan/attendance.ts

@@ -14,9 +14,12 @@ interface scodocData {
   [key: string]: Array<scodocAbsence>;
 }
 
-export const saveIUTLanAttendance = async (account: LocalAccount): Promise<Attendance> => {
+export const saveIUTLanAttendance = async (
+  account: LocalAccount,
+  periodName: string
+): Promise<Attendance> => {
   try {
-    const scodocData = account.identityProvider.rawData.absences as scodocData;
+    const scodocData = account.serviceData.semestres[periodName].absences as scodocData;
     const allAbsences: Array<Absence> = [];
 
     if (scodocData && Object.keys(scodocData).length > 0) {
@@ -35,7 +38,7 @@ export const saveIUTLanAttendance = async (account: LocalAccount): Promise<Atten
             fromTimestamp: from ? new Date(from).getTime() : 0,
             toTimestamp: to ? new Date(to).getTime() : 0,
             justified: absence.justifie ?? false,
-            hours: (parseInt(absence.fin) - parseInt(absence.debut)) + "h 00",
+            hours: parseInt(absence.fin) - parseInt(absence.debut) + "h 00",
             administrativelyFixed: absence.justifie ?? false,
             reasons: undefined,
           });