diff --git a/lib/controllers/providers/api/device_transfer_provider.dart b/lib/controllers/providers/api/device_transfer_provider.dart index f09e1642..ac0e975c 100644 --- a/lib/controllers/providers/api/device_transfer_provider.dart +++ b/lib/controllers/providers/api/device_transfer_provider.dart @@ -134,18 +134,19 @@ class DeviceTransferProvider extends ChangeNotifier { Map body = { "id": 0, "assetId": model.device.id ?? "", - "destSiteId": model.receiver.client.id ?? "", - "destDepartmentId": model.receiver.department.id ?? "", - "senderSiteId": model.receiver.client.id ?? "", + "destSiteId": hospital.id ?? "", + "destDepartmentId": department.id ?? "", + "senderSiteId": model.sender.client.id ?? "", // "transferNo": 0, // "transferCode": "string", "destBuildingId": building?.id, "destFloorId": floor.id, "destRoom": room, - // "senderBuildingId": 0, - // "senderFloorId": 0, - // "senderDepartmentId": 0, - // "senderRoom": "string", + ///// + "senderBuildingId": model.device.destBuildingId, + "senderFloorId": model.device.destFloorId, + "senderDepartmentId": model.device.destDepartmentId, + "senderRoom": model.device.destRoom, // "senderAssignedEmployeeId": "string", // "senderMachineStatusId": 0, // "senderComment": "string", diff --git a/lib/models/device/device.dart b/lib/models/device/device.dart index 1866c26c..c348d2f8 100644 --- a/lib/models/device/device.dart +++ b/lib/models/device/device.dart @@ -9,9 +9,12 @@ class Device { String number; String assetName; String destBuildingName; + int destBuildingId; String destDepartmentName; + int destDepartmentId; String destRoom; String destFloor; + int destFloorId; String destSiteName; // String brand; @@ -33,6 +36,9 @@ class Device { // this.brand, // this.model, this.modelDefinition, + this.destFloorId, + this.destDepartmentId, + this.destBuildingId, }); factory Device.fromJson(Map parsedJson, {bool startKeyWithDest = true}) { @@ -45,9 +51,12 @@ class Device { modelDefinition: ModelDefinition.fromJson(parsedJson["modelDefinition"]), hospital: Hospital.fromJson(parsedJson["site"]), destBuildingName: startKeyWithDest ? parsedJson["destBuildingName"] : parsedJson['building']['name'], + destBuildingId: startKeyWithDest ? parsedJson["destBuildingName"] : parsedJson['building']['id'], destDepartmentName: startKeyWithDest ? parsedJson["destDepartmentName"] : parsedJson['department']['departmentName'], + destDepartmentId: startKeyWithDest ? parsedJson["destDepartmentName"] : parsedJson['department']['id'], destRoom: startKeyWithDest ? parsedJson["destRoom"] : parsedJson['room'], destFloor: startKeyWithDest ? parsedJson["destFloor"] : parsedJson['floor']['name'], + destFloorId: startKeyWithDest ? null : parsedJson['floor']['id'], destSiteName: parsedJson['destSiteName'] // parsedJson["modelDefinition"] == null ? "" : // parsedJson["modelDefinition"]["manufacturerName"], diff --git a/lib/views/pages/device_transfer/request_device_transfer.dart b/lib/views/pages/device_transfer/request_device_transfer.dart index 0c0d8903..16eb104d 100644 --- a/lib/views/pages/device_transfer/request_device_transfer.dart +++ b/lib/views/pages/device_transfer/request_device_transfer.dart @@ -64,7 +64,7 @@ class _RequestDeviceTransferState extends State { _isLoading = true; setState(() {}); - _formModel.sender?.client?.id = _userProvider.user?.clientId; + // _formModel.sender?.client?.id = _userProvider.user?.clientId; int status = await _deviceTransferProvider.createRequest( user: _userProvider.user, host: _settingProvider.host, @@ -149,6 +149,9 @@ class _RequestDeviceTransferState extends State { device: _formModel.device, onDevicePick: (device) { _formModel.device = device; + _formModel.sender.client = device.hospital; + print("device : ${device.hospital.id}"); + print("_formModel : ${_formModel.sender.client.id}"); setState(() {}); }, ),