diff --git a/lib/views/pages/user/gas_refill/track_gas_refill.dart b/lib/views/pages/user/gas_refill/track_gas_refill.dart index c016fd62..6dd1ca6d 100644 --- a/lib/views/pages/user/gas_refill/track_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/track_gas_refill.dart @@ -26,7 +26,11 @@ class _TrackGasRefillPageState extends State with TickerProv @override Widget build(BuildContext context) { - _gasRefillProvider = Provider.of(context); + if (_gasRefillProvider == null) { + _gasRefillProvider = Provider.of(context); + //_gasRefillProvider?.isLoading = false; + _gasRefillProvider.reset(); + } _userProvider = Provider.of(context); _settingProvider = Provider.of(context); Subtitle _subtitle = AppLocalization.of(context).subtitle; diff --git a/lib/views/widgets/gas_refill/gas_refill_create_details_item.dart b/lib/views/widgets/gas_refill/gas_refill_create_details_item.dart index f64f0868..bd48bf25 100644 --- a/lib/views/widgets/gas_refill/gas_refill_create_details_item.dart +++ b/lib/views/widgets/gas_refill/gas_refill_create_details_item.dart @@ -8,11 +8,11 @@ import '../buttons/app_button.dart'; import '../titles/app_sub_title.dart'; class GasRefillCreateDetailsItem extends StatelessWidget { - final GasRefillDetails model; + GasRefillDetails model; final VoidCallback onPressed; final bool isUpdate; - const GasRefillCreateDetailsItem({Key key, this.isUpdate, this.model, this.onPressed}) : super(key: key); + GasRefillCreateDetailsItem({Key key, this.isUpdate, this.model, this.onPressed}) : super(key: key); @override Widget build(BuildContext context) { @@ -45,14 +45,27 @@ class GasRefillCreateDetailsItem extends StatelessWidget { if (startEditing) const SizedBox(height: 4), if (startEditing) ATextFormField( - initialValue: model.deliveredQuantity?.toString(), + initialValue: model.deliveredQuantity?.toString() ?? "0", textAlign: TextAlign.center, // controller: deliveredQuantityController, style: Theme.of(context).textTheme.subtitle1, // validator: (value) => Validator.isNumeric(value) ? null : "allow numbers only", textInputType: TextInputType.number, + // onSaved: (value) { + // print("value:$value"); + // deliveredQuantity = double.tryParse(value) ?? 0; + // print("valueAfter:$value"); + // // _currentDetails?.deliveredQuantity = double.tryParse(value); + // }, onChange: (value) { - deliveredQuantity = double.tryParse(value ?? ""); + if(value.isNotEmpty) { + model.deliveredQuantity = double.tryParse(value); + } else { + model.deliveredQuantity = 0; + } + print("value:$value"); + deliveredQuantity = double.tryParse(value) ?? 0; + print("valueAfter:$value"); // _currentDetails?.deliveredQuantity = double.tryParse(value); }, ), @@ -61,10 +74,12 @@ class GasRefillCreateDetailsItem extends StatelessWidget { AButton( text: subtitle.edit, onPressed: () { - if (deliveredQuantity != null) { - model.deliveredQuantity = deliveredQuantity; + // print("deliveredQuantity:$deliveredQuantity"); + // if (deliveredQuantity != null) { + // model.deliveredQuantity = deliveredQuantity; + // print("deliveredQuantity:${model.deliveredQuantity}"); onPressed(); - } + // } }, ), const Divider(),