From 81afa14ffcefd7461c43693814b83ce92b22f90c Mon Sep 17 00:00:00 2001 From: nextwo <1234> Date: Wed, 15 Nov 2023 17:05:22 +0300 Subject: [PATCH] When we have filters, add reset button. --- .../pages/device_transfer/asset_filter_screen.dart | 5 ++++- .../widgets/equipment/equipment_status_buttons.dart | 13 +++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/views/pages/device_transfer/asset_filter_screen.dart b/lib/views/pages/device_transfer/asset_filter_screen.dart index 1c121f8e..6dfc3fce 100644 --- a/lib/views/pages/device_transfer/asset_filter_screen.dart +++ b/lib/views/pages/device_transfer/asset_filter_screen.dart @@ -32,6 +32,7 @@ class _AssetFilterScreenState extends State { AssetSearch filter; Site _site; Department _department; + int initialvalue; @override void initState() { filter = widget.data ?? AssetSearch(); @@ -65,6 +66,7 @@ class _AssetFilterScreenState extends State { setState(() { _department = null; _site = null; + initialvalue=null; }); }), ], @@ -82,7 +84,8 @@ class _AssetFilterScreenState extends State { if (value == null) { /// the selected value is [All Assets] } - }), + }, initialvalue: initialvalue, + ), 16.height, SingleItemDropDownMenu( context: context, diff --git a/lib/views/widgets/equipment/equipment_status_buttons.dart b/lib/views/widgets/equipment/equipment_status_buttons.dart index f1f5d32e..86bb9a0b 100644 --- a/lib/views/widgets/equipment/equipment_status_buttons.dart +++ b/lib/views/widgets/equipment/equipment_status_buttons.dart @@ -12,15 +12,16 @@ import '../../../providers/service_request_providers/equipment_status_provider.d class EquipmentStatusButtons extends StatefulWidget { final Function(Lookup) onSelect; + int initialvalue; - const EquipmentStatusButtons({Key key, this.onSelect}) : super(key: key); + EquipmentStatusButtons({Key key, this.onSelect, this.initialvalue}) : super(key: key); @override State createState() => _EquipmentStatusButtonsState(); } class _EquipmentStatusButtonsState extends State { - int _selectedEquipmentStatusIndex = 0; + //int _selectedEquipmentStatusIndex = 0; @override void initState() { @@ -61,18 +62,18 @@ class _EquipmentStatusButtonsState extends State { padding: EdgeInsetsDirectional.only(start: 16.toScreenWidth), itemBuilder: (context, index) => Container( margin: EdgeInsets.symmetric(horizontal: 4.toScreenWidth), - padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: (_selectedEquipmentStatusIndex == index ? 12 : 8).toScreenWidth), + padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: (widget.initialvalue == index ? 12 : 8).toScreenWidth), alignment: Alignment.center, decoration: BoxDecoration( borderRadius: BorderRadius.circular(7), - color: _selectedEquipmentStatusIndex == index ? AppColor.neutral30 : Colors.white, - border: _selectedEquipmentStatusIndex == index ? Border.all(width: 1, color: AppColor.primary50) : null, + color: widget.initialvalue == index ? AppColor.neutral30 : Colors.white, + border: widget.initialvalue == index ? Border.all(width: 1, color: AppColor.primary50) : null, boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.03), blurRadius: 14)], ), child: (index == 0 ? "All Assets" : snapshot.items[index - 1].name).tinyFont(context).custom(color: AppColor.neutral50), ).onPress(() { setState(() { - _selectedEquipmentStatusIndex = index; + widget.initialvalue = index; }); widget.onSelect(index == 0 ? null : snapshot.items[index - 1]); }),