Merge branch 'majd_development_new' into 'main_latest_merged'

fix track device transfer issue

See merge request haroon6138/cloudsolutions-atoms!26

lib/controllers/providers/api/device_transfer_provider.dart

@@ -79,6 +79,7 @@ class DeviceTransferProvider extends ChangeNotifier {
         List<DeviceTransfer> itemsPage = listJson.map((request) => DeviceTransfer.fromJson(request)).toList();
         items ??= [];
         items.addAll(itemsPage);
+        print(listJson);
         if (itemsPage.length == pageItemNumber) {
           nextPage = true;
         } else {
@@ -153,11 +154,27 @@ class DeviceTransferProvider extends ChangeNotifier {
           "senderWorkingHours": newModel.workingHours,
           "senderTravelingHours": newModel.travelingHours,
           "senderAttachmentName": "${newModel.signature}.png",
+          "destSiteId": oldModel.receiver.client.id,
+          "destDepartmentId":  oldModel.receiver.department.id,
+          "receiverAssignedEmployeeId":  oldModel.receiver.userId,
+          "receiverMachineStatusId": oldModel.receiver.status.id??"",
+          "receiverComment": oldModel.receiver.comment,
+          "receiverWorkingHours": oldModel.receiver.workingHours,
+          "receiverTravelingHours": oldModel.receiver.travelingHours,
+          "receiverAttachmentName": "${oldModel.receiver.signature}.png",
         }
       );
     }else{
       body.addAll(
           {
+            "senderSiteId": oldModel.sender.client.id,
+            "senderDepartmentId":  oldModel.sender.department.id,
+            "senderAssignedEmployeeId":  oldModel.sender.userId,
+            "senderMachineStatusId": oldModel.sender.status.id,
+            "senderComment": oldModel.sender.comment,
+            "senderWorkingHours": oldModel.sender.workingHours,
+            "senderTravelingHours": oldModel.sender.travelingHours,
+            "senderAttachmentName": "${oldModel.sender.signature}.png",
             "destSiteId": newModel.client.id,
             "destDepartmentId":  newModel.department.id,
             "receiverAssignedEmployeeId":  newModel.userId,
@@ -170,7 +187,11 @@ class DeviceTransferProvider extends ChangeNotifier {
       );
     }
 
+    print(body["senderWorkingHours"]);
+
+
     body.addAll(newModel.toJson(isSender));
+    print(body);
     Response response;
     try{
       response = await ApiManager.instance.put(

lib/models/device/device_transfer_info.dart

@@ -31,7 +31,7 @@ class DeviceTransferInfo{
 
     if(comment != null && comment.isNotEmpty) body["${baseKey}comment"] = comment;
     if(workingHours != null && workingHours.isNotEmpty) body["${baseKey}working_hours"] = workingHours;
-    if(travelingHours != null && travelingHours.isNotEmpty) body["${baseKey}travel_hours"] = comment;
+    if(travelingHours != null && travelingHours.isNotEmpty) body["${baseKey}travel_hours"] = travelingHours;
     if(status != null) body["${baseKey}status"] = status.id.toString();
     if(signature != null && signature.isNotEmpty) body["${baseKey}image"] = signature;
     return body;

lib/views/pages/device_transfer/device_transfer_details.dart

@@ -114,7 +114,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                                 onPressed: (){
                                   Navigator.of(context).push(
                                       MaterialPageRoute(
-                                          builder: (_)=> UpdateDeviceTransfer(model: widget.model,isSender: _isSender,)
+                                          builder: (_)=> UpdateDeviceTransfer(model: widget.model,isSender: true,)
                                       )
                                   );
                                 },
@@ -140,7 +140,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                               onPressed: (){
                                 Navigator.of(context).push(
                                     MaterialPageRoute(
-                                        builder: (_)=> UpdateDeviceTransfer(model: widget.model,isSender: _isSender,)
+                                        builder: (_)=> UpdateDeviceTransfer(model: widget.model,isSender: false,)
                                     )
                                 );
                               },