Skip to content

Commit 8275d26

Browse files
Complete filter migration cleanup: move filter definitions off PupilProxy, fix naming, remove dead code
- Move static filter lists (schoolGrade, gender, religionCourse, familyLanguage, afterSchoolCare, migrationSupport) from PupilProxy to PupilsFilterImplementation - Delete commented-out authorization_pupils_filter_bottom_sheet.dart (replaced by authorization_pupils_filters_widget.dart) - Rename FilterState.pupilLegacy to FilterState.learningSupport - Fix refreshs() typo to refresh() across 25 files - Rename setTextFilter parameter to shouldRefresh to avoid shadowing
1 parent 998997d commit 8275d26

31 files changed

Lines changed: 78 additions & 298 deletions

File tree

school_data_hub_flutter/lib/common/domain/filters/filters_state_manager.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'package:flutter/foundation.dart';
33

44
enum FilterState {
55
pupil,
6-
pupilLegacy,
6+
learningSupport,
77
attendance,
88
schooldayEvent,
99
schoolList,
@@ -16,7 +16,7 @@ enum FilterState {
1616

1717
const Map<FilterState, bool> _initialFilterGlobalValues = {
1818
FilterState.pupil: false,
19-
FilterState.pupilLegacy: false,
19+
FilterState.learningSupport: false,
2020
FilterState.attendance: false,
2121
FilterState.schooldayEvent: false,
2222
FilterState.schoolList: false,

school_data_hub_flutter/lib/features/_attendance/domain/filters/attendance_pupil_filter.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class AttendancePupilFilterManager implements Resettable {
3434
false) {
3535
return;
3636
}
37-
_pupilsFilter.refreshs();
37+
_pupilsFilter.refresh();
3838
}
3939

4040
void dispose() {
@@ -64,7 +64,7 @@ class AttendancePupilFilterManager implements Resettable {
6464
filterState: FilterState.attendance,
6565
value: !attendanceFilterStateEqualsInitialState,
6666
);
67-
_pupilsFilter.refreshs();
67+
_pupilsFilter.refresh();
6868
}
6969

7070
@override

school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/attendance_list_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class AttendanceListPage extends WatchingWidget {
9292
statsWidget: const AttendanceSearchBarStatsWidget(),
9393
searchType: SearchType.pupil,
9494
hintText: 'Schüler/in suchen',
95-
refreshFunction: pupilsFilter.refreshs,
95+
refreshFunction: pupilsFilter.refresh,
9696
onChanged: (value) =>
9797
pupilsFilter.textFilter.setFilterText(value),
9898
searchTextSource: pupilsFilter.textFilter,

school_data_hub_flutter/lib/features/_attendance/presentation/missed_schooldays_pupil_list_page/missed_schooldays_pupil_list_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class MissedSchooldaysPupilListPage extends StatelessWidget {
3737
),
3838
searchType: SearchType.pupil,
3939
hintText: 'Schüler/in suchen',
40-
refreshFunction: pupilsFilter.refreshs,
40+
refreshFunction: pupilsFilter.refresh,
4141
onChanged: (value) => pupilsFilter.textFilter.setFilterText(value),
4242
searchTextSource: pupilsFilter.textFilter,
4343
filtersActive: di<FiltersStateManager>().filtersActive,

school_data_hub_flutter/lib/features/_authorizations/domain/filters/pupil_authorization_filter_manager.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class PupilAuthorizationFilterManager implements Resettable {
7272
value: !authorizationFilterStateEqualsInitialValues,
7373
);
7474

75-
di<PupilsFilter>().refreshs();
75+
di<PupilsFilter>().refresh();
7676
}
7777

7878
List<PupilAuthorization> applyAuthorizationFiltersToPupilAuthorizations(

school_data_hub_flutter/lib/features/_authorizations/presentation/authorization_pupils_page/authorization_pupils_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class AuthorizationPupilsPage extends WatchingWidget {
6363
),
6464
searchType: SearchType.pupil,
6565
hintText: 'Schüler/in suchen',
66-
refreshFunction: pupilsFilter.refreshs,
66+
refreshFunction: pupilsFilter.refresh,
6767
onChanged: (value) => pupilsFilter.textFilter.setFilterText(value),
6868
searchTextSource: pupilsFilter.textFilter,
6969
filtersActive: filterStateManager.filtersActive,

school_data_hub_flutter/lib/features/_authorizations/presentation/authorization_pupils_page/widgets/authorization_pupils_filter_bottom_sheet.dart

Lines changed: 0 additions & 201 deletions
This file was deleted.

school_data_hub_flutter/lib/features/_pupil/domain/filters/pupil_media_auth_filters.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class PupilMediaAuthFilterManager implements Resettable {
8181
filterState: FilterState.pupil,
8282
value: !filterStateEqualsInitial,
8383
);
84-
_pupilsFilter.refreshs();
84+
_pupilsFilter.refresh();
8585
}
8686

8787
@override

school_data_hub_flutter/lib/features/_pupil/domain/filters/pupils_filter.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ abstract class PupilsFilter implements Listenable, Resettable {
6363

6464
// updates the filtered pupils with current filters
6565
// and sort mode
66-
void refreshs();
66+
void refresh();
6767

6868
void clearFilteredPupils();
6969

@@ -77,6 +77,6 @@ abstract class PupilsFilter implements Listenable, Resettable {
7777
// void setFilterState();
7878
void setSortMode(PupilSortMode sortMode);
7979
void sortPupils();
80-
void setTextFilter(String? text, {bool refresh = true});
80+
void setTextFilter(String? text, {bool shouldRefresh = true});
8181
void populateGroupFilters(List<String> groupIds);
8282
}

0 commit comments

Comments
 (0)