client: refactor, implement school list filter, added competence checks count in learning searchbar info

dabblingwithcode · dabblingwithcode · commit 31932129b172 · 2026-02-22T13:32:41.000+01:00
diff --git a/school_data_hub_flutter/lib/common/widgets/buttons_switches/custom_checkbox_either_or.dart b/school_data_hub_flutter/lib/common/widgets/buttons_switches/custom_checkbox_either_or.dart
diff --git a/school_data_hub_flutter/lib/common/widgets/buttons_switches/generic_async_action_button.dart b/school_data_hub_flutter/lib/common/widgets/buttons_switches/generic_async_action_button.dart
diff --git a/school_data_hub_flutter/lib/common/widgets/buttons_switches/media_capture_buttons.dart b/school_data_hub_flutter/lib/common/widgets/buttons_switches/media_capture_buttons.dart
diff --git a/school_data_hub_flutter/lib/common/widgets/buttons_switches/round_button_switch.dart b/school_data_hub_flutter/lib/common/widgets/buttons_switches/round_button_switch.dart
@@ -0,0 +1,72 @@
+import 'package:flutter/material.dart';
+
+/// A reusable round button that behaves like a switch with active/inactive states.
+///
+/// Displays an icon in a circular container with different colors based on
+/// the [isActive] state. Supports both tap and long press interactions.
+class RoundButtonSwitch extends StatelessWidget {
+  const RoundButtonSwitch({
+    super.key,
+    required this.icon,
+    required this.isActive,
+    required this.onTap,
+    this.onLongPress,
+    required this.activeBackgroundColor,
+    required this.inactiveBackgroundColor,
+    required this.activeIconColor,
+    required this.inactiveIconColor,
+    this.iconSize = 16,
+    this.padding = const EdgeInsets.all(8),
+  });
+
+  /// The icon to display in the button.
+  final IconData icon;
+
+  /// Whether the button is in active state.
+  final bool isActive;
+
+  /// Callback executed when the button is tapped.
+  final VoidCallback onTap;
+
+  /// Optional callback executed when the button is long pressed.
+  final VoidCallback? onLongPress;
+
+  /// Background color when the button is active.
+  final Color activeBackgroundColor;
+
+  /// Background color when the button is inactive.
+  final Color inactiveBackgroundColor;
+
+  /// Icon color when the button is active.
+  final Color activeIconColor;
+
+  /// Icon color when the button is inactive.
+  final Color inactiveIconColor;
+
+  /// Size of the icon. Defaults to 16.
+  final double iconSize;
+
+  /// Padding inside the button. Defaults to EdgeInsets.all(8).
+  final EdgeInsets padding;
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      onLongPress: onLongPress,
+      borderRadius: BorderRadius.circular(50),
+      child: Container(
+        padding: padding,
+        decoration: BoxDecoration(
+          color: isActive ? activeBackgroundColor : inactiveBackgroundColor,
+          shape: BoxShape.circle,
+        ),
+        child: Icon(
+          icon,
+          size: iconSize,
+          color: isActive ? activeIconColor : inactiveIconColor,
+        ),
+      ),
+    );
+  }
+}
diff --git a/school_data_hub_flutter/lib/common/widgets/hub_document/hub_documents_section.dart b/school_data_hub_flutter/lib/common/widgets/hub_document/hub_documents_section.dart
@@ -9,7 +9,7 @@ import 'package:school_data_hub_flutter/common/services/notification_service.dar
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/hub_document/encrypted_document_image.dart';
-import 'package:school_data_hub_flutter/common/widgets/media_capture_buttons.dart';
+import 'package:school_data_hub_flutter/common/widgets/buttons_switches/media_capture_buttons.dart';
 import 'package:school_data_hub_flutter/core/auth/auth_clearance_helper.dart';
 import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 
diff --git a/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupil_card.dart b/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupil_card.dart
@@ -5,7 +5,7 @@ import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
-import 'package:school_data_hub_flutter/common/widgets/custom_checkbox_either_or.dart';
+import 'package:school_data_hub_flutter/common/widgets/buttons_switches/custom_checkbox_either_or.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/hub_document/encrypted_document_image.dart';
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/pupil_list_learning_page/widgets/pupil_list_learning_search_bar/_pupil_list_learning_search_bar.dart b/school_data_hub_flutter/lib/features/learning/presentation/pupil_list_learning_page/widgets/pupil_list_learning_search_bar/_pupil_list_learning_search_bar.dart
@@ -8,7 +8,6 @@ import 'package:school_data_hub_flutter/features/learning/presentation/pupil_lis
 import 'package:school_data_hub_flutter/features/learning/presentation/pupil_list_learning_page/widgets/pupil_list_learning_search_bar/learning_goals_infos.dart';
 import 'package:school_data_hub_flutter/features/learning/presentation/pupil_list_learning_page/widgets/pupil_list_learning_search_bar/pupil_book_lendings_infos.dart';
 import 'package:school_data_hub_flutter/features/learning/presentation/pupil_list_learning_page/widgets/pupil_list_learning_search_bar/pupil_workbooks_infos.dart';
-import 'package:school_data_hub_flutter/features/learning_support/domain/learning_support_helper.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_filter_bottom_sheet.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/pupil_search_text_field.dart';
@@ -88,6 +87,14 @@ class PupilListLearningSearchBarInfos extends WatchingWidget {
 
     switch (selectedContent) {
       case SelectedContent.competenceStatuses:
+        // Calculate total competence checks across all filtered pupils
+        int totalCompetenceChecks = 0;
+        for (final pupil in pupils) {
+          if (pupil.competenceChecks != null) {
+            totalCompetenceChecks += pupil.competenceChecks!.length;
+          }
+        }
+
         return Row(
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
@@ -107,36 +114,8 @@ class PupilListLearningSearchBarInfos extends WatchingWidget {
               style: TextStyle(color: Colors.black, fontSize: 13),
             ),
             const Gap(5),
-            const Text(
-              'Platzhalter',
-              style: TextStyle(
-                color: Colors.black,
-                fontWeight: FontWeight.bold,
-                fontSize: 20,
-              ),
-            ),
-            const Gap(15),
-            const Text(
-              '2: ',
-              style: TextStyle(color: Colors.black, fontSize: 13),
-            ),
-            const Gap(5),
-            Text(
-              (LearningSupportHelper.developmentPlan2Pupils(pupils)).toString(),
-              style: const TextStyle(
-                color: Colors.black,
-                fontWeight: FontWeight.bold,
-                fontSize: 20,
-              ),
-            ),
-            const Gap(15),
-            const Text(
-              '3: ',
-              style: TextStyle(color: Colors.black, fontSize: 13),
-            ),
-            const Gap(5),
             Text(
-              (LearningSupportHelper.developmentPlan3Pupils(pupils)).toString(),
+              totalCompetenceChecks.toString(),
               style: const TextStyle(
                 color: Colors.black,
                 fontWeight: FontWeight.bold,
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_content_authorization_entry_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_content_authorization_entry_card.dart
@@ -5,7 +5,7 @@ import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
-import 'package:school_data_hub_flutter/common/widgets/custom_checkbox_either_or.dart';
+import 'package:school_data_hub_flutter/common/widgets/buttons_switches/custom_checkbox_either_or.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/hub_document/encrypted_document_image.dart';
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/widgets/pupil_profile_school_list_pupil_entry_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/widgets/pupil_profile_school_list_pupil_entry_card.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
-import 'package:school_data_hub_flutter/common/widgets/custom_checkbox_either_or.dart';
+import 'package:school_data_hub_flutter/common/widgets/buttons_switches/custom_checkbox_either_or.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/features/school_lists/domain/models/pupil_list_entry_proxy.dart';
diff --git a/school_data_hub_flutter/lib/features/school_lists/domain/filters/school_list_filter_enums.dart b/school_data_hub_flutter/lib/features/school_lists/domain/filters/school_list_filter_enums.dart
@@ -0,0 +1,7 @@
+enum SchoolListFilter { publicLists, myLists, otherLists }
+
+Map<SchoolListFilter, bool> initialSchoolListFilterValues = {
+  SchoolListFilter.publicLists: false,
+  SchoolListFilter.myLists: false,
+  SchoolListFilter.otherLists: false,
+};
diff --git a/school_data_hub_flutter/lib/features/school_lists/domain/filters/school_list_filter_manager.dart b/school_data_hub_flutter/lib/features/school_lists/domain/filters/school_list_filter_manager.dart
@@ -2,24 +2,35 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_it/flutter_it.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/domain/filters/filters_state_manager.dart';
+import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_filter_enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_filter_manager.dart';
+import 'package:school_data_hub_flutter/features/school_lists/domain/filters/school_list_filter_enums.dart';
 import 'package:school_data_hub_flutter/features/school_lists/domain/school_list_manager.dart';
 
 class SchoolListFilterManager {
   SchoolListManager get _schoolListManager => di<SchoolListManager>();
   FiltersStateManager get _filtersStateManager => di<FiltersStateManager>();
   PupilFilterManager get _pupilFilterManager => di<PupilFilterManager>();
+  HubSessionManager get _hubSessionManager => di<HubSessionManager>();
+
   final _filteredSchoolLists = ValueNotifier<List<SchoolList>>([]);
   ValueListenable<List<SchoolList>> get filteredSchoolLists =>
       _filteredSchoolLists;
 
   ValueListenable<bool> get filterState => _filterState;
   final _filterState = ValueNotifier<bool>(false);
 
+  final _schoolListFilterState = ValueNotifier<Map<SchoolListFilter, bool>>(
+    initialSchoolListFilterValues,
+  );
+  ValueListenable<Map<SchoolListFilter, bool>> get schoolListFilterState =>
+      _schoolListFilterState;
+
   void dispose() {
     _filteredSchoolLists.dispose();
     _filterState.dispose();
+    _schoolListFilterState.dispose();
     _schoolListManager.removeListener(_onSchoolListsChanged);
 
     return;
@@ -33,19 +44,8 @@ class SchoolListFilterManager {
   }
 
   void _onSchoolListsChanged() {
-    // If we have an active filter, reapply it to the new data
-    if (_filterState.value) {
-      _filteredSchoolLists.value = _schoolListManager.schoolLists
-          .where(
-            (element) => element.name.toLowerCase().contains(
-              _filteredSchoolLists.value.first.name.toLowerCase(),
-            ),
-          )
-          .toList();
-    } else {
-      // Otherwise, just update with the new full list
-      _filteredSchoolLists.value = _schoolListManager.schoolLists;
-    }
+    // Reapply active filters when school lists data changes
+    _applyActiveFilters();
   }
 
   void updateFilteredSchoolLists(List<SchoolList> schoolLists) {
@@ -54,14 +54,15 @@ class SchoolListFilterManager {
 
   void resetFilters() {
     _filterState.value = false;
+    _schoolListFilterState.value = Map.from(initialSchoolListFilterValues);
     _filteredSchoolLists.value = _schoolListManager.schoolLists;
     _filtersStateManager.setFilterState(
       filterState: FilterState.schoolList,
       value: false,
     );
   }
 
-  void onSearchEnter(String text) {
+  void onSearchTextSchoolListsFilter(String text) {
     if (text.isEmpty) {
       _filteredSchoolLists.value = _schoolListManager.schoolLists;
       return;
@@ -77,6 +78,77 @@ class SchoolListFilterManager {
         .toList();
   }
 
+  /// Toggle filter for public school lists
+  void togglePublicListsFilter() {
+    final currentValue =
+        _schoolListFilterState.value[SchoolListFilter.publicLists] ?? false;
+    _setMutuallyExclusiveFilter(SchoolListFilter.publicLists, !currentValue);
+  }
+
+  /// Toggle filter for user's own lists
+  void toggleMyListsFilter() {
+    final currentValue =
+        _schoolListFilterState.value[SchoolListFilter.myLists] ?? false;
+    _setMutuallyExclusiveFilter(SchoolListFilter.myLists, !currentValue);
+  }
+
+  /// Toggle filter for other users' lists (not public and not created by current user)
+  void toggleOtherListsFilter() {
+    final currentValue =
+        _schoolListFilterState.value[SchoolListFilter.otherLists] ?? false;
+    _setMutuallyExclusiveFilter(SchoolListFilter.otherLists, !currentValue);
+  }
+
+  /// Set a mutually exclusive filter, ensuring only one filter is active at a time
+  void _setMutuallyExclusiveFilter(SchoolListFilter filter, bool value) {
+    final newState = Map<SchoolListFilter, bool>.from(
+      initialSchoolListFilterValues,
+    );
+
+    if (value) {
+      // If turning on this filter, turn off all others
+      newState[filter] = true;
+    }
+    // If value is false, all filters remain false (from initialValues)
+
+    _schoolListFilterState.value = newState;
+    _applyActiveFilters();
+  }
+
+  /// Apply the currently active filters to the school lists
+  void _applyActiveFilters() {
+    final userName = _hubSessionManager.userName;
+    List<SchoolList> filteredLists = _schoolListManager.schoolLists;
+    bool anyFilterActive = false;
+
+    if (_schoolListFilterState.value[SchoolListFilter.publicLists] == true) {
+      filteredLists = filteredLists
+          .where((list) => list.public == true)
+          .toList();
+      anyFilterActive = true;
+    } else if (_schoolListFilterState.value[SchoolListFilter.myLists] == true &&
+        userName != null) {
+      filteredLists = filteredLists
+          .where((list) => list.createdBy == userName)
+          .toList();
+      anyFilterActive = true;
+    } else if (_schoolListFilterState.value[SchoolListFilter.otherLists] ==
+            true &&
+        userName != null) {
+      filteredLists = filteredLists
+          .where((list) => list.public == false && list.createdBy != userName)
+          .toList();
+      anyFilterActive = true;
+    }
+
+    _filteredSchoolLists.value = filteredLists;
+    _filterState.value = anyFilterActive;
+    _filtersStateManager.setFilterState(
+      filterState: FilterState.schoolList,
+      value: anyFilterActive,
+    );
+  }
+
   List<PupilListEntry> addPupilEntryFiltersToFilteredPupils(
     List<PupilListEntry> pupilEntries,
   ) {
@@ -109,12 +181,12 @@ class SchoolListFilterManager {
       }
       filteredPupilEntries.add(pupilEntry);
     }
-    //- TODO: Implement filterState, FlutterError (setState() or markNeedsBuild() called during build.
-    // if (filterIsOn) {
-    //   _filterState.value = true;
-    // } else {
-    //   _filterState.value = false;
-    // }
+
+    if (filterIsOn) {
+      _filterState.value = true;
+    } else {
+      _filterState.value = false;
+    }
 
     return filteredPupilEntries;
   }
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entry_card.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entry_card.dart
@@ -3,7 +3,7 @@ import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
-import 'package:school_data_hub_flutter/common/widgets/custom_checkbox_either_or.dart';
+import 'package:school_data_hub_flutter/common/widgets/buttons_switches/custom_checkbox_either_or.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/information_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/school_lists_page/school_lists_page.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/school_lists_page/school_lists_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_it/flutter_it.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/domain/models/enums.dart';
@@ -9,7 +10,6 @@ import 'package:school_data_hub_flutter/features/school_lists/domain/school_list
 import 'package:school_data_hub_flutter/features/school_lists/presentation/school_lists_page/widgets/school_list_card.dart';
 import 'package:school_data_hub_flutter/features/school_lists/presentation/school_lists_page/widgets/school_list_search_text_field.dart';
 import 'package:school_data_hub_flutter/features/school_lists/presentation/school_lists_page/widgets/school_lists_bottom_navbar.dart';
-import 'package:flutter_it/flutter_it.dart';
 
 class SchoolListsPage extends WatchingWidget {
   const SchoolListsPage({super.key});
@@ -64,6 +64,7 @@ class SchoolListsPage extends WatchingWidget {
                           fontSize: 20,
                         ),
                       ),
+                      const Spacer(),
                     ],
                   ),
                 ),
@@ -97,6 +98,8 @@ class SchoolListsPage extends WatchingWidget {
                     ],
                   ),
                 ),
+
+                const Gap(10),
                 filteredSchoolLists.isEmpty
                     ? const Center(
                         child: Padding(
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/school_lists_page/widgets/school_list_search_text_field.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/school_lists_page/widgets/school_list_search_text_field.dart
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/school_lists_page/widgets/school_lists_bottom_navbar.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/school_lists_page/widgets/school_lists_bottom_navbar.dart
