Improvements

design_3.0_internal_audit_module
zaid_daoud 3 years ago
parent 8184632ce7
commit af1874600a

@ -134,18 +134,19 @@ class DeviceTransferProvider extends ChangeNotifier {
Map<String, dynamic> body = { Map<String, dynamic> body = {
"id": 0, "id": 0,
"assetId": model.device.id ?? "", "assetId": model.device.id ?? "",
"destSiteId": model.receiver.client.id ?? "", "destSiteId": hospital.id ?? "",
"destDepartmentId": model.receiver.department.id ?? "", "destDepartmentId": department.id ?? "",
"senderSiteId": model.receiver.client.id ?? "", "senderSiteId": model.sender.client.id ?? "",
// "transferNo": 0, // "transferNo": 0,
// "transferCode": "string", // "transferCode": "string",
"destBuildingId": building?.id, "destBuildingId": building?.id,
"destFloorId": floor.id, "destFloorId": floor.id,
"destRoom": room, "destRoom": room,
// "senderBuildingId": 0, /////
// "senderFloorId": 0, "senderBuildingId": model.device.destBuildingId,
// "senderDepartmentId": 0, "senderFloorId": model.device.destFloorId,
// "senderRoom": "string", "senderDepartmentId": model.device.destDepartmentId,
"senderRoom": model.device.destRoom,
// "senderAssignedEmployeeId": "string", // "senderAssignedEmployeeId": "string",
// "senderMachineStatusId": 0, // "senderMachineStatusId": 0,
// "senderComment": "string", // "senderComment": "string",

@ -9,9 +9,12 @@ class Device {
String number; String number;
String assetName; String assetName;
String destBuildingName; String destBuildingName;
int destBuildingId;
String destDepartmentName; String destDepartmentName;
int destDepartmentId;
String destRoom; String destRoom;
String destFloor; String destFloor;
int destFloorId;
String destSiteName; String destSiteName;
// String brand; // String brand;
@ -33,6 +36,9 @@ class Device {
// this.brand, // this.brand,
// this.model, // this.model,
this.modelDefinition, this.modelDefinition,
this.destFloorId,
this.destDepartmentId,
this.destBuildingId,
}); });
factory Device.fromJson(Map<String, dynamic> parsedJson, {bool startKeyWithDest = true}) { factory Device.fromJson(Map<String, dynamic> parsedJson, {bool startKeyWithDest = true}) {
@ -45,9 +51,12 @@ class Device {
modelDefinition: ModelDefinition.fromJson(parsedJson["modelDefinition"]), modelDefinition: ModelDefinition.fromJson(parsedJson["modelDefinition"]),
hospital: Hospital.fromJson(parsedJson["site"]), hospital: Hospital.fromJson(parsedJson["site"]),
destBuildingName: startKeyWithDest ? parsedJson["destBuildingName"] : parsedJson['building']['name'], destBuildingName: startKeyWithDest ? parsedJson["destBuildingName"] : parsedJson['building']['name'],
destBuildingId: startKeyWithDest ? parsedJson["destBuildingName"] : parsedJson['building']['id'],
destDepartmentName: startKeyWithDest ? parsedJson["destDepartmentName"] : parsedJson['department']['departmentName'], destDepartmentName: startKeyWithDest ? parsedJson["destDepartmentName"] : parsedJson['department']['departmentName'],
destDepartmentId: startKeyWithDest ? parsedJson["destDepartmentName"] : parsedJson['department']['id'],
destRoom: startKeyWithDest ? parsedJson["destRoom"] : parsedJson['room'], destRoom: startKeyWithDest ? parsedJson["destRoom"] : parsedJson['room'],
destFloor: startKeyWithDest ? parsedJson["destFloor"] : parsedJson['floor']['name'], destFloor: startKeyWithDest ? parsedJson["destFloor"] : parsedJson['floor']['name'],
destFloorId: startKeyWithDest ? null : parsedJson['floor']['id'],
destSiteName: parsedJson['destSiteName'] destSiteName: parsedJson['destSiteName']
// parsedJson["modelDefinition"] == null ? "" : // parsedJson["modelDefinition"] == null ? "" :
// parsedJson["modelDefinition"]["manufacturerName"], // parsedJson["modelDefinition"]["manufacturerName"],

@ -64,7 +64,7 @@ class _RequestDeviceTransferState extends State<RequestDeviceTransfer> {
_isLoading = true; _isLoading = true;
setState(() {}); setState(() {});
_formModel.sender?.client?.id = _userProvider.user?.clientId; // _formModel.sender?.client?.id = _userProvider.user?.clientId;
int status = await _deviceTransferProvider.createRequest( int status = await _deviceTransferProvider.createRequest(
user: _userProvider.user, user: _userProvider.user,
host: _settingProvider.host, host: _settingProvider.host,
@ -149,6 +149,9 @@ class _RequestDeviceTransferState extends State<RequestDeviceTransfer> {
device: _formModel.device, device: _formModel.device,
onDevicePick: (device) { onDevicePick: (device) {
_formModel.device = device; _formModel.device = device;
_formModel.sender.client = device.hospital;
print("device : ${device.hospital.id}");
print("_formModel : ${_formModel.sender.client.id}");
setState(() {}); setState(() {});
}, },
), ),

Loading…
Cancel
Save