Merge branch 'zaid_development_new' into majd_development_new

lib/views/pages/user/gas_refill/request_gas_refill.dart

@@ -155,7 +155,7 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
     }
     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;
         _gasRefillProvider.timer = TimerModel(startAt: widget.gasRefillModel?.startDate, endAt: widget.gasRefillModel?.endDate);
       } else {

lib/views/pages/user/requests/report/create_service_report.dart

@@ -545,6 +545,7 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
                               ServiceReportFaultDescription(
                                 requestId: widget.request?.id,
                                 initialValue: _serviceReport.faultDescription,
+                                enabled: false,
                                 onSelect: (status) {
                                   _serviceReport.faultDescription = status;
                                   setState(() {});

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);

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<SettingProvider>(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(