Beta 6.6.5

App.tsx

@@ -15,6 +15,10 @@ import FlashMessage from 'react-native-flash-message';
 startNetworkLogging();
 const provider = new IndexDataInstance();
 
+import {
+  BottomSheetModalProvider,
+} from '@gorhom/bottom-sheet';
+
 function App() {
   const [loggedIn, setLoggedIn] = useState(false);
   const [loading, setLoading] = useState(true);
@@ -93,18 +97,20 @@ function App() {
   return (
     <View style={{ flex: 1 }}>
       <AppContextProvider state={ctxValue}>
-        <Stack.Navigator>
-          {loading ? (
-            <Stack.Screen name="Loading" component={LoadingScreen} options={{ headerShown: false }} />
-          ) : loggedIn ? (
-            <Stack.Screen name="AppStack" component={AppStack} options={{ headerShown: false, animation: 'fade', animationDuration: 150 }} />
-          ) : (
-            <Stack.Screen name="AuthStack" component={AuthStack} options={{ headerShown: false }} />
-          )}
-          {AltScreens.map((screen, index) => (
-            <Stack.Screen key={index} name={screen.name} component={screen.component} options={screen.options} />
-          ))}
-        </Stack.Navigator>
+        <BottomSheetModalProvider>
+          <Stack.Navigator>
+            {loading ? (
+              <Stack.Screen name="Loading" component={LoadingScreen} options={{ headerShown: false }} />
+            ) : loggedIn ? (
+              <Stack.Screen name="AppStack" component={AppStack} options={{ headerShown: false, animation: 'fade', animationDuration: 150 }} />
+            ) : (
+              <Stack.Screen name="AuthStack" component={AuthStack} options={{ headerShown: false }} />
+            )}
+            {AltScreens.map((screen, index) => (
+              <Stack.Screen key={index} name={screen.name} component={screen.component} options={screen.options} />
+            ))}
+          </Stack.Navigator>
+        </BottomSheetModalProvider>
       </AppContextProvider>
       <FlashMessage position="top" />
     </View>

android/app/src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
       <data android:scheme="https"/>
     </intent>
   </queries>
-  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme">
+  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:requestLegacyExternalStorage="true">
     <meta-data android:name="expo.modules.notifications.default_notification_icon" android:resource="@drawable/notification_icon"/>
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
     <meta-data android:name="expo.modules.updates.EXPO_SDK_VERSION" android:value="49.0.0"/>

fetch/EcoleDirecteData/cloud.ts

@@ -0,0 +1,60 @@
+import AsyncStorage from '@react-native-async-storage/async-storage';
+
+import { AsyncStorageEcoleDirecteKeys } from './connector';
+import { EDCore } from '@papillonapp/ed-core';
+
+import type { cloudResFolder } from '@papillonapp/ed-core/dist/src/types/v3';
+
+interface CachedED_Cloud {
+    root_folder: cloudResFolder[],
+    timestamp: number
+}
+
+export const EDCloudHandler = async (instance?: EDCore, force = false): Promise<cloudResFolder[] | null> => {
+
+  const cache = await AsyncStorage.getItem(AsyncStorageEcoleDirecteKeys.CACHE_CLOUD);
+  const now = Date.now();
+
+
+  if (cache && !force) {
+    const data: CachedED_Cloud = JSON.parse(cache);
+
+    const userCacheDate = new Date(data.timestamp);
+    const today = new Date();
+
+    userCacheDate.setHours(0, 0, 0, 0);
+    today.setHours(0, 0, 0, 0);
+
+    if (userCacheDate.getTime() === today.getTime()) {
+      return data.root_folder;
+    }
+
+    await AsyncStorage.removeItem(AsyncStorageEcoleDirecteKeys.CACHE_CLOUD);
+    return EDCloudHandler(instance, true);
+  }
+
+  if (!instance) return null;
+
+  try {
+
+    const cloudFromED = await instance.cloud.fetch();
+
+
+    let cachedCloud: CachedED_Cloud = {
+      timestamp: now,
+      root_folder: cloudFromED
+    };
+    if (cache) cachedCloud = JSON.parse(cache);
+
+    await AsyncStorage.setItem(AsyncStorageEcoleDirecteKeys.CACHE_CLOUD, JSON.stringify(cachedCloud));
+    return cloudFromED;
+
+  }
+  catch (error) {
+    if (!cache) return null;
+    const data: CachedED_Cloud = JSON.parse(cache);
+
+    console.info('[ecoledirecte/cloud]: network failed, recover with cache');
+    return data.root_folder;
+  }
+};

fetch/EcoleDirecteData/connector.ts

@@ -1,59 +1,57 @@
-import { EDCore } from "@papillonapp/ed-core";
-import AsyncStorage from "@react-native-async-storage/async-storage";
+import { EDCore } from '@papillonapp/ed-core';
+import AsyncStorage from '@react-native-async-storage/async-storage';
 
 export const AsyncStorageEcoleDirecteKeys = {
-    TOKEN: 'ecoledirecte:token',
-    DEVICE_UUID: 'ecoledirecte:device_uuid',
-    USERNAME: 'ecoledirecte:username',
-    ACCESS_TOKEN: 'ecoledirecte:access_token',
-
-    CACHE_GRADES: 'ecoledirecte:cache_grades',
-    CACHE_USER: 'ecoledirecte:cache_user',
-    CACHE_TIMETABLE: 'ecoledirecte:cache_timetable',
-    CACHE_HOMEWORK: 'ecoledirecte:cache_homework',
-    CACHE_VIE_SCOLAIRE: 'ecoledirecte:cache_vie_scolaire',
+  TOKEN: 'ecoledirecte:token',
+  DEVICE_UUID: 'ecoledirecte:device_uuid',
+  USERNAME: 'ecoledirecte:username',
+  ACCESS_TOKEN: 'ecoledirecte:access_token',
+
+  CACHE_GRADES: 'ecoledirecte:cache_grades',
+  CACHE_USER: 'ecoledirecte:cache_user',
+  CACHE_TIMETABLE: 'ecoledirecte:cache_timetable',
+  CACHE_HOMEWORK: 'ecoledirecte:cache_homework',
+  CACHE_VIE_SCOLAIRE: 'ecoledirecte:cache_vie_scolaire',
+  CACHE_DOCUMENTS: 'ecoledirecte:cache_documents',
+  CACHE_CLOUD: 'ecoledirecte:cache_cloud',
 };
 
 export const removeEcoleDirecteConnector = async () => {
-    await AsyncStorage.multiRemove(Object.values(AsyncStorageEcoleDirecteKeys));
-    await AsyncStorage.removeItem('service');
-  };
+  await AsyncStorage.multiRemove(Object.values(AsyncStorageEcoleDirecteKeys));
+  await AsyncStorage.removeItem('service');
+};
 
 export async function loadEcoleDirecteConnector() {
-    let ed = new EDCore();
-    const values = await AsyncStorage.multiGet([
-        AsyncStorageEcoleDirecteKeys.ACCESS_TOKEN,
-        AsyncStorageEcoleDirecteKeys.USERNAME,
-        AsyncStorageEcoleDirecteKeys.DEVICE_UUID,
-    ]);
-
-    const access_token = values[0][1];
-    const username = values[1][1];
-    const uuid = values[2][1];
-
-    if (!access_token || !username || !uuid) {
-        console.warn('loadEcoleDirecteConnector: information are outdated, logging out...');
-        await removeEcoleDirecteConnector();
-        return null;
-      }
-
-
-
-    try {
-      await ed.auth.renewToken(username, uuid, access_token);
-
-      if(ed._token) await AsyncStorage.setItem(AsyncStorageEcoleDirecteKeys.TOKEN, ed._token);
-
-      return ed;
+  let ed = new EDCore();
+  const values = await AsyncStorage.multiGet([
+    AsyncStorageEcoleDirecteKeys.ACCESS_TOKEN,
+    AsyncStorageEcoleDirecteKeys.USERNAME,
+    AsyncStorageEcoleDirecteKeys.DEVICE_UUID,
+  ]);
+
+  const access_token = values[0][1];
+  const username = values[1][1];
+  const uuid = values[2][1];
+
+  if (!access_token || !username || !uuid) {
+    console.warn('loadEcoleDirecteConnector: information are outdated, logging out...');
+    await removeEcoleDirecteConnector();
+    return null;
+  }
+
+  try {
+    await ed.auth.renewToken(username, uuid, access_token);
+
+    if(ed._token) await AsyncStorage.setItem(AsyncStorageEcoleDirecteKeys.TOKEN, ed._token);
+
+    return ed;
+  } catch (error) {
+    if (error instanceof Error) {
+      console.error('loadEcoleDirecteConnector: to handle', error);
+      return null;
     }
 
-    catch (error) {
-      if (error instanceof Error) {
-        console.error('loadEcoleDirecteConnector: to handle', error); 
-        return null;
-      }
-
-      console.error('loadEcoleDirecteConnector: Unknown error.', error);
-      throw error;
-    }
-}
+    console.error('loadEcoleDirecteConnector: Unknown error.', error);
+    throw error;
+  }
+}

fetch/EcoleDirecteData/documents.ts

@@ -0,0 +1,62 @@
+import AsyncStorage from '@react-native-async-storage/async-storage';
+import type { CachedPapillonTimetable, PapillonLesson } from '../types/timetable';
+import { dateToFrenchFormat } from '../../utils/dates';
+
+import { AsyncStorageEcoleDirecteKeys } from './connector';
+import { EDCore } from '@papillonapp/ed-core';
+
+import type { studentDocsResData } from '@papillonapp/ed-core/dist/src/types/v3';
+
+
+interface CachedED_Documents {
+    documents: studentDocsResData,
+    timestamp: number
+}
+
+export const EDDocumentsHandler = async (instance?: EDCore, force = false): Promise<studentDocsResData | null> => {
+
+  const cache = await AsyncStorage.getItem(AsyncStorageEcoleDirecteKeys.CACHE_DOCUMENTS);
+  const now = Date.now();
+
+
+  if (cache && !force) {
+    const data: CachedED_Documents = JSON.parse(cache);
+
+    const userCacheDate = new Date(data.timestamp);
+    const today = new Date();
+
+    userCacheDate.setHours(0, 0, 0, 0);
+    today.setHours(0, 0, 0, 0);
+
+    if (userCacheDate.getTime() === today.getTime()) {
+      return data.documents;
+    }
+
+    await AsyncStorage.removeItem(AsyncStorageEcoleDirecteKeys.CACHE_DOCUMENTS);
+    return EDDocumentsHandler(instance, true);
+  }
+
+  if (!instance) return null;
+
+  try {
+
+    const documentsFromED = await instance.documents.fetch();
+
+
+    let cachedDocuments: CachedED_Documents = {
+        timestamp: now,
+        documents: documentsFromED,
+      };
+    if (cache) cachedDocuments = JSON.parse(cache);
+
+    await AsyncStorage.setItem(AsyncStorageEcoleDirecteKeys.CACHE_DOCUMENTS, JSON.stringify(cachedDocuments));
+    return documentsFromED;
+  }
+  catch (error) {
+    if (!cache) return null;
+    const data: CachedED_Documents = JSON.parse(cache);
+
+    console.info('[ecoledirecte/documents]: network failed, recover with cache');
+    return data.documents;
+  }
+};

fetch/EcoleDirecteData/evaluations.ts

@@ -0,0 +1,56 @@
+import { EDCore } from '@papillonapp/ed-core';
+import {gradesResData} from '@papillonapp/ed-core/dist/src/types/v3';
+import type {PapillonEvaluation, PapillonEvaluationAcquisition} from '../types/evaluations';
+
+export const EDEvaluationsHandler = async (period: string, force = false, instance?: EDCore): Promise<PapillonEvaluation[]> => {
+
+  // TODO cache
+
+  try {
+    if (!instance) throw new Error('No instance available.');
+
+
+    const gradesData: gradesResData = await instance.grades.fetch();
+    const data: PapillonEvaluation[] = [];
+
+    for (const gradeObject of gradesData.notes) {
+      if (gradeObject.codePeriode != period) continue;
+      const acquisitions: PapillonEvaluationAcquisition[] = [];
+      for (const skill of gradeObject.elementsProgramme) {
+        acquisitions.push({
+          id: skill.idCompetence.toString(),
+          name: skill.libelleCompetence,
+          // TODO correctly fill coef
+          coefficient: 0,
+          abbreviation: skill.libelleCompetence,
+          level: skill.valeur,
+        });
+      }
+      data.push({
+        // TODO add id
+        id: '',
+        subject: {
+          id: gradeObject.codeMatiere,
+          name: gradeObject.libelleMatiere,
+          // TODO, pas cette option sur ED ?
+          groups: false
+        },
+        name: gradeObject.typeDevoir,
+        description: gradeObject.devoir,
+        // TODO
+        teacher: '',
+        // TODO La date faut la mettre en number, quel format ?
+        // date: gradeObject.dateSaisie,
+        date: 0,
+        // TODO
+        paliers: [],
+        coefficient: parseInt(gradeObject.coef),
+        acquisitions
+      });
+    }
+    return data;
+  }
+  catch {
+    return [];
+  }
+};