From ea5738f7057ffadd54a9d0d03803b8585b11dd7b Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Tue, 5 Sep 2023 12:17:14 +0300 Subject: [PATCH] Gas refill update reflected on the details screen --- .../pages/user/gas_refill/gas_refill_details.dart | 11 ++++++----- .../pages/user/gas_refill/request_gas_refill.dart | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/views/pages/user/gas_refill/gas_refill_details.dart b/lib/views/pages/user/gas_refill/gas_refill_details.dart index fac3a13b..589c9094 100644 --- a/lib/views/pages/user/gas_refill/gas_refill_details.dart +++ b/lib/views/pages/user/gas_refill/gas_refill_details.dart @@ -34,7 +34,7 @@ class GasRefillDetails extends StatefulWidget { } class _GasRefillDetailsState extends State { - final GasRefillModel _model = GasRefillModel(); + GasRefillModel _model = GasRefillModel(); bool _enableEdit = false; bool _validate = false; UserProvider _userProvider; @@ -75,7 +75,7 @@ class _GasRefillDetailsState extends State { @override void initState() { - _model.fromGasRefillModel(widget.model); + _model?.fromGasRefillModel(widget.model); super.initState(); } @@ -124,7 +124,7 @@ class _GasRefillDetailsState extends State { onPressed: () async { // _enableEdit = !_enableEdit; print(widget.model.startDate); - _model.fromGasRefillModel(widget.model); + _model?.fromGasRefillModel(widget.model); print(widget.model.startDate); // setState(() {}); Navigator.push( @@ -135,8 +135,9 @@ class _GasRefillDetailsState extends State { ), ), ).then((value) { - _model.status = value.status; - _model.details = value.details; + if (value != null) { + _model = value; + } }); setState(() {}); }, 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 9a4b92be..e5242580 100644 --- a/lib/views/pages/user/gas_refill/request_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart @@ -294,6 +294,8 @@ class _RequestGasRefillState extends State { onChange: (timer) async { _gasRefillProvider.timer = timer; _formModel.workingHours = num.tryParse((((timer?.durationInSecond ?? 0) / 60) / 60)?.toStringAsFixed(2) ?? "0"); + _formModel.startDate = timer.startAt; + _formModel.endDate = timer.endAt; return true; }, ), @@ -533,12 +535,12 @@ class _RequestGasRefillState extends State { if (widget.gasRefillModel != null) ESignature( oldSignature: _formModel.signatureEngineer, - newSignature: _formModel.localNurseSignature, + newSignature: _formModel.localEngineerSignature, onChange: (signature) { if (signature == null || signature.isEmpty) { return; } - _formModel.localNurseSignature = signature; + _formModel.localEngineerSignature = signature; _formModel.signatureEngineer = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}"; }, ),