From da911ea7aee588480d35285892a0fccd634603a0 Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Wed, 5 Jul 2023 09:40:33 +0300
Subject: [PATCH] fixes

---
 lib/controllers/providers/api/service_requests_provider.dart | 4 ++++
 lib/models/service_request/service_request.dart              | 3 +++
 lib/views/pages/device_transfer/update_device_transfer.dart  | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart
index b621cae..2eb13ff 100644
--- a/lib/controllers/providers/api/service_requests_provider.dart
+++ b/lib/controllers/providers/api/service_requests_provider.dart
@@ -235,6 +235,10 @@ class ServiceRequestsProvider extends ChangeNotifier {
       "voiceNote": request.audio,
       "assets": request.deviceId == null ? [] : [request.deviceId],
       "attachmentsCallRequest": request.devicePhotos?.map((e) => {"name": e})?.toList(),
+      "assignedEmployee": {
+        "id": request.engineerId,
+        "name":  request.engineerName,
+      },
       "callSiteContactPerson": [
         {
           "id": callSiteContactPerson['id'] ?? 0,
diff --git a/lib/models/service_request/service_request.dart b/lib/models/service_request/service_request.dart
index a884da6..58fc280 100644
--- a/lib/models/service_request/service_request.dart
+++ b/lib/models/service_request/service_request.dart
@@ -15,6 +15,7 @@ class ServiceRequest {
   int hospitalId;
   String departmentName;
   String engineerName;
+  String engineerId;
   String date;
   String audio;
   int statusValue;
@@ -57,6 +58,7 @@ class ServiceRequest {
     this.deviceId,
     this.audio,
     this.engineerName,
+    this.engineerId,
     this.viewReport = false,
     this.deviceModel,
     this.engineerMobile,
@@ -102,6 +104,7 @@ class ServiceRequest {
       statusValue: parsedJson["status"] == null ? null : parsedJson["status"]["value"],
       departmentName: parsedJson["asset"]["department"] != null ? parsedJson["asset"]["department"]["name"] : "",
       engineerName: parsedJson["assignedEmployee"] == null ? null : parsedJson["assignedEmployee"]["name"],
+      engineerId: parsedJson["assignedEmployee"] == null ? null : parsedJson["assignedEmployee"]["id"],
       hospitalId: parsedJson["asset"]["site"]["id"],
       reportID: parsedJson["workOrder"] != null ? parsedJson["workOrder"]["workOrderId"] : null,
       viewReport: parsedJson["workOrder"] != null,
diff --git a/lib/views/pages/device_transfer/update_device_transfer.dart b/lib/views/pages/device_transfer/update_device_transfer.dart
index 9b2c803..5e8101f 100644
--- a/lib/views/pages/device_transfer/update_device_transfer.dart
+++ b/lib/views/pages/device_transfer/update_device_transfer.dart
@@ -249,6 +249,8 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
                   GasStatusMenu(
                     initialValue: _formModel.status,
                     onSelect: (status) {
+                      if(status==null)
+                         return;
                       _formModel.status = status;
                       setState(() {});
                     },