Fix building, floor, room issue when edit sender or receiver

main_design2.0
zaid_daoud 2 years ago
parent a26684de11
commit 3e314447c6

@ -1,4 +1,5 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:developer';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:http/http.dart'; import 'package:http/http.dart';
@ -204,9 +205,9 @@ class DeviceTransferProvider extends ChangeNotifier {
"senderAttachmentName": newModel?.signature ?? "", "senderAttachmentName": newModel?.signature ?? "",
"destSiteId": oldModel.receiver.client?.id, "destSiteId": oldModel.receiver.client?.id,
"destDepartmentId": oldModel.receiver.department?.id, "destDepartmentId": oldModel.receiver.department?.id,
"destBuildingId": oldModel.receiver.building?.id, "destBuildingId": oldModel.device?.destBuildingId,
"destFloorId": oldModel.receiver.floor?.id, "destFloorId": oldModel.device?.destFloorId,
"destRoom": oldModel.receiver?.room, "destRoom": oldModel.device?.destRoom,
"receiverAssignedEmployeeId": oldModel.receiver.userId, "receiverAssignedEmployeeId": oldModel.receiver.userId,
"receiverMachineStatusId": oldModel.receiver.status.id ?? "", "receiverMachineStatusId": oldModel.receiver.status.id ?? "",
"receiverComment": oldModel.receiver.comment, "receiverComment": oldModel.receiver.comment,
@ -230,9 +231,9 @@ class DeviceTransferProvider extends ChangeNotifier {
"senderAttachmentName": oldModel.sender?.signature ?? "", "senderAttachmentName": oldModel.sender?.signature ?? "",
"destSiteId": newModel.client?.id, "destSiteId": newModel.client?.id,
"destDepartmentId": newModel.department?.id, "destDepartmentId": newModel.department?.id,
"destBuildingId": newModel.building?.id, "destBuildingId": oldModel.device?.destBuildingId,
"destFloorId": newModel.floor?.id, "destFloorId": oldModel.device?.destFloorId,
"destRoom": newModel.room, "destRoom": oldModel.device?.destRoom,
"receiverAssignedEmployeeId": newModel.userId, "receiverAssignedEmployeeId": newModel.userId,
"receiverMachineStatusId": newModel.status?.id ?? "", "receiverMachineStatusId": newModel.status?.id ?? "",
"receiverComment": newModel.comment, "receiverComment": newModel.comment,
@ -245,7 +246,7 @@ class DeviceTransferProvider extends ChangeNotifier {
} }
if (true) {} if (true) {}
//body.addAll(newModel.toJson(isSender)); //body.addAll(newModel.toJson(isSender));
print(body); log(body?.toString());
Response response; Response response;
try { try {
response = await ApiManager.instance.put(URLs.updateDeviceTransfer, body: body); response = await ApiManager.instance.put(URLs.updateDeviceTransfer, body: body);

@ -56,8 +56,11 @@ class DeviceTransfer {
number: parsedJson["assetNumber"], number: parsedJson["assetNumber"],
assetName: parsedJson["assetName"], assetName: parsedJson["assetName"],
serialNumber: parsedJson["assetSerialNo"], serialNumber: parsedJson["assetSerialNo"],
destBuildingId: parsedJson["destBuildingId"],
destBuildingName: parsedJson["destBuildingName"], destBuildingName: parsedJson["destBuildingName"],
destDepartmentId: parsedJson["destDepartmentId"],
destDepartmentName: parsedJson["destDepartmentName"], destDepartmentName: parsedJson["destDepartmentName"],
destFloorId: parsedJson["destFloorId"],
destFloor: parsedJson["destFloorName"], destFloor: parsedJson["destFloorName"],
destRoom: parsedJson["destRoom"], destRoom: parsedJson["destRoom"],
destSiteName: parsedJson["destSiteName"], destSiteName: parsedJson["destSiteName"],

@ -9,9 +9,6 @@ class DeviceTransferInfo {
String comment; String comment;
Hospital client; Hospital client;
Department department; Department department;
Buildings building;
Floors floor;
String room;
String workingHours; String workingHours;
// DateTime startDate; // DateTime startDate;
@ -37,9 +34,6 @@ class DeviceTransferInfo {
this.status, this.status,
this.assignedEmployeeName, this.assignedEmployeeName,
this.timer, this.timer,
this.building,
this.room,
this.floor,
}); });
Map<String, String> toJson(bool isSender) { Map<String, String> toJson(bool isSender) {
@ -69,19 +63,6 @@ class DeviceTransferInfo {
userName = old.userName; userName = old.userName;
client = Hospital.fromHospital(old.client); client = Hospital.fromHospital(old.client);
department = Department.fromDepartment(old.department); department = Department.fromDepartment(old.department);
building = Buildings(
id: old.building?.id,
name: old.building?.name,
value: old.building?.value,
floors: old.building?.floors,
);
floor = Floors(
id: old.floor?.id,
name: old.floor?.name,
value: old.floor?.value,
departments: old.floor?.departments,
);
room = old.room;
workingHours = old.workingHours; workingHours = old.workingHours;
// startDate = old.startDate; // startDate = old.startDate;
// endDate = old.endDate; // endDate = old.endDate;
@ -113,19 +94,6 @@ class DeviceTransferInfo {
id: parsedJson["${key}DepartmentId"], id: parsedJson["${key}DepartmentId"],
name: parsedJson["${key}DepartmentName"], name: parsedJson["${key}DepartmentName"],
), ),
building: Buildings(
id: parsedJson["${key}BuildingId"],
name: parsedJson["${key}BuildingName"],
),
floor: Floors(
id: parsedJson["${key}FloorId"],
name: parsedJson["${key}FloorName"],
),
room: parsedJson["${key}Room"],
status: Lookup(
id: parsedJson["${key}status"],
name: parsedJson["${key}status"],
),
); );
} }
} }

@ -144,13 +144,15 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
ASmallButton( ASmallButton(
text: _subtitle.edit, text: _subtitle.edit,
onPressed: (_isSender) onPressed: (_isSender)
? ( _model.sender.status?.name=="Closed" ? null: () { ? (_model.sender.status?.name == "Closed"
Navigator.of(context).push(MaterialPageRoute( ? null
builder: (_) => UpdateDeviceTransfer( : () {
model: _model, Navigator.of(context).push(MaterialPageRoute(
isSender: true, builder: (_) => UpdateDeviceTransfer(
))); model: _model,
}) isSender: true,
)));
})
: null, : null,
), ),
], ],
@ -170,13 +172,15 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
ASmallButton( ASmallButton(
text: _subtitle.edit, text: _subtitle.edit,
onPressed: (_isReceiver) onPressed: (_isReceiver)
? ( _model.receiver.status?.name=="Closed" ? null: () { ? (_model.receiver.status?.name == "Closed"
Navigator.of(context).push(MaterialPageRoute( ? null
builder: (_) => UpdateDeviceTransfer( : () {
model: _model, Navigator.of(context).push(MaterialPageRoute(
isSender: false, builder: (_) => UpdateDeviceTransfer(
))); model: _model,
}) isSender: false,
)));
})
: null, : null,
), ),
], ],

Loading…
Cancel
Save