From e3b63c76baf16a1042caa39571d1cc41269c6fa6 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 20 May 2025 18:39:12 +0300 Subject: [PATCH] itg form status added. --- lib/extensions/context_extension.dart | 4 ++++ lib/models/new_models/work_order_detail_model.dart | 4 ++++ .../views/components/activities_list_view.dart | 2 +- .../views/components/service_request_detail_view.dart | 10 ++++++++++ .../views/forms/asset_retired/asset_retired.dart | 1 - 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/extensions/context_extension.dart b/lib/extensions/context_extension.dart index 37347a14..ae450626 100644 --- a/lib/extensions/context_extension.dart +++ b/lib/extensions/context_extension.dart @@ -3,6 +3,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/new_views/swipe_module/dialoge/confirm_dialog.dart'; +import '../controllers/providers/settings/setting_provider.dart'; import '../controllers/providers/settings/setting_provider.dart'; extension BuildContextExtension on BuildContext { @@ -14,6 +15,9 @@ extension BuildContextExtension on BuildContext { bool get isAr => Provider.of(this).language == "ar"; + SettingProvider get settingProvider => Provider.of(this, listen: false); + // UserProvider get userProvider => Provider.of(this, listen: false); + void showConfirmDialog(String message, {String? title, VoidCallback? onTap}) => showDialog( context: this, builder: (BuildContext cxt) => ConfirmDialog( diff --git a/lib/models/new_models/work_order_detail_model.dart b/lib/models/new_models/work_order_detail_model.dart index 3fc360d0..2162d16b 100644 --- a/lib/models/new_models/work_order_detail_model.dart +++ b/lib/models/new_models/work_order_detail_model.dart @@ -99,6 +99,7 @@ class WorkOrderData { required this.workOrderHistory, required this.activities, required this.activityAssetToBeRetireds, + this.itgFormWorkOrderStatus, }); int? requestId; @@ -159,6 +160,7 @@ class WorkOrderData { List workOrderHistory; List activities; List activityAssetToBeRetireds; + String? itgFormWorkOrderStatus; factory WorkOrderData.fromJson(Map json) { return WorkOrderData( @@ -217,6 +219,7 @@ class WorkOrderData { activities: json["activities"] == null ? [] : List.from(json["activities"]!.map((x) => Activities.fromJson(x))), needAVisitDateTime: DateTime.tryParse(json["needAVisitDateTime"] ?? ""), needAVisitComment: json["needAVisitComment"], + itgFormWorkOrderStatus: json["itgFormWorkOrderStatus"], activityAssetToBeRetireds: json["activityAssetToBeRetireds"] == null ? [] : List.from(json["activityAssetToBeRetireds"]!.map((x) => x)), ); } @@ -264,6 +267,7 @@ class WorkOrderData { "workOrderHistory": workOrderHistory.map((x) => x.toJson()).toList(), "activities": activities.map((x) => x.toJson()).toList(), "activityAssetToBeRetireds": activityAssetToBeRetireds.map((x) => x).toList(), + "itgFormWorkOrderStatus": itgFormWorkOrderStatus, }; } diff --git a/lib/modules/cm_module/views/components/activities_list_view.dart b/lib/modules/cm_module/views/components/activities_list_view.dart index c7fc7701..46be8029 100644 --- a/lib/modules/cm_module/views/components/activities_list_view.dart +++ b/lib/modules/cm_module/views/components/activities_list_view.dart @@ -79,7 +79,7 @@ class _ActivitiesListViewState extends State { return Column( children: [ (activities.isEmpty && reOrderActivities.isEmpty) - ? NoDataFound(message: context.translation.noDataFound).expanded + ? NoDataFound(message: context.translation.noDataFound).center.expanded : // : showReorderView // ? ReorderableListView( diff --git a/lib/modules/cm_module/views/components/service_request_detail_view.dart b/lib/modules/cm_module/views/components/service_request_detail_view.dart index 37682b51..358b0ca2 100644 --- a/lib/modules/cm_module/views/components/service_request_detail_view.dart +++ b/lib/modules/cm_module/views/components/service_request_detail_view.dart @@ -120,6 +120,16 @@ class _ServiceRequestDetailViewState extends State { ), 8.width, ], + if(workOrder.itgFormWorkOrderStatus!=null)...[ + StatusLabel( + label: workOrder.itgFormWorkOrderStatus, + id: 0, + radius: 4, + textColor: AppColor.getPriorityStatusTextColor(context, 82), + backgroundColor: AppColor.getPriorityStatusColor(context, 0), + ), + 8.width, + ], StatusLabel( radius: 4, label: workOrder.status!.name, diff --git a/lib/modules/cm_module/views/forms/asset_retired/asset_retired.dart b/lib/modules/cm_module/views/forms/asset_retired/asset_retired.dart index af051bbe..283ed269 100644 --- a/lib/modules/cm_module/views/forms/asset_retired/asset_retired.dart +++ b/lib/modules/cm_module/views/forms/asset_retired/asset_retired.dart @@ -72,7 +72,6 @@ class _AssetRetiredState extends State with TickerProviderStateMix child: Card( child: Column( children: [ - 12.height, SingleItemDropDownMenu( context: context, title: context.translation.retirementType,