design_3.0_internal_audit_module
Sikander Saleem 3 years ago
parent da286ea075
commit 8ada0dd0af

@ -7,6 +7,7 @@ class Device {
int id; int id;
String serialNumber; String serialNumber;
String number; String number;
String assetName;
String destBuildingName; String destBuildingName;
String destDepartmentName; String destDepartmentName;
String destRoom; String destRoom;
@ -21,6 +22,7 @@ class Device {
this.id, this.id,
this.serialNumber, this.serialNumber,
this.number, this.number,
this.assetName,
this.hospital, this.hospital,
this.destBuildingName, this.destBuildingName,
this.destDepartmentName, this.destDepartmentName,
@ -33,10 +35,12 @@ class Device {
}); });
factory Device.fromJson(Map<String, dynamic> parsedJson) { factory Device.fromJson(Map<String, dynamic> parsedJson) {
print("parsedJson:$parsedJson");
return Device( return Device(
id: parsedJson["id"], id: parsedJson["id"],
serialNumber: parsedJson["assetSerialNo"], serialNumber: parsedJson["assetSerialNo"],
number: parsedJson["assetNumber"], number: parsedJson["assetNumber"],
assetName: parsedJson["assetName"],
modelDefinition: ModelDefinition.fromJson(parsedJson["modelDefinition"]), modelDefinition: ModelDefinition.fromJson(parsedJson["modelDefinition"]),
hospital: Hospital.fromJson(parsedJson["site"]), hospital: Hospital.fromJson(parsedJson["site"]),
destBuildingName: parsedJson["destBuildingName"], destBuildingName: parsedJson["destBuildingName"],
@ -66,6 +70,7 @@ class Device {
'id': id, 'id': id,
'assetSerialNo': serialNumber, 'assetSerialNo': serialNumber,
'assetNumber': number, 'assetNumber': number,
'assetName': assetName,
'modelDefinition': modelDefinition.toJson(), 'modelDefinition': modelDefinition.toJson(),
'site': hospital.toMap(), 'site': hospital.toMap(),
'AssetType': assetType.toMap(), 'AssetType': assetType.toMap(),

@ -50,6 +50,7 @@ class DeviceTransfer {
device: Device( device: Device(
id: parsedJson["assetId"], id: parsedJson["assetId"],
number: parsedJson["assetNumber"], number: parsedJson["assetNumber"],
assetName: parsedJson["assetName"],
serialNumber: parsedJson["assetSerialNo"], serialNumber: parsedJson["assetSerialNo"],
destBuildingName: parsedJson["destBuildingName"], destBuildingName: parsedJson["destBuildingName"],
destDepartmentName: parsedJson["destDepartmentName"], destDepartmentName: parsedJson["destDepartmentName"],

@ -89,12 +89,12 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
RequestInfoRow( RequestInfoRow(
title: "Id", title: "Transfer Id",
info: widget.model.id?.toString(), info: widget.model.title?.toString(),
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.assetName, title: _subtitle.assetName,
info: widget.model.title, info: widget.model.device.assetName,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.assetSN, title: _subtitle.assetSN,

Loading…
Cancel
Save