diff --git a/lib/modules/asset_tracking/asset_tracking_item_view.dart b/lib/modules/asset_tracking/asset_tracking_item_view.dart index 36d9e614..3a502427 100644 --- a/lib/modules/asset_tracking/asset_tracking_item_view.dart +++ b/lib/modules/asset_tracking/asset_tracking_item_view.dart @@ -30,8 +30,9 @@ class AssetTrackingListItemView extends StatelessWidget { backgroundColor: AppColor.getPriorityStatusColor(context, (asset.location?.isLive ?? false) ? 0 : 1), ), 4.height, - isGridView ? InfoHeaderWidget(asset.label ?? "") : InfoHeader16Widget(asset.label ?? ""), - InfoTextWidget(label: "Serial No", value: asset.label, showEmptyValue: true), + isGridView ? InfoHeaderWidget(asset.assetName ?? "") : InfoHeader16Widget(asset.assetName ?? ""), + InfoTextWidget(label: "Label", value: asset.label, showEmptyValue: true), + InfoTextWidget(label: "Serial No", value: asset.serialNumber, showEmptyValue: true), InfoTextWidget(label: "Type", value: asset.type?.name, showEmptyValue: true), InfoTextWidget(label: "Status", value: asset.status?.name, showEmptyValue: true), InfoTextWidget(label: "Department", value: asset.department?.name, showEmptyValue: true), diff --git a/lib/modules/asset_tracking/models/asset_tracking_model.dart b/lib/modules/asset_tracking/models/asset_tracking_model.dart index b97b0130..33ada38f 100644 --- a/lib/modules/asset_tracking/models/asset_tracking_model.dart +++ b/lib/modules/asset_tracking/models/asset_tracking_model.dart @@ -2,6 +2,7 @@ import 'package:test_sa/models/base.dart'; class AssetTrackingModel extends Base { int? id; + String? assetName; String? label; String? serialNumber; int? group; @@ -12,13 +13,14 @@ class AssetTrackingModel extends Base { Tag? tag; Alerts? alerts; - AssetTrackingModel({this.id, this.label, this.serialNumber, this.group, this.type, this.department, this.status, this.location, this.tag, this.alerts}) + AssetTrackingModel({this.id, this.assetName, this.label, this.serialNumber, this.group, this.type, this.department, this.status, this.location, this.tag, this.alerts}) : super(identifier: id?.toString(), name: label); AssetTrackingModel.fromJson(Map json) { id = json['id']; identifier = json['id']?.toString(); label = json['label']; + assetName = json['assetName']; serialNumber = json['serialNumber']; name = "$label ($serialNumber)"; group = json['group']; @@ -34,6 +36,7 @@ class AssetTrackingModel extends Base { final Map data = new Map(); data['id'] = this.id; data['label'] = this.label; + data['assetName'] = this.assetName; data['serialNumber'] = this.serialNumber; data['group'] = this.group; if (this.type != null) {