From 22b312f8fe9b611bcbc0d7bac9d230fffe2ca296 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 1 Nov 2026 09:57:23 +0300 Subject: [PATCH] merge conflict resolved. --- .../widgets/equipment/asset_detail_page.dart | 2 +- .../widgets/equipment/asset_details_view.dart | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/lib/views/widgets/equipment/asset_detail_page.dart b/lib/views/widgets/equipment/asset_detail_page.dart index 63c6f383..a01219b4 100644 --- a/lib/views/widgets/equipment/asset_detail_page.dart +++ b/lib/views/widgets/equipment/asset_detail_page.dart @@ -95,7 +95,7 @@ class _AssetDetailPageState extends State { 12.height, TabBarView( children: [ - AssetDetailsView(assetModel: assetModel!, onUpload: _upload), + AssetDetailsView(assetModel: assetModel!, onUpload: _upload, linkAssetTag: _linkAssetTag), AssetDocumentHistoryView(assetId: assetId!), ], ).expanded, diff --git a/lib/views/widgets/equipment/asset_details_view.dart b/lib/views/widgets/equipment/asset_details_view.dart index 81ab2866..af20d167 100644 --- a/lib/views/widgets/equipment/asset_details_view.dart +++ b/lib/views/widgets/equipment/asset_details_view.dart @@ -18,11 +18,13 @@ import 'package:test_sa/views/widgets/requests/request_status.dart'; class AssetDetailsView extends StatefulWidget { final AssetByIdModel assetModel; final VoidCallback onUpload; + final VoidCallback linkAssetTag; const AssetDetailsView({ Key? key, required this.assetModel, required this.onUpload, + required this.linkAssetTag, }) : super(key: key); @override @@ -292,6 +294,35 @@ class _AssetDetailsViewState extends State with SingleTickerPr InfoTextWidget(label: context.translation.installationDate, value: widget.assetModel.installationDate?.toAssetDetailsFormat, showEmptyValue: true), InfoTextWidget(label: context.translation.nextPmDate, value: widget.assetModel.nextPMDate?.toAssetDetailsFormat, showEmptyValue: true), InfoTextWidget(label: context.translation.lastPmDate, value: widget.assetModel.lastPMDate?.toAssetDetailsFormat, showEmptyValue: true), + if (widget.assetModel.penguinAssetTagId == null && context.userProvider.isEngineer) ...[ + const Divider().defaultStyle(context), + Row( + mainAxisSize: MainAxisSize.min, + children: [ + const InfoTextLabelWidget(label: '*Asset not linked with tracking tag', color: AppColor.red30).flexible, + Container( + margin: const EdgeInsets.only(left: 12, right: 12), + padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8), + decoration: BoxDecoration( + color: AppColor.primary10, + borderRadius: BorderRadius.circular(35), + ), + child: Text( + "Link Tag", + style: AppTextStyles.bodyText2.copyWith(color: AppColor.addItemButtonColor(context)), + ), + ).onPress(widget.linkAssetTag), + ], + ), + ] else ...[ + const Divider().defaultStyle(context), + InfoHeaderWidget("Tag Information"), + InfoTextWidget(label: "Label", value: widget.assetModel.tagDetails?.label, showEmptyValue: true), + InfoTextWidget(label: "Tag ID", value: widget.assetModel.tagDetails?.tagId, showEmptyValue: true), + InfoTextWidget(label: "MAC Address", value: widget.assetModel.tagDetails?.macAddress, showEmptyValue: true), + // InfoTextWidget(label: "Type", value: assetModel?.tagDetails?.type, showEmptyValue: true), + // InfoTextWidget(label: "Status", value: assetModel?.tagDetails?.status, showEmptyValue: true), + ], ], ), ),