From c12a0ce88d58831021b3e571a9891c59d9cfd308 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 11 May 2026 08:44:17 +0300 Subject: [PATCH] bug fixes for clear filters. --- .../device_transfer/device_filter_screen.dart | 5 ++++- .../land_page/my_request/my_requests_page.dart | 1 + lib/views/widgets/equipment/my_assets_page.dart | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/modules/tm_module/device_transfer/device_filter_screen.dart b/lib/modules/tm_module/device_transfer/device_filter_screen.dart index 899ba68d..f03cc64a 100644 --- a/lib/modules/tm_module/device_transfer/device_filter_screen.dart +++ b/lib/modules/tm_module/device_transfer/device_filter_screen.dart @@ -45,6 +45,7 @@ class _DeviceFilterScreenState extends State { setState(() {}); startDate = filter.supplyDateFrom; endDate = filter.supplyDateTo; + _commissioningStatus = filter.assetStatus; final departmentProvider = Provider.of(context, listen: false); final siteProvider = Provider.of(context, listen: false); if (departmentProvider.items.isEmpty ?? true) await departmentProvider.getData(); @@ -82,6 +83,7 @@ class _DeviceFilterScreenState extends State { endDate = null; _selectedDepartments = []; _selectedSites = []; + _commissioningStatus = null; }); }, style: TextButton.styleFrom(padding: EdgeInsets.zero, tapTargetSize: MaterialTapTargetSize.shrinkWrap), @@ -183,6 +185,7 @@ class _DeviceFilterScreenState extends State { void _search() async { filter.sites = _selectedSites.map((site) => site.name ?? '').where((name) => name.isNotEmpty).toList(); filter.departments = _selectedDepartments.map((dept) => dept.name ?? '').where((name) => name.isNotEmpty).toList(); + filter.assetStatus = _commissioningStatus; filter.supplyDateFrom = startDate; filter.supplyDateTo = endDate; final deviceProvider = Provider.of(context, listen: false); @@ -194,6 +197,6 @@ class _DeviceFilterScreenState extends State { } bool _showResetButton() { - return (_selectedDepartments.isNotEmpty) || (_selectedSites.isNotEmpty) || (startDate != null) || (endDate != null); + return (_selectedDepartments.isNotEmpty) || (_selectedSites.isNotEmpty) || (_commissioningStatus != null) || (startDate != null) || (endDate != null); } } diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart index c790758d..6e25f3c9 100644 --- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart +++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart @@ -255,6 +255,7 @@ class _MyRequestsPageState extends State { (_search!.manufacture?.value?.isNotEmpty ?? false) || (_search!.sn?.value?.isNotEmpty ?? false) || (_search!.statuses?.isNotEmpty ?? false) || + (_search!.typeTransaction?.isNotEmpty ?? false) || (_search!.startDate != null) || (_search!.endDate != null) || (_search!.selectedSortOption?.isNotEmpty ?? false)) { diff --git a/lib/views/widgets/equipment/my_assets_page.dart b/lib/views/widgets/equipment/my_assets_page.dart index b1d9ea91..6d6ee224 100644 --- a/lib/views/widgets/equipment/my_assets_page.dart +++ b/lib/views/widgets/equipment/my_assets_page.dart @@ -251,6 +251,7 @@ class _MyAssetsPageState extends State { (_searchAsset!.modelDefinition?.isNotEmpty ?? false) || (_searchAsset!.departments?.isNotEmpty ?? false) || (_searchAsset!.sites?.isNotEmpty ?? false) || + (_searchAsset!.assetStatus != null) || (_searchAsset!.supplyDateFrom != null) || (_searchAsset!.supplyDateTo != null)) { return false; @@ -420,6 +421,19 @@ class _MyAssetsPageState extends State { )); } + // Asset Status (Commissioning Status) + if (_searchAsset?.assetStatus != null) { + chips.add(_buildFilterChip( + label: 'Status: ${_searchAsset!.assetStatus!.name ?? 'Unknown'}', + onDelete: () { + setState(() { + _searchAsset!.assetStatus = null; + _refreshWithFilters(); + }); + }, + )); + } + // Departments (multiple) if (_searchAsset?.departments?.isNotEmpty ?? false) { for (var dept in _searchAsset!.departments!) { @@ -518,6 +532,7 @@ class _MyAssetsPageState extends State { _searchAsset?.site = null; _searchAsset?.manufacturer = null; _searchAsset?.modelDefinition = null; + _searchAsset?.assetStatus = null; _searchAsset?.departments?.clear(); _searchAsset?.sites?.clear(); _searchAsset?.supplyDateFrom = null;