merged develop

lib/state/app/modules/timetable/bloc/timetable_bloc.dart

@@ -48,7 +48,7 @@ class TimetableBloc
   TimetableState fromNothing() {
     final reference = DateTime.now().addDays(2);
     return TimetableState(
-      startDate: _startOfWeek(reference),
+      startDate: reference.mondayOfWeek,
       endDate: _endOfWeek(reference),
     );
   }
@@ -61,7 +61,7 @@ class TimetableBloc
     final stored = TimetableState.fromJson(json);
     final reference = DateTime.now().addDays(2);
     return stored.copyWith(
-      startDate: _startOfWeek(reference),
+      startDate: reference.mondayOfWeek,
       endDate: _endOfWeek(reference),
       accessibleStartDate: null,
       accessibleEndDate: null,
@@ -120,13 +120,15 @@ class TimetableBloc
     final current = innerState ?? fromNothing();
     if (current.startDate == startDate && current.endDate == endDate) return;
     add(Emit((s) => s.copyWith(startDate: startDate, endDate: endDate)));
-    _loadCurrentWeek(startDate, endDate);
-    _prefetchAdjacentWeeks(startDate, endDate);
+    runInSession(() {
+      _loadCurrentWeek(startDate, endDate);
+      _prefetchAdjacentWeeks(startDate, endDate);
+    });
   }
 
   void resetWeek() {
     final reference = DateTime.now().addDays(2);
-    changeWeek(_startOfWeek(reference), _endOfWeek(reference));
+    changeWeek(reference.mondayOfWeek, _endOfWeek(reference));
   }
 
   void refresh() => fetch();
@@ -171,11 +173,7 @@ class TimetableBloc
 
   Future<void> _refreshSubjects() async {
     final subjects = await repo.data.getSubjects(renew: true);
-    add(
-      DataGathered(
-        (s) => s.copyWith(subjects: subjects, dataVersion: s.dataVersion + 1),
-      ),
-    );
+    add(DataGathered((s) => s.withReferenceData(subjects: subjects)));
   }
 
   Future<void> _loadCurrentWeek(
@@ -214,12 +212,11 @@ class TimetableBloc
 
       add(
         Emit(
-          (s) => s.copyWith(
+          (s) => s.withReferenceData(
             rooms: rooms,
             subjects: subjects,
             schoolHolidays: schoolHolidays,
             schoolyear: schoolyear,
-            dataVersion: s.dataVersion + 1,
           ),
         ),
       );
@@ -229,11 +226,7 @@ class TimetableBloc
 
     try {
       final timegrid = await repo.data.getTimegrid(renew: renew);
-      add(
-        Emit(
-          (s) => s.copyWith(timegrid: timegrid, dataVersion: s.dataVersion + 1),
-        ),
-      );
+      add(Emit((s) => s.withReferenceData(timegrid: timegrid)));
     } catch (_) {
       // Timegrid load failure falls back to a hardcoded schedule in the UI layer.
     }
@@ -249,12 +242,7 @@ class TimetableBloc
         renew: renew,
         onError: onError,
       );
-      add(
-        Emit(
-          (s) =>
-              s.copyWith(customEvents: events, dataVersion: s.dataVersion + 1),
-        ),
-      );
+      add(Emit((s) => s.withReferenceData(customEvents: events)));
     } catch (e) {
       onError?.call(e);
     }
@@ -262,11 +250,7 @@ class TimetableBloc
 
   Future<void> _refreshCustomEvents() async {
     final events = await repo.data.getCustomEvents(renew: true);
-    add(
-      DataGathered(
-        (s) => s.copyWith(customEvents: events, dataVersion: s.dataVersion + 1),
-      ),
-    );
+    add(DataGathered((s) => s.withReferenceData(customEvents: events)));
   }
 
   void _prefetchAdjacentWeeks(DateTime start, DateTime end) {
@@ -282,19 +266,7 @@ class TimetableBloc
   }
 
   void _writeWeekToCache(DateTime weekStart, TimetableGetWeekResponse week) {
-    final key = weekStart.weekKey();
-    add(
-      Emit((s) {
-        final updated = Map<String, TimetableGetWeekResponse>.of(s.weekCache);
-        updated[key] = week;
-        return s.copyWith(weekCache: updated, dataVersion: s.dataVersion + 1);
-      }),
-    );
-  }
-
-  static DateTime _startOfWeek(DateTime reference) {
-    final monday = reference.subtractDays(reference.weekday - 1);
-    return DateTime(monday.year, monday.month, monday.day);
+    add(Emit((s) => s.withFetchedWeek(weekStart, week)));
   }
 
   static DateTime _endOfWeek(DateTime reference) {