From 311c8c974d65ad549744154025b7f493c5ab6ab9 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 20 Aug 2023 12:34:09 +0300 Subject: [PATCH 1/2] gaz refill status fix, when change from web. --- lib/views/pages/user/gas_refill/request_gas_refill.dart | 2 +- lib/views/pages/user/requests/request_details.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 abcb5efe..5300a3ee 100644 --- a/lib/views/pages/user/gas_refill/request_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart @@ -154,7 +154,7 @@ class _RequestGasRefillState extends State { } if (_firstTime) { if (widget.gasRefillModel != null) { - _formModel.status = const Lookup(value: 0); + _formModel.status = widget.gasRefillModel?.status ?? const Lookup(value: 0); _gasRefillProvider.expectedDateTime = _formModel.expectedDate; } HospitalsProvider().getHospitalsListByVal(searchVal: _userProvider.user?.clientName).then((value) { diff --git a/lib/views/pages/user/requests/request_details.dart b/lib/views/pages/user/requests/request_details.dart index 75a69aa0..a794e5f5 100644 --- a/lib/views/pages/user/requests/request_details.dart +++ b/lib/views/pages/user/requests/request_details.dart @@ -27,7 +27,7 @@ import '../../../../models/service_request/search_work_order.dart'; import 'report/future_service_report.dart'; class RequestDetailsPage extends StatelessWidget { - static final String id = "/call-details"; + static const String id = "/call-details"; final ServiceRequest serviceRequest; const RequestDetailsPage({Key key, this.serviceRequest}) : super(key: key); From 7a02b2e715fb66f540b4f3c8b85d34590e12facf Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Sun, 20 Aug 2023 12:38:24 +0300 Subject: [PATCH 2/2] fault description is disabled when create new work order --- .../user/requests/report/create_service_report.dart | 1 + .../status/report/service_report_fault_description.dart | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/views/pages/user/requests/report/create_service_report.dart b/lib/views/pages/user/requests/report/create_service_report.dart index 89fdf8da..ff09c44c 100644 --- a/lib/views/pages/user/requests/report/create_service_report.dart +++ b/lib/views/pages/user/requests/report/create_service_report.dart @@ -545,6 +545,7 @@ class _CreateServiceReportState extends State with TickerPr ServiceReportFaultDescription( requestId: widget.request?.id, initialValue: _serviceReport.faultDescription, + enabled: false, onSelect: (status) { _serviceReport.faultDescription = status; setState(() {}); diff --git a/lib/views/widgets/status/report/service_report_fault_description.dart b/lib/views/widgets/status/report/service_report_fault_description.dart index 544fcbb3..facda9dd 100644 --- a/lib/views/widgets/status/report/service_report_fault_description.dart +++ b/lib/views/widgets/status/report/service_report_fault_description.dart @@ -13,8 +13,9 @@ class ServiceReportFaultDescription extends StatelessWidget { final String requestId; final Function(FaultDescription) onSelect; final FaultDescription initialValue; + final bool enabled; - const ServiceReportFaultDescription({Key key, this.requestId, this.onSelect, this.initialValue}) : super(key: key); + const ServiceReportFaultDescription({Key key, this.requestId, this.onSelect, this.initialValue, this.enabled = true}) : super(key: key); @override Widget build(BuildContext context) { SettingProvider settingProvider = Provider.of(context); @@ -28,9 +29,9 @@ class ServiceReportFaultDescription extends StatelessWidget { menuProvider.reset(); await menuProvider.getCallRequestForWorkOrder(user: userProvider.user, host: settingProvider.host, requestId: requestId); }, - child: (menuProvider.items?.isEmpty ?? true) - ? const ATextFormField( - initialValue: "", + child: ((menuProvider.items?.isEmpty ?? true) || (!enabled)) + ? ATextFormField( + initialValue: (!enabled) ? initialValue?.defectName ?? "" : "", enable: false, ) : FaultDescriptionMenu(