From 6bb2b81ac34a2eec854fb21ced3329768f708655 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 14 Jan 2024 16:53:55 +0300 Subject: [PATCH] improvements & fixes --- lib/extensions/text_extensions.dart | 8 +++++++- lib/l10n/app_ar.arb | 2 +- lib/l10n/app_en.arb | 2 +- lib/models/new_models/gas_refill_model.dart | 7 +++++++ lib/models/service_request/service_request.dart | 4 ++-- lib/new_views/pages/land_page/my_assets_page.dart | 14 -------------- .../pages/land_page/requests/asset_item_view.dart | 4 ++-- .../land_page/requests/gas_refill_item_view.dart | 2 +- .../requests/service_request_item_view.dart | 2 +- .../pages/new_gas_refill_request_page.dart | 9 +++++++++ .../device_transfer/device_transfer_details.dart | 3 ++- .../sub_workorder/create_sub_workorder_page.dart | 4 ++-- .../pages/user/gas_refill/gas_refill_details.dart | 7 ++++++- .../user/requests/create_service_request_page.dart | 4 ++-- .../user/requests/service_request_details.dart | 6 +++--- .../user/requests/update_service_request_page.dart | 4 ++-- .../requests/work_order/create_service_report.dart | 2 +- .../requests/work_order/edit_service_report.dart | 2 +- .../work_order/work_order_details_page.dart | 2 +- .../requests/work_order/work_orders_list_page.dart | 2 +- lib/views/widgets/equipment/asset_detail_page.dart | 8 ++++---- .../widgets/equipment/asset_item_listview.dart | 4 ++-- 22 files changed, 58 insertions(+), 44 deletions(-) delete mode 100644 lib/new_views/pages/land_page/my_assets_page.dart diff --git a/lib/extensions/text_extensions.dart b/lib/extensions/text_extensions.dart index 0cf27d12..d33cee7d 100644 --- a/lib/extensions/text_extensions.dart +++ b/lib/extensions/text_extensions.dart @@ -126,7 +126,13 @@ extension CapExtension on String { String get allInCaps => toUpperCase(); - String get capitalizeFirstOfEach => trim().isNotEmpty ? trim().toLowerCase().split(" ").map((str) => str.inCaps).join(" ") : ""; + String get cleanupWhitespace => replaceAll(RegExp(r"\s+"), " "); + + String get capitalizeFirstOfEach => trim().isNotEmpty + ? trim().toLowerCase().split(" ").map((str) { + return str.trim()?.inCaps ?? ""; + }).join(" ") + : ""; } extension FilesExtension on String { diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb index 6e67aef1..9fabaed9 100644 --- a/lib/l10n/app_ar.arb +++ b/lib/l10n/app_ar.arb @@ -262,7 +262,7 @@ "filter" : "تصنيف", "pickAsset" : "إختر جهاز", "firstAction" : "الإجراء الأول", - "priority" : "أولوية الوظيفة", + "priority" : "أولوية الطلب", "equipmentStatus" : "حالة المعدات", "jopStatus" : "حالة الوظيفة", "attachImage" : "إرفاق صورة", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 7a7dbb54..6a226a11 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -267,7 +267,7 @@ "viewWorkOrder" : "View All Work Order", "createWorkOrder" : "Create Work Order", "serviceDetails": "Service Details", - "priority" : "Jop Priority", + "priority" : "Request Priority", "equipmentStatus" : "Equipment Status", "jopStatus" : "Jop Status", "attachImage" : "Attach Image", diff --git a/lib/models/new_models/gas_refill_model.dart b/lib/models/new_models/gas_refill_model.dart index 1aefd880..5283d2c4 100644 --- a/lib/models/new_models/gas_refill_model.dart +++ b/lib/models/new_models/gas_refill_model.dart @@ -30,6 +30,7 @@ class GasRefillModel { this.department, this.assignedEmployee, this.status, + this.comment, this.gazRefillDetails, this.localEngineerSignature, this.localNurseSignature, @@ -45,6 +46,7 @@ class GasRefillModel { startTime = json['startTime']; endDate = json['endDate']; endTime = json['endTime']; + comment = json['comment']; workingHours = json['workingHours']; try { final sd = DateTime.tryParse(startDate ?? ""); @@ -95,6 +97,7 @@ class GasRefillModel { Department department; AssignedEmployee assignedEmployee; Lookup status; + String comment; List gazRefillDetails; Uint8List localNurseSignature; Uint8List localEngineerSignature; @@ -118,6 +121,7 @@ class GasRefillModel { Department department, AssignedEmployee assignedEmployee, Lookup status, + String comment, List gazRefillDetails, TimerModel timer, }) => @@ -139,6 +143,7 @@ class GasRefillModel { department: department ?? this.department, assignedEmployee: assignedEmployee ?? this.assignedEmployee, status: status ?? this.status, + comment: comment ?? this.comment, gazRefillDetails: gazRefillDetails ?? this.gazRefillDetails, timer: timer ?? this.timer, ); @@ -156,6 +161,7 @@ class GasRefillModel { map['engSignature'] = engSignature; map['nurseSignature'] = nurseSignature; map['workingHours'] = workingHours; + map['comment'] = comment; if (site != null) { map['site'] = site.toJson(addBuildings: false); } @@ -210,6 +216,7 @@ class GasRefillModel { startDate = model.startDate; endDate = model.endDate; expectedDate = model.expectedDate; + comment = model.comment; assignedEmployee = model.assignedEmployee; localEngineerSignature = model.localEngineerSignature; localNurseSignature = model.localNurseSignature; diff --git a/lib/models/service_request/service_request.dart b/lib/models/service_request/service_request.dart index b2eebd6f..370acc93 100644 --- a/lib/models/service_request/service_request.dart +++ b/lib/models/service_request/service_request.dart @@ -150,13 +150,13 @@ class ServiceRequest { await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.priority}"); return false; } else if (defectType == null) { - await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.jopStatus}"); + await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.equipmentStatus}"); return false; } else if (requestedThrough == null) { await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.status}"); return false; } else if (type == null) { - await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.costCodeName}"); + await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.requestType}"); return false; } return true; diff --git a/lib/new_views/pages/land_page/my_assets_page.dart b/lib/new_views/pages/land_page/my_assets_page.dart deleted file mode 100644 index cbb5f6d8..00000000 --- a/lib/new_views/pages/land_page/my_assets_page.dart +++ /dev/null @@ -1,14 +0,0 @@ -import 'package:flutter/material.dart'; - -class MyAssetsPage extends StatelessWidget { - const MyAssetsPage({Key key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return const Scaffold( - body: Center( - child: Text("My Assets"), - ), - ); - } -} diff --git a/lib/new_views/pages/land_page/requests/asset_item_view.dart b/lib/new_views/pages/land_page/requests/asset_item_view.dart index 36dafcf9..fcaee7cc 100644 --- a/lib/new_views/pages/land_page/requests/asset_item_view.dart +++ b/lib/new_views/pages/land_page/requests/asset_item_view.dart @@ -49,8 +49,8 @@ class AssetItemView extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ context.translation.deviceTransferRequest.heading5(context), - "${context.translation.from} : ${request.siteTransferFrom}".bodyText(context), - "${context.translation.to} : ${request.siteTransferTo}".bodyText(context), + "${context.translation.from} : ${request.siteTransferFrom?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context), + "${context.translation.to} : ${request.siteTransferTo?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context), request.status.replaceAll("=", ":").bodyText(context), ], ), diff --git a/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart b/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart index acb32d16..c0e83f65 100644 --- a/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart +++ b/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart @@ -43,7 +43,7 @@ class GasRefillItemView extends StatelessWidget { 8.height, context.translation.gasRefillRequest.heading5(context), '${context.translation.gasType}: ${request.gasType}'.bodyText(context), - '${context.translation.site}: ${request.site}'.bodyText(context), + '${context.translation.site}: ${request.site?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context), 8.height, Row( mainAxisSize: MainAxisSize.min, diff --git a/lib/new_views/pages/land_page/requests/service_request_item_view.dart b/lib/new_views/pages/land_page/requests/service_request_item_view.dart index 6b20aad2..0bc18630 100644 --- a/lib/new_views/pages/land_page/requests/service_request_item_view.dart +++ b/lib/new_views/pages/land_page/requests/service_request_item_view.dart @@ -43,7 +43,7 @@ class ServiceRequestItemView extends StatelessWidget { ), 8.height, context.translation.serviceRequest.heading5(context), - '${context.translation.assetName}: ${request.assetName}'.bodyText(context), + '${context.translation.assetName}: ${request.assetName?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context), '${context.translation.assetNumber}: ${request.assetNo}'.bodyText(context), '${context.translation.requestType}: ${request.requestType}'.bodyText(context), '${context.translation.requestNo}: ${request.requestNo}'.bodyText(context), diff --git a/lib/new_views/pages/new_gas_refill_request_page.dart b/lib/new_views/pages/new_gas_refill_request_page.dart index 30327b4d..4b71c92c 100644 --- a/lib/new_views/pages/new_gas_refill_request_page.dart +++ b/lib/new_views/pages/new_gas_refill_request_page.dart @@ -218,6 +218,15 @@ class _NewGasRefillRequestPageState extends State { ); }, ), + 8.height, + AppTextFormField( + labelText: context.translation.comments, + textInputType: TextInputType.multiline, + alignLabelWithHint: true, + onSaved: (text) { + _gasModel.comment = text; + }, + ), 40.height, ], ), diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart index ff91db62..4dd29507 100644 --- a/lib/views/pages/device_transfer/device_transfer_details.dart +++ b/lib/views/pages/device_transfer/device_transfer_details.dart @@ -72,7 +72,8 @@ class _DeviceTransferDetailsState extends State { Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - _buildTextWidget('${context.translation.assetName} : ${_model?.assetName ?? ""}'), + _buildTextWidget('${context.translation.requestNo} : ${_model.transferCode ?? ""}'), + _buildTextWidget('${context.translation.assetName} : ${_model?.assetName?.cleanupWhitespace?.capitalizeFirstOfEach ?? ""}'), _buildTextWidget('${context.translation.assetNumber} : ${_model?.assetNumber ?? ""}'), _buildTextWidget('${context.translation.model} : ${_model?.modelName ?? ""}'), _buildTextWidget('${context.translation.sn} : ${_model?.assetSerialNo ?? ""}'), diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart index 8612bd8b..568e1b6a 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -225,7 +225,7 @@ class _CreateSubWorkOrderPageState extends State { 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.jopStatus, + title: context.translation.equipmentStatus, initialValue: _subWorkOrders.equipmentStatus, onSelect: (value) { _subWorkOrders.equipmentStatus = value; @@ -437,7 +437,7 @@ class _CreateSubWorkOrderPageState extends State { Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.reason}"); return false; } else if (_subWorkOrders.equipmentStatus == null) { - Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.jopStatus}"); + Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.equipmentStatus}"); return false; } else if (_subWorkOrders.calllastSituation == null) { Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.callLastSituation}"); diff --git a/lib/views/pages/user/gas_refill/gas_refill_details.dart b/lib/views/pages/user/gas_refill/gas_refill_details.dart index 94b0308a..340dce54 100644 --- a/lib/views/pages/user/gas_refill/gas_refill_details.dart +++ b/lib/views/pages/user/gas_refill/gas_refill_details.dart @@ -109,11 +109,16 @@ class _GasRefillDetailsPageState extends State { 8.height, '${context.translation.gasRequest}: ${gasRefillModel.gazRefillDetails[0].gasType?.name}'.bodyText(context), '${context.translation.cylinderSize}: ${gasRefillModel.gazRefillDetails[0].cylinderSize?.name}'.bodyText(context), - '${context.translation.site}: ${gasRefillModel.site?.name}'.bodyText(context), + '${context.translation.site}: ${gasRefillModel.site?.name?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context), const Divider().defaultStyle(context), '${context.translation.requestedQuantity}: ${gasRefillModel.gazRefillDetails[0]?.requestedQty ?? 0}'.bodyText(context), '${context.translation.deliveredQuantity}: ${gasRefillModel.gazRefillDetails[0]?.deliverdQty ?? 0}'.bodyText(context), 8.height, + if (gasRefillModel.comment?.isEmpty ?? false) ...[ + const Divider().defaultStyle(context), + gasRefillModel.comment.bodyText(context), + 8.height, + ] ], ).expanded, Column( diff --git a/lib/views/pages/user/requests/create_service_request_page.dart b/lib/views/pages/user/requests/create_service_request_page.dart index 843d7ada..29db3e0e 100644 --- a/lib/views/pages/user/requests/create_service_request_page.dart +++ b/lib/views/pages/user/requests/create_service_request_page.dart @@ -146,7 +146,7 @@ class CreateServiceRequestPageState extends State { 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.jopStatus, + title: context.translation.equipmentStatus, initialValue: _serviceRequest?.defectType, onSelect: (value) { _serviceRequest.defectType = value; @@ -165,7 +165,7 @@ class CreateServiceRequestPageState extends State { Consumer(builder: (context, snapshot, _){ return SingleItemDropDownMenu( context: context, - title: context.translation.costCodeName, + title: context.translation.requestType, enabled: false, initialValue: snapshot.items?.firstWhere((element) => element.value == 1, orElse: () => null), // onSelect: (value) { diff --git a/lib/views/pages/user/requests/service_request_details.dart b/lib/views/pages/user/requests/service_request_details.dart index fc2a026f..06e5f680 100644 --- a/lib/views/pages/user/requests/service_request_details.dart +++ b/lib/views/pages/user/requests/service_request_details.dart @@ -86,7 +86,7 @@ class _ServiceRequestDetailsPageState extends State { ], ), 8.height, - Text(serviceRequest.deviceEnName, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)), + Text(serviceRequest.deviceEnName?.cleanupWhitespace?.capitalizeFirstOfEach, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)), 8.height, Text( '${context.translation.assetNumber}: ${serviceRequest.device.assetNumber}', @@ -127,11 +127,11 @@ class _ServiceRequestDetailsPageState extends State { const Divider().defaultStyle(context), 8.height, Text( - '${context.translation.manufacture}: ${serviceRequest.device.modelDefinition.manufacturerName}', + '${context.translation.manufacture}: ${serviceRequest.device.modelDefinition.manufacturerName?.cleanupWhitespace?.capitalizeFirstOfEach}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), ), Text( - '${context.translation.model}: ${serviceRequest.device.modelDefinition.modelName}', + '${context.translation.model}: ${serviceRequest.device.modelDefinition.modelName?.cleanupWhitespace?.capitalizeFirstOfEach}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), ), 8.height, diff --git a/lib/views/pages/user/requests/update_service_request_page.dart b/lib/views/pages/user/requests/update_service_request_page.dart index b60e791f..071f15f8 100644 --- a/lib/views/pages/user/requests/update_service_request_page.dart +++ b/lib/views/pages/user/requests/update_service_request_page.dart @@ -89,7 +89,7 @@ class _UpdateServiceRequestPageState extends State { 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.jopStatus, + title: context.translation.equipmentStatus, initialValue: widget.serviceRequest?.defectType, onSelect: (value) { widget.serviceRequest.defectType = value; @@ -107,7 +107,7 @@ class _UpdateServiceRequestPageState extends State { 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.costCodeName, + title: context.translation.requestType, initialValue: widget.serviceRequest?.type, onSelect: (value) { widget.serviceRequest.type = value; diff --git a/lib/views/pages/user/requests/work_order/create_service_report.dart b/lib/views/pages/user/requests/work_order/create_service_report.dart index 7feec9fd..815f10fe 100644 --- a/lib/views/pages/user/requests/work_order/create_service_report.dart +++ b/lib/views/pages/user/requests/work_order/create_service_report.dart @@ -185,7 +185,7 @@ class _CreateServiceReportState extends State with TickerPr 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.jopStatus, + title: context.translation.equipmentStatus, initialValue: _serviceReport.equipmentStatus, onSelect: (value) { _serviceReport.equipmentStatus = value; diff --git a/lib/views/pages/user/requests/work_order/edit_service_report.dart b/lib/views/pages/user/requests/work_order/edit_service_report.dart index f0f56b23..7d12c800 100644 --- a/lib/views/pages/user/requests/work_order/edit_service_report.dart +++ b/lib/views/pages/user/requests/work_order/edit_service_report.dart @@ -170,7 +170,7 @@ class _EditServiceReportState extends State with TickerProvid 8.height, SingleItemDropDownMenu( context: context, - title: context.translation.jopStatus, + title: context.translation.equipmentStatus, initialValue: _serviceReport.equipmentStatus, onSelect: (value) { _serviceReport.equipmentStatus = value; diff --git a/lib/views/pages/user/requests/work_order/work_order_details_page.dart b/lib/views/pages/user/requests/work_order/work_order_details_page.dart index a07c6dd9..45ba6287 100644 --- a/lib/views/pages/user/requests/work_order/work_order_details_page.dart +++ b/lib/views/pages/user/requests/work_order/work_order_details_page.dart @@ -57,7 +57,7 @@ class WorkOrderDetailsPage extends StatelessWidget { Text(serviceRequest.requestCode, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)), 8.height, Text( - '${context.translation.assetName}: ${workOrderDetails.callRequest.asset.modelDefinition.assetName}', + '${context.translation.assetName}: ${workOrderDetails.callRequest.asset.modelDefinition.assetName?.cleanupWhitespace?.capitalizeFirstOfEach}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), ), Text( diff --git a/lib/views/pages/user/requests/work_order/work_orders_list_page.dart b/lib/views/pages/user/requests/work_order/work_orders_list_page.dart index 76b3d90e..8a819b72 100644 --- a/lib/views/pages/user/requests/work_order/work_orders_list_page.dart +++ b/lib/views/pages/user/requests/work_order/work_orders_list_page.dart @@ -67,7 +67,7 @@ class WorkOrderListPage extends StatelessWidget { 8.height, Text(serviceRequest.requestCode, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)), Text( - '${context.translation.assetName}: ${workOrders[index].callRequest.asset.modelDefinition.assetName}', + '${context.translation.assetName}: ${workOrders[index].callRequest.asset.modelDefinition.assetName?.cleanupWhitespace?.capitalizeFirstOfEach}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), ), Text( diff --git a/lib/views/widgets/equipment/asset_detail_page.dart b/lib/views/widgets/equipment/asset_detail_page.dart index 141e2833..d5910dd6 100644 --- a/lib/views/widgets/equipment/asset_detail_page.dart +++ b/lib/views/widgets/equipment/asset_detail_page.dart @@ -96,7 +96,7 @@ class _AssetDetailPageState extends State { backgroundColor: AppColor.getRequestStatusColorByName(context, _assetProvider.assetById.commissioningStatus.name), ), if (_assetProvider.assetById.commissioningStatus != null) 8.height, - (_assetProvider.assetById?.modelDefinition?.assetName ?? "-").heading5(context), + (_assetProvider.assetById?.modelDefinition?.assetName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-").heading5(context), 8.height, Row( crossAxisAlignment: CrossAxisAlignment.start, @@ -108,7 +108,7 @@ class _AssetDetailPageState extends State { "${context.translation.modelName}: ${_assetProvider.assetById.modelDefinition.modelName}".bodyText(context), "${context.translation.supplier}: ${_assetProvider.assetById.supplier?.suppliername ?? "-"}".bodyText(context), "${context.translation.manufacture}: ${_assetProvider.assetById.modelDefinition.manufacturerName}".bodyText(context), - "${context.translation.location}: ${_assetProvider.assetById.site.custName}".bodyText(context), + "${context.translation.location}: ${_assetProvider.assetById.site.custName?.cleanupWhitespace?.capitalizeFirstOfEach}".bodyText(context), ], ).expanded, 8.width, @@ -118,8 +118,8 @@ class _AssetDetailPageState extends State { /// TODO: theres no [ORACLE CODE] available to preview // "${context.translation.oracleCode}: ${"-"}".bodyText(context), "${context.translation.snNo}: ${_assetProvider.assetById.multiAssets.first.assetSerialNo}".bodyText(context), - "${context.translation.site}: ${_assetProvider.assetById?.site?.custName ?? "-"}".bodyText(context), - "${context.translation.md}: ${_assetProvider.assetById?.modelDefinition?.modelName ?? "-"}".bodyText(context), + "${context.translation.site}: ${_assetProvider.assetById?.site?.custName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context), + "${context.translation.md}: ${_assetProvider.assetById?.modelDefinition?.modelName?.cleanupWhitespace?.capitalizeFirstOfEach ?? "-"}".bodyText(context), ], ).expanded, ], diff --git a/lib/views/widgets/equipment/asset_item_listview.dart b/lib/views/widgets/equipment/asset_item_listview.dart index 134bf0cd..ce2d58bd 100644 --- a/lib/views/widgets/equipment/asset_item_listview.dart +++ b/lib/views/widgets/equipment/asset_item_listview.dart @@ -38,10 +38,10 @@ class AssetItemListView extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - device.modelDefinition.assetName.heading6(context), + device.modelDefinition.assetName.cleanupWhitespace.capitalizeFirstOfEach.heading6(context), 8.height, "${context.translation.assetNumber} : ${device.assetNumber}".bodyText(context), - "${context.translation.model} : ${device.modelDefinition.modelDefCode}".bodyText(context), + "${context.translation.modelName} : ${device.modelDefinition.modelName}".cleanupWhitespace.capitalizeFirstOfEach.bodyText(context), ], ), Row(