diff --git a/lib/api/device_transfer_api_client.dart b/lib/api/device_transfer_api_client.dart index 1b2bfd25..34cf2b97 100644 --- a/lib/api/device_transfer_api_client.dart +++ b/lib/api/device_transfer_api_client.dart @@ -34,14 +34,16 @@ class DeviceTransferApiClient { required DeviceTransfer model, }) async { Map body = { - "uid": UserApiClient().user?.id.toString() ?? "", - "token": UserApiClient().user?.token ?? "", - "serial_id": model.device?.id ?? "", - "destination_client": model.receiver?.client?.id ?? "", - "destination_department": model.receiver?.department?.id ?? "", + "id": model.id??0, + "assetId": model.device?.id, + "destSiteId":model.receiver?.client?.id, + "senderSiteId":model.sender?.userId, + "receiverAssignedEmployeeId": model.receiver?.userId }; - final response = await ApiClient().postJsonForResponse("${URLs.host1}${URLs.requestDeviceTransfer}", body, isFormData: true); + print(body); + + final response = await ApiClient().postJsonForResponse("${URLs.host1}${URLs.requestDeviceTransfer}", body, isFormData: false); return DeviceTransfer.fromJson(json.decode(utf8.decode(response.bodyBytes))[0]); } @@ -49,18 +51,20 @@ class DeviceTransferApiClient { Future updateRequest({ required bool isSender, required String requestId, - required DeviceTransfer? oldModel, + required DeviceTransfer oldModel, required DeviceTransferInfo newModel, }) async { Map body = { - "uid": UserApiClient().user?.id.toString(), - "token": UserApiClient().user?.token, - "current_user": UserApiClient().user?.id, + "id": oldModel.id??0, + "assetId": oldModel.device?.id, + "destSiteId":oldModel.receiver?.client?.id, + "senderSiteId":oldModel.sender?.userId, + "receiverAssignedEmployeeId": oldModel.receiver?.userId }; body.addAll(newModel.toJson(isSender)); - final response = await ApiClient().postJsonForResponse("${URLs.host1}${URLs.updateDeviceTransfer}/$requestId", body); + final response = await ApiClient().putJsonForResponse("${URLs.host1}${URLs.updateDeviceTransfer}", body); return DeviceTransfer.fromJson(json.decode(utf8.decode(response.bodyBytes))[0]); } diff --git a/lib/controllers/providers/api/device_transfer_provider.dart b/lib/controllers/providers/api/device_transfer_provider.dart index 330d207d..066b12d5 100644 --- a/lib/controllers/providers/api/device_transfer_provider.dart +++ b/lib/controllers/providers/api/device_transfer_provider.dart @@ -71,7 +71,7 @@ class DeviceTransferProvider extends LoadingNotifier { required User user, required bool isSender, required String requestId, - required DeviceTransfer? oldModel, + required DeviceTransfer oldModel, required DeviceTransferInfo newModel, }) async { reset(); diff --git a/lib/views/pages/device_transfer/update_device_transfer.dart b/lib/views/pages/device_transfer/update_device_transfer.dart index a4836599..7259e5c7 100644 --- a/lib/views/pages/device_transfer/update_device_transfer.dart +++ b/lib/views/pages/device_transfer/update_device_transfer.dart @@ -24,9 +24,9 @@ import '../../widgets/status/gas_refill/gas_status.dart'; import '../../widgets/titles/app_sub_title.dart'; class UpdateDeviceTransfer extends StatefulWidget { - final DeviceTransfer? model; + final DeviceTransfer model; final bool? isSender; - const UpdateDeviceTransfer({Key? key, this.model, this.isSender}) : super(key: key); + const UpdateDeviceTransfer({Key? key, required this.model, this.isSender}) : super(key: key); @override State createState() => _UpdateDeviceTransferState();