diff --git a/lib/views/pages/user/gas_refill/request_gas_refill.dart b/lib/views/pages/user/gas_refill/request_gas_refill.dart index 06fed90e..a5f2e15e 100644 --- a/lib/views/pages/user/gas_refill/request_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart @@ -150,6 +150,7 @@ class _RequestGasRefillState extends State { } if (widget.gasRefillModel != null && _firstTime) { _formModel = widget.gasRefillModel; + _formModel.status = const Lookup(value: 0); HospitalsProvider().getHospitalsListByVal(searchVal: widget.gasRefillModel.clientName).then((value) { _gasRefillProvider.hospital = value?.firstWhere((element) => element.name == widget.gasRefillModel.clientName, orElse: () => null); print(_gasRefillProvider.hospital?.buildings?.length); @@ -212,7 +213,8 @@ class _RequestGasRefillState extends State { height: 4, ), GasStatusMenu( - initialValue: _formModel.status ?? const Lookup(value: 1), + initialValue: _formModel.status ?? const Lookup(value: 0), + enabled: false, onSelect: (status) { _formModel.status = status; }, diff --git a/lib/views/pages/user/visits/pantry/edit_pentry.dart b/lib/views/pages/user/visits/pantry/edit_pentry.dart index 55d356b9..9a35facd 100644 --- a/lib/views/pages/user/visits/pantry/edit_pentry.dart +++ b/lib/views/pages/user/visits/pantry/edit_pentry.dart @@ -120,7 +120,7 @@ class _EditPentryState extends State with SingleTickerProviderStateM text: "PK Kits", ), Tab( - text: "Pentry", + text: "PM Entry", ), ]), ), diff --git a/lib/views/widgets/status/gas_refill/gas_status.dart b/lib/views/widgets/status/gas_refill/gas_status.dart index c46e6508..7e7cbac6 100644 --- a/lib/views/widgets/status/gas_refill/gas_status.dart +++ b/lib/views/widgets/status/gas_refill/gas_status.dart @@ -10,8 +10,9 @@ import 'package:test_sa/views/widgets/status/single_status_menu.dart'; class GasStatusMenu extends StatelessWidget { final Function(Lookup) onSelect; final Lookup initialValue; + final bool enabled; - const GasStatusMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + const GasStatusMenu({Key key, this.enabled = true, this.onSelect, this.initialValue}) : super(key: key); @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); @@ -29,6 +30,7 @@ class GasStatusMenu extends StatelessWidget { initialStatus: initialValue, statuses: menuProvider.items, onSelect: onSelect, + enabled: enabled, )); } } diff --git a/lib/views/widgets/status/single_status_menu.dart b/lib/views/widgets/status/single_status_menu.dart index dbd2eb70..6a9a9908 100644 --- a/lib/views/widgets/status/single_status_menu.dart +++ b/lib/views/widgets/status/single_status_menu.dart @@ -7,8 +7,9 @@ class SingleStatusMenu extends StatefulWidget { final List statuses; final Lookup initialStatus; final Function(Lookup) onSelect; + final bool enabled; - const SingleStatusMenu({Key key, this.statuses, this.onSelect, this.initialStatus}) : super(key: key); + const SingleStatusMenu({Key key, this.enabled = true, this.statuses, this.onSelect, this.initialStatus}) : super(key: key); @override _SingleStatusMenuState createState() => _SingleStatusMenuState(); @@ -82,20 +83,22 @@ class _SingleStatusMenuState extends State { style: Theme.of(context).textTheme.subtitle1, ), style: TextStyle(color: Theme.of(context).primaryColor), - underline: SizedBox.shrink(), - onChanged: (Lookup newValue) { - setState(() { - _selectedStatus = newValue; - }); - widget.onSelect(newValue); - }, + underline: const SizedBox.shrink(), + onChanged: widget.enabled == false + ? null + : (Lookup newValue) { + setState(() { + _selectedStatus = newValue; + }); + widget.onSelect(newValue); + }, items: widget.statuses.map>((Lookup value) { return DropdownMenuItem( value: value, child: Text( value.name, style: Theme.of(context).textTheme.subtitle1.copyWith( - color: Theme.of(context).primaryColor, + color: widget.enabled ? Theme.of(context).primaryColor : Colors.grey, fontSize: 11, //fontWeight: FontWeight.bold ),