From d2e4c8276cc832e53f30c21a836f8bc9f9cf24e0 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 31 Mar 2024 11:16:14 +0300 Subject: [PATCH] snag points added. --- lib/controllers/api_routes/urls.dart | 4 ++-- lib/views/widgets/equipment/asset_detail_page.dart | 5 ++++- lib/views/widgets/equipment/pick_asset.dart | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index 3a955242..93b44b52 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -1,8 +1,8 @@ class URLs { URLs._(); - // static const host1 = "https://atomsm.hmg.com"; // production url - static const host1 = "https://atomsmdev.hmg.com"; // local UAT url + static const host1 = "https://atomsm.hmg.com"; // production url + // static const host1 = "https://atomsmdev.hmg.com"; // local UAT url static String _baseUrl = "$_host/mobile"; diff --git a/lib/views/widgets/equipment/asset_detail_page.dart b/lib/views/widgets/equipment/asset_detail_page.dart index 5132d55a..3f6e3beb 100644 --- a/lib/views/widgets/equipment/asset_detail_page.dart +++ b/lib/views/widgets/equipment/asset_detail_page.dart @@ -109,7 +109,7 @@ class _AssetDetailPageState extends State { "${context.translation.modelName}: ${assetModel.modelDefinition.modelName}".bodyText(context), "${context.translation.supplier}: ${assetModel.supplier?.suppliername ?? "-"}".bodyText(context), "${context.translation.manufacture}: ${assetModel.modelDefinition.manufacturerName}".bodyText(context), - "${context.translation.location}: ${assetModel.site.custName?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context), + //"${context.translation.location}: ${assetModel.site.custName?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context), ], ).expanded, 8.width, @@ -120,7 +120,10 @@ class _AssetDetailPageState extends State { // "${context.translation.oracleCode}: ${"-"}".bodyText(context), "${context.translation.snNo}: ${assetModel.multiAssets.first.assetSerialNo}".bodyText(context), "${context.translation.site}: ${assetModel?.site?.custName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context), + "${context.translation.building}: ${assetModel?.building?.name?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context), + "${context.translation.floor}: ${assetModel?.floor?.name?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context), "${context.translation.md}: ${assetModel?.department?.departmentName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context), + "${context.translation.room}: ${assetModel?.room?.value ?? "-"}".bodyText(context), ], ).expanded, ], diff --git a/lib/views/widgets/equipment/pick_asset.dart b/lib/views/widgets/equipment/pick_asset.dart index 6433c02a..080db07d 100644 --- a/lib/views/widgets/equipment/pick_asset.dart +++ b/lib/views/widgets/equipment/pick_asset.dart @@ -47,7 +47,7 @@ class PickAsset extends StatelessWidget { onPickAsset(device); } }).expanded, - if (forPPM) + if (device != null) Icon(Icons.change_circle_rounded, size: 22, color: context.isDark ? AppColor.primary40 : AppColor.primary70) else "qr".toSvgAsset(height: 24, fit: BoxFit.fitHeight, color: context.isDark ? AppColor.primary40 : AppColor.primary70),