diff --git a/lib/view/pages/timetable/timetable.dart b/lib/view/pages/timetable/timetable.dart index 3709368..0475af6 100644 --- a/lib/view/pages/timetable/timetable.dart +++ b/lib/view/pages/timetable/timetable.dart @@ -246,46 +246,46 @@ class _TimetableState extends State { List _removeDuplicates(TimetableProps data, Duration maxTimeBetweenDouble) { - List timetableList = data.getTimetableResponse.result.toList( ); + List timetableList = data.getTimetableResponse.result.toList(); - if ( timetableList.isEmpty ) return timetableList; + if(timetableList.isEmpty) return timetableList; timetableList.sort((a, b) => _parseWebuntisTimestamp(a.date, a.startTime).compareTo(_parseWebuntisTimestamp(b.date, b.startTime))); GetTimetableResponseObject previousElement = timetableList.first; - for (var i = 1; i < timetableList.length; i++) { + for(var i = 1; i < timetableList.length; i++) { GetTimetableResponseObject currentElement = timetableList.elementAt(i); bool isSameLesson() { int? currentSubjectId = currentElement.su.firstOrNull?.id; int? previousSubjectId = previousElement.su.firstOrNull?.id; - if( currentSubjectId == null || previousSubjectId == null || currentSubjectId != previousSubjectId ) return false; + if(currentSubjectId == null || previousSubjectId == null || currentSubjectId != previousSubjectId) return false; int? currentRoomId = currentElement.ro.firstOrNull?.id; int? previousRoomId = previousElement.ro.firstOrNull?.id; - if( currentRoomId != previousRoomId ) return false; + if(currentRoomId != previousRoomId) return false; int? currentTeacherId = currentElement.te.firstOrNull?.id; int? previousTeacherId = previousElement.te.firstOrNull?.id; - if( currentTeacherId != previousTeacherId ) return false; + if(currentTeacherId != previousTeacherId) return false; String? currentStatusCode = currentElement.code; String? previousStatusCode = previousElement.code; - if( currentStatusCode != previousStatusCode ) return false; + if(currentStatusCode != previousStatusCode) return false; return true; } - bool isNotSeparated() => _parseWebuntisTimestamp( previousElement.date, previousElement.endTime ).add( maxTimeBetweenDouble ) - .isSameOrAfter( _parseWebuntisTimestamp( currentElement.date, currentElement.startTime ) ); + bool isNotSeparated() => _parseWebuntisTimestamp(previousElement.date, previousElement.endTime).add(maxTimeBetweenDouble) + .isSameOrAfter(_parseWebuntisTimestamp(currentElement.date, currentElement.startTime)); - if ( isSameLesson() && isNotSeparated() ) { + if(isSameLesson() && isNotSeparated()) { previousElement.endTime = currentElement.endTime; - timetableList.remove( currentElement ); + timetableList.remove(currentElement); i--; } else { previousElement = currentElement; @@ -297,10 +297,10 @@ class _TimetableState extends State { TimetableEvents _buildTableEvents(TimetableProps data) { - List timetableList = data.getTimetableResponse.result.toList( ); + List timetableList = data.getTimetableResponse.result.toList(); - if( settings.val().timetableSettings.connectDoubleLessons ){ - timetableList = _removeDuplicates( data, const Duration(minutes: 5) ); + if(settings.val().timetableSettings.connectDoubleLessons) { + timetableList = _removeDuplicates(data, const Duration(minutes: 5)); } List appointments = timetableList.map((element) {