Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new

lib/controllers/providers/api/device_transfer_provider.dart

@@ -142,34 +142,44 @@ class DeviceTransferProvider extends ChangeNotifier {
       "destDepartmentId": oldModel.receiver.department.id,
     };
 
-    if (isSender) {
+    if(isSender){
-      body.addAll({
+      body.addAll(
-        //"senderSiteId": newModel.client.id,
+        {
-        //"senderDepartmentId":  newModel.department.id,
+          "senderSiteId": newModel.client.id,
-        "senderAssignedEmployeeId": newModel.userId,
+          "senderDepartmentId":  newModel.department.id,
-        "senderMachineStatusId": newModel.status.id,
+          "senderAssignedEmployeeId":  newModel.userId,
-        "senderComment": newModel.comment,
+          "senderMachineStatusId": newModel.status.id,
-        "senderWorkingHours": newModel.workingHours,
+          "senderComment": newModel.comment,
-        "senderTravelingHours": newModel.travelingHours,
+          "senderWorkingHours": newModel.workingHours,
-        "senderAttachmentName": "${DateTime.now().toIso8601String()}.png|${newModel.signature}",
+          "senderTravelingHours": newModel.travelingHours,
-      });
+          "senderAttachmentName": "${newModel.signature}.png",
-    } else {
+        }
-      body.addAll({
+      );
-        //"destSiteId": newModel.client.id,
+    }else{
-        //"destDepartmentId":  newModel.department.id,
+      body.addAll(
-        "receiverAssignedEmployeeId": newModel.userId,
+          {
-        "receiverMachineStatusId": newModel.status.id,
+            "destSiteId": newModel.client.id,
-        "receiverComment": newModel.comment,
+            "destDepartmentId":  newModel.department.id,
-        "receiverWorkingHours": newModel.workingHours,
+            "receiverAssignedEmployeeId":  newModel.userId,
-        "receiverTravelingHours": newModel.travelingHours,
+            "receiverMachineStatusId": newModel.status?.id??"",
-        "receiverAttachmentName": "${DateTime.now().toIso8601String()}.png|${newModel.signature}",
+            "receiverComment": newModel.comment,
-      });
+            "receiverWorkingHours": newModel.workingHours,
+            "receiverTravelingHours": newModel.travelingHours,
+            "receiverAttachmentName": "${newModel.signature}.png",
+          }
+      );
     }
 
     body.addAll(newModel.toJson(isSender));
     Response response;
-    try {
+    try{
-      response = await ApiManager.instance.put(URLs.updateDeviceTransfer, body: body);
+      response = await ApiManager.instance.put(
+          URLs.updateDeviceTransfer,
+          body: body
+      );
+
+      print(response.body);
+      print("${newModel.signature}.png");
       // response = await post(
       //   Uri.parse("$host${URLs.updateDeviceTransfer}/$requestId"),
       //   body: body,
@@ -190,4 +200,4 @@ class DeviceTransferProvider extends ChangeNotifier {
       return -1;
     }
   }
-}
+}

lib/controllers/providers/api/devices_provider.dart

@@ -67,7 +67,7 @@ class DevicesProvider extends ChangeNotifier {
     if (response.statusCode >= 200 && response.statusCode < 300) {
       // client's request was successfully received
       List equipmentListJson = json.decode(response.body)["data"];
-      _devices = equipmentListJson.map((device) => Device.fromJson(device)).toList();
+      _devices = equipmentListJson.map<Device>((device) => Device.fromJson(device)).toList();
     }
     _loading = false;
     notifyListeners();

lib/views/pages/user/land_page.dart

@@ -182,7 +182,7 @@ class _LandPageState extends State<LandPage> {
                       //     Navigator.of(context).pushNamed(PreventiveMaintenanceVisitsPage.id);
                       //   },
                       // ),
-                      if (_userProvider.user != null && _userProvider.user.type != UsersTypes.engineer)
+                      if (_userProvider?.user != null && _userProvider?.user?.type != UsersTypes.engineer)
                         LandPageItem(
                           text: "Request Gas Refill",
                           icon: FontAwesomeIcons.truckFast,

lib/views/widgets/status/single_status_menu.dart

@@ -33,7 +33,7 @@ class _SingleStatusMenuState extends State<SingleStatusMenu> {
       } else {
         _selectedStatus = null;
       }
-      if (widget.initialStatus?.id != _selectedStatus?.id) {
+      if((widget.initialStatus?.id??"") != (_selectedStatus?.id??"")) {
         widget.onSelect(_selectedStatus);
       }
     } else {