bug fixes for clear filters.

main_production_RSG
Sikander Saleem 2 months ago
parent 789ef59b0b
commit c12a0ce88d

@ -45,6 +45,7 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
setState(() {});
startDate = filter.supplyDateFrom;
endDate = filter.supplyDateTo;
_commissioningStatus = filter.assetStatus;
final departmentProvider = Provider.of<DepartmentProvider>(context, listen: false);
final siteProvider = Provider.of<SiteProvider>(context, listen: false);
if (departmentProvider.items.isEmpty ?? true) await departmentProvider.getData();
@ -82,6 +83,7 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
endDate = null;
_selectedDepartments = [];
_selectedSites = [];
_commissioningStatus = null;
});
},
style: TextButton.styleFrom(padding: EdgeInsets.zero, tapTargetSize: MaterialTapTargetSize.shrinkWrap),
@ -183,6 +185,7 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
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<AssetProvider>(context, listen: false);
@ -194,6 +197,6 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
}
bool _showResetButton() {
return (_selectedDepartments.isNotEmpty) || (_selectedSites.isNotEmpty) || (startDate != null) || (endDate != null);
return (_selectedDepartments.isNotEmpty) || (_selectedSites.isNotEmpty) || (_commissioningStatus != null) || (startDate != null) || (endDate != null);
}
}

@ -255,6 +255,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
(_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)) {

@ -251,6 +251,7 @@ class _MyAssetsPageState extends State<MyAssetsPage> {
(_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<MyAssetsPage> {
));
}
// 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<MyAssetsPage> {
_searchAsset?.site = null;
_searchAsset?.manufacturer = null;
_searchAsset?.modelDefinition = null;
_searchAsset?.assetStatus = null;
_searchAsset?.departments?.clear();
_searchAsset?.sites?.clear();
_searchAsset?.supplyDateFrom = null;

Loading…
Cancel
Save