MarianumMobile/Client
5
1
Fork 0
Code Issues 34 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Fixed timetable crashing when query date reaches into holidays

Browse Source
This commit is contained in:
Elias Müller
2023-07-17 12:29:26 +02:00
parent a5b2242dc3
commit 6548ff360a
4 changed files with 130 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/model/timetable/timetableProps.dart
View File

@ -26,7 +26,7 @@ class TimetableProps extends DataHolder {
final _queryWeek = DateTime.now().add(const Duration(days: 2));
late DateTime startDate = getDate(_queryWeek.subtract(Duration(days: _queryWeek.weekday - 1)));
late DateTime endDate = getDate(_queryWeek.add(Duration(days: DateTime.daysPerWeek - _queryWeek.weekday)));
late DateTime endDate = getDate(_queryWeek.add(Duration(days: DateTime.daysPerWeek - _queryWeek.weekday - 2)));
GetTimetableResponse? _getTimetableResponse;
GetTimetableResponse get getTimetableResponse => _getTimetableResponse!;
@ -96,8 +96,8 @@ class TimetableProps extends DataHolder {
properties().forEach((element) => element = null);
error = null;
notifyListeners();
startDate = start.subtract(const Duration(days: 7));
endDate = end.add(const Duration(days: 7));
startDate = start;
endDate = end;
try {
run();
} on WebuntisError catch(e) {

7
lib/view/pages/timetable/timetable.dart
View File

@ -62,9 +62,6 @@ class _TimetableState extends State<Timetable> {
),
body: Consumer<TimetableProps>(
builder: (context, value, child) {
if(value.primaryLoading()) return const LoadingSpinner();
GetHolidaysResponse holidays = value.getHolidaysResponse;
if(value.hasError) {
return PlaceholderView(
@ -79,6 +76,10 @@ class _TimetableState extends State<Timetable> {
);
}
if(value.primaryLoading()) return const LoadingSpinner();
GetHolidaysResponse holidays = value.getHolidaysResponse;
return GestureDetector(
onScaleStart: (details) => baseElementScale = elementScale,
onScaleUpdate: (details) {