@olea-bps/views 1.0.3 → 1.0.5

package/TimetableCalendar/index.js

@@ -127,35 +127,44 @@ function TimetableViewCalendar(props) {
   // Unter verwendung von Luxon wird eine Liste der Monatsnamen generiert, dabei wird die eingestellte Sprache berücksichtigt
   const months = moment.months();
 
-  const handleImportButtonPress = async () => {
+  const handleImportButtonPress = () => {
     setLoading(true);
     setErrorMessage('');
     setInfoMessage('');
-    await saveTimetableCode(
+
+    saveTimetableCode(
       // Falls Filter eingestellt sind, werden diese nacheinander auf den Stundenplancode angewendet
       timetableCodeInputPreSaveFilters.reduce(
         (currentTimetableCode, preSaveFilter) => preSaveFilter?.(currentTimetableCode) ?? currentTimetableCode,
         timetableCodeInput
       )
-    );
-    const copyToday = new Date(today);
-    const startDate = new Date(copyToday.setDate(copyToday.getDate() - 30));
-    const endDate = new Date(copyToday.setDate(copyToday.getDate() + 151));
-    await refreshCourses(startDate.toISOString().split('T')[0], endDate.toISOString().split('T')[0])
-      .then(() => {
-        setFormVisible(false);
-        setLoading(false);
-      })
-      .catch((error) => {
-        if (error instanceof TimetableNotFoundError) {
-          setErrorMessage(t('timetable:codeNotFoundError', { timetableCode: timetableCodeInput }));
-          setLoading(false);
-        }
-        else {
-          setErrorMessage(t('timetable:importError'));
-          setLoading(false);
+    )
+        .then(
+            () => {
+              const now = DateTime.now();
+              const startDate = now.startOf('week');
+              const endDate = now.endOf('week');
+              return refreshCourses(startDate.toISODate(), endDate.toISODate())
+                  .then(
+                      () => {
+                        setFormVisible(false);
+                        setLoading(false);
+                      }
+                  );
+            }
+        ).catch(
+        (error) => {
+          if (error instanceof TimetableNotFoundError) {
+            setErrorMessage(t('timetable:codeNotFoundError', { timetableCode: timetableCodeInput }));
+            setLoading(false);
+          } else {
+            console.error(TimetableViewCalendar.name, ':', 'can´t import timetable code', timetableCode, ':', error);
+            setErrorMessage(t('timetable:importError'));
+          }
         }
-      });
+    ).finally(
+        () => setLoading(false)
+    );
   };
 
   useEffect(() => {
@@ -299,18 +308,12 @@ function TimetableViewCalendar(props) {
           <Ionicons name="add-outline" size={40} color="#000" />
         </TouchableOpacity>
       )}
-
-      {
-        selectedEvent
-          ? <CourseDetailDialog
+        <CourseDetailDialog
             course={selectedEvent}
             visible={selectedEvent ? true : false}
             onClose={unsetSelectedEvent}
             onDismiss={unsetSelectedEvent}
-          />
-          : null
-      }
-
+        />
     </SafeAreaView>
   );
 }

package/TimetableList/index.js

@@ -148,7 +148,7 @@ function TimetableViewList(props) {
     [theme]
   )
 
-  const otherCourses = courses?.filter?.(course => course?.times?.some(courseTime => courseTime?.dayOfWeek === 0));
+  const otherCourses = courses?.[undefined] ?? [];
   const activeTabDate = daysTabViewRoutes[daysTabViewActiveRouteIndex]?.date;
   const activeTabWeek = activeTabDate.weekNumber;
 
@@ -165,7 +165,8 @@ function TimetableViewList(props) {
             }
           });
       },
-      [])
+      []
+    )
   )
 
   /*
@@ -231,7 +232,7 @@ function TimetableViewList(props) {
                     inactiveColor={themeStyles.tabs.inactiveColor}
                     indicatorStyle={themeStyles.tabIndicator}
                     tabStyle={{ width: 'auto', paddingHorizontal: 20 }}
-                    renderTabBarItem={({ route, navigationState, ...rest}) =>
+                    renderTabBarItem={({ route, navigationState, ...rest }) =>
                       <TabBarItem
                         {...rest}
                         key={route.key}
@@ -242,7 +243,7 @@ function TimetableViewList(props) {
                         inactiveColor={themeStyles.tabs.inactiveColor}
                         // Die einbindung von moment.js zum Anzeigen des Wochentages sollte langfristig entfernt werden.
                         // Funktioniert die Luxon funktionalität der Wochenanzeige nicht unter iOS datetime.toFormat('ccc')
-                         label={
+                        label={
                           // Generieren das Tab-Textes
                           ({ route }) => {
                             // Datumsobject aus dem Tab holen

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olea-bps/views",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Consolidated views for OLEA",
   "main": "index.js",
   "repository": {