diff --git a/filcnaplo/lib/ui/filter/widgets/grades.dart b/filcnaplo/lib/ui/filter/widgets/grades.dart index 667e58a..95385ac 100644 --- a/filcnaplo/lib/ui/filter/widgets/grades.dart +++ b/filcnaplo/lib/ui/filter/widgets/grades.dart @@ -1,30 +1,42 @@ import 'package:filcnaplo/ui/date_widget.dart'; import 'package:filcnaplo/utils/platform.dart'; import 'package:filcnaplo_kreta_api/models/grade.dart'; -import 'package:filcnaplo_mobile_ui/common/widgets/grade/grade_viewable.dart' as mobile; -import 'package:filcnaplo_mobile_ui/common/widgets/grade/new_grades.dart' as mobile; -import 'package:filcnaplo_desktop_ui/common/widgets/grade/grade_viewable.dart' as desktop; +import 'package:filcnaplo_mobile_ui/common/widgets/grade/grade_viewable.dart' + as mobile; +import 'package:filcnaplo_mobile_ui/common/widgets/grade/new_grades.dart' + as mobile; +import 'package:filcnaplo_desktop_ui/common/widgets/grade/grade_viewable.dart' + as desktop; -List getWidgets(List providerGrades, DateTime? lastSeenDate) { +List getWidgets( + List providerGrades, DateTime? lastSeenDate) { List items = []; for (var grade in providerGrades) { - final surprise = (!(lastSeenDate != null && grade.date.isAfter(lastSeenDate)) || grade.value.value == 0); + final surprise = + (!(lastSeenDate != null && grade.date.isAfter(lastSeenDate)) || + grade.value.value == 0); if (grade.type == GradeType.midYear && surprise) { items.add(DateWidget( key: grade.id, date: grade.date, - widget: PlatformUtils.isMobile ? mobile.GradeViewable(grade) : desktop.GradeViewable(grade), + widget: PlatformUtils.isMobile + ? mobile.GradeViewable(grade) + : desktop.GradeViewable(grade), )); } } return items; } -List getNewWidgets(List providerGrades, DateTime? lastSeenDate) { +List getNewWidgets( + List providerGrades, DateTime? lastSeenDate) { List items = []; List newGrades = []; for (var grade in providerGrades) { - final surprise = !(lastSeenDate != null && !grade.date.isAfter(lastSeenDate)) && grade.value.value != 0; + final surprise = + !(lastSeenDate != null && !grade.date.isAfter(lastSeenDate)) && + grade.value.value != 0 && + grade.value.weight != 0; if (grade.type == GradeType.midYear && surprise) { newGrades.add(grade); }