From 8ada0dd0af05c0aa00dcaf4d652055d0af858831 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 13 Jul 2023 08:46:25 +0300 Subject: [PATCH] fixes-1 --- lib/models/device/device.dart | 5 +++++ lib/models/device/device_transfer.dart | 1 + .../pages/device_transfer/device_transfer_details.dart | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/models/device/device.dart b/lib/models/device/device.dart index 113e928e..40d2f92b 100644 --- a/lib/models/device/device.dart +++ b/lib/models/device/device.dart @@ -7,6 +7,7 @@ class Device { int id; String serialNumber; String number; + String assetName; String destBuildingName; String destDepartmentName; String destRoom; @@ -21,6 +22,7 @@ class Device { this.id, this.serialNumber, this.number, + this.assetName, this.hospital, this.destBuildingName, this.destDepartmentName, @@ -33,10 +35,12 @@ class Device { }); factory Device.fromJson(Map parsedJson) { + print("parsedJson:$parsedJson"); return Device( id: parsedJson["id"], serialNumber: parsedJson["assetSerialNo"], number: parsedJson["assetNumber"], + assetName: parsedJson["assetName"], modelDefinition: ModelDefinition.fromJson(parsedJson["modelDefinition"]), hospital: Hospital.fromJson(parsedJson["site"]), destBuildingName: parsedJson["destBuildingName"], @@ -66,6 +70,7 @@ class Device { 'id': id, 'assetSerialNo': serialNumber, 'assetNumber': number, + 'assetName': assetName, 'modelDefinition': modelDefinition.toJson(), 'site': hospital.toMap(), 'AssetType': assetType.toMap(), diff --git a/lib/models/device/device_transfer.dart b/lib/models/device/device_transfer.dart index 9c0d3e28..ec1d5bfb 100644 --- a/lib/models/device/device_transfer.dart +++ b/lib/models/device/device_transfer.dart @@ -50,6 +50,7 @@ class DeviceTransfer { device: Device( id: parsedJson["assetId"], number: parsedJson["assetNumber"], + assetName: parsedJson["assetName"], serialNumber: parsedJson["assetSerialNo"], destBuildingName: parsedJson["destBuildingName"], destDepartmentName: parsedJson["destDepartmentName"], diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart index e9d0a93d..4d6e7e24 100644 --- a/lib/views/pages/device_transfer/device_transfer_details.dart +++ b/lib/views/pages/device_transfer/device_transfer_details.dart @@ -89,12 +89,12 @@ class _DeviceTransferDetailsState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ RequestInfoRow( - title: "Id", - info: widget.model.id?.toString(), + title: "Transfer Id", + info: widget.model.title?.toString(), ), RequestInfoRow( title: _subtitle.assetName, - info: widget.model.title, + info: widget.model.device.assetName, ), RequestInfoRow( title: _subtitle.assetSN,