diff --git a/lib/models/device/asset_transfer.dart b/lib/models/device/asset_transfer.dart index 969d77eb..6e31cac8 100644 --- a/lib/models/device/asset_transfer.dart +++ b/lib/models/device/asset_transfer.dart @@ -27,6 +27,7 @@ class AssetTransfer { this.senderComment, this.comment, this.receiverEndUserId, + this.receiverEndUserName, this.senderStartDate, this.senderEndDate, this.senderWorkingHours, @@ -92,6 +93,7 @@ class AssetTransfer { senderComment = json['senderComment']; comment = json['comment']; receiverEndUserId = json['receiverEndUserId']; + receiverEndUserName = json['receiverEndUserName']; senderStartDate = json['senderStartDate']; senderEndDate = json['senderEndDate']; senderWorkingHours = json['senderWorkingHours']; @@ -185,6 +187,7 @@ class AssetTransfer { String senderComment; String comment; String receiverEndUserId; + String receiverEndUserName; String senderStartDate; String senderEndDate; String senderWorkingHours; @@ -242,6 +245,7 @@ class AssetTransfer { String senderComment, String comment, String receiverEndUserId, + String receiverEndUserName, String senderStartDate, String senderEndDate, String senderWorkingHours, @@ -307,6 +311,7 @@ class AssetTransfer { senderComment: senderComment ?? this.senderComment, comment: comment ?? this.comment, receiverEndUserId: receiverEndUserId ?? this.receiverEndUserId, + receiverEndUserName: receiverEndUserName ?? this.receiverEndUserName, senderStartDate: senderStartDate ?? this.senderStartDate, senderEndDate: senderEndDate ?? this.senderEndDate, senderWorkingHours: senderWorkingHours ?? this.senderWorkingHours, @@ -372,6 +377,7 @@ class AssetTransfer { map['senderComment'] = senderComment; map['comment'] = comment; map['receiverEndUserId'] = receiverEndUserId; + map['receiverEndUserName'] = receiverEndUserName; map['senderStartDate'] = senderStartDate; map['senderEndDate'] = senderEndDate; map['senderWorkingHours'] = senderWorkingHours; @@ -441,6 +447,7 @@ class AssetTransfer { map['senderComment'] = senderComment; map['comment'] = comment; map['receiverEndUserId'] = receiverEndUserId; + map['receiverEndUserName'] = receiverEndUserName; map['senderStartDate'] = senderStartDate; map['senderEndDate'] = senderEndDate; map['senderWorkingHours'] = senderWorkingHours; @@ -484,6 +491,7 @@ class AssetTransfer { senderComment = assetTransfer.senderComment; comment = assetTransfer.comment; receiverEndUserId = assetTransfer.receiverEndUserId; + receiverEndUserName = assetTransfer.receiverEndUserName; senderStartDate = assetTransfer.senderStartDate; senderEndDate = assetTransfer.senderEndDate; senderWorkingHours = assetTransfer.senderWorkingHours; diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart index 0d7cb030..2fc750f8 100644 --- a/lib/views/pages/device_transfer/device_transfer_details.dart +++ b/lib/views/pages/device_transfer/device_transfer_details.dart @@ -77,6 +77,7 @@ class _DeviceTransferDetailsState extends State { _buildTextWidget('${context.translation.assetNumber} : ${_model?.assetNumber ?? ""}'), _buildTextWidget('${context.translation.model} : ${_model?.modelName ?? ""}'), _buildTextWidget('${context.translation.sn} : ${_model?.assetSerialNo ?? ""}'), + if (_model?.receiverEndUserName != null) _buildTextWidget('${context.translation.receiverName} : ${_model?.receiverEndUserName ?? ""}'), _buildTextWidget('${context.translation.requestNo} : ${_model.transferCode ?? ""}'), if ((_model?.comment ?? "").isNotEmpty) ...[ 8.height,