From 99ef704913755ca1d530f1583e26b651498516fd Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 25 Mar 2025 14:43:12 +0300 Subject: [PATCH] rename points done --- lib/dashboard_latest/dashboard_provider.dart | 8 ++++---- .../new_models/work_order_detail_model.dart | 8 ++++---- .../my_request/all_requests_filter_page.dart | 16 +++++++++++----- .../pages/land_page/requests/ppm_item_view.dart | 6 ++++-- .../requests/service_request_item_view.dart | 10 ++++++---- .../views/components/asset_detail_card.dart | 2 +- .../forms/asset_retired/verify_asset_detail.dart | 15 ++++++++------- lib/views/pages/user/ppm/ppm_details_page.dart | 4 ++-- .../components/task_info_widget.dart | 2 +- .../pages/user/ppm/update_ppm/wo_info_form.dart | 5 +---- 10 files changed, 42 insertions(+), 34 deletions(-) diff --git a/lib/dashboard_latest/dashboard_provider.dart b/lib/dashboard_latest/dashboard_provider.dart index d763092d..db07f571 100644 --- a/lib/dashboard_latest/dashboard_provider.dart +++ b/lib/dashboard_latest/dashboard_provider.dart @@ -367,16 +367,16 @@ class CategoryTabs { if (userType == UsersTypes.engineer) { // tabs.add(CategoryTabs(label: 'Upcoming', tag: 0, id: 0)); // tabs.add(CategoryTabs('Open', 1)); - tabs.add(CategoryTabs(label: 'UnAssigned Open', tag: 1, id: 1)); - tabs.add(CategoryTabs(label: 'Assigned Open', tag: 1, id: 2)); + tabs.add(CategoryTabs(label: 'UnAssigned', tag: 1, id: 1)); + tabs.add(CategoryTabs(label: 'Open', tag: 1, id: 2)); tabs.add(CategoryTabs(label: 'In Progress', tag: 2, id: 3)); tabs.add(CategoryTabs(label: 'Completed', tag: 3, id: 4)); return tabs; } - tabs.add(CategoryTabs(label: 'Open Request', tag: 1, id: 2)); + tabs.add(CategoryTabs(label: 'Open', tag: 1, id: 2)); tabs.add(CategoryTabs(label: 'In Progress', tag: 2, id: 3)); - tabs.add(CategoryTabs(label: 'Upcoming', tag: 3, id: 1)); + tabs.add(CategoryTabs(label: 'Pending Acknowledgement', tag: 3, id: 1)); tabs.add(CategoryTabs(label: 'Canceled', tag: 6, id: 4)); return tabs; } diff --git a/lib/models/new_models/work_order_detail_model.dart b/lib/models/new_models/work_order_detail_model.dart index 8117d902..d98565e3 100644 --- a/lib/models/new_models/work_order_detail_model.dart +++ b/lib/models/new_models/work_order_detail_model.dart @@ -281,7 +281,7 @@ class WorkOrderAssignedEmployee { required this.languageId, }); - dynamic userId; + String userId; String? userName; String? email; int? languageId; @@ -357,7 +357,7 @@ class Activities { activityStatus = json['activityStatus'] != null ? Lookup.fromJson(json['activityStatus']) : null; activityMaintenance = json['activityMaintenance'] != null ? ActivityMaintenance.fromJson(json['activityMaintenance']) : null; if (activityMaintenance != null) { - activityType = 'Maintenance Request'; + activityType = 'CM Activity'; } activitySparePart = json['activitySparePart'] != null ? ActivitySparePart.fromJson(json['activitySparePart']) : null; @@ -504,9 +504,9 @@ class WorkOrderContactPerson { String? name; String? employeeId; String? position; - dynamic extension; + String extension; String? email; - dynamic mobilePhone; + String mobilePhone; WorkOrderAssignedEmployee? contactUser; factory WorkOrderContactPerson.fromJson(Map json) { diff --git a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart index 0ce17697..684eb99d 100644 --- a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart +++ b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart @@ -1,9 +1,11 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; +import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/models/search_all_requests_model.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; @@ -43,6 +45,7 @@ class _AllRequestsFilterPageState extends State { @override Widget build(BuildContext context) { + bool isEngineer = (Provider.of(context, listen: false).user?.type) == UsersTypes.engineer; if (search == null) { search = SearchAllRequestsModel( requestNumber: SearchByRequestNumberModel(context, controller: TextEditingController()), @@ -59,14 +62,17 @@ class _AllRequestsFilterPageState extends State { context.translation.gasRefill: 2, context.translation.deviceTransfer: 3, context.translation.preventiveMaintenance: 4, - context.translation.recurrentWo: 5, }; + if (isEngineer) { + types.addAll({context.translation.recurrentWo: 5}); + } final statuses = { - context.translation.allRequests: 0, + "All WO": 0, context.translation.open: 1, context.translation.inProgress: 2, context.translation.completed: 4, context.translation.closed: 3, + "Canceled": 5, }; return Scaffold( appBar: DefaultAppBar( @@ -99,7 +105,7 @@ class _AllRequestsFilterPageState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - context.translation.requestStatus.heading5(context), + "WO Status".heading5(context), 8.height, RequestsTypeFilter( initialValues: search?.statuses ?? [], @@ -116,7 +122,7 @@ class _AllRequestsFilterPageState extends State { }, ), 16.height, - context.translation.typeOfRequest.heading5(context), + "Type of WO".heading5(context), 8.height, RequestsTypeFilter( initialValues: search?.typeTransaction ?? [], @@ -155,7 +161,7 @@ class _AllRequestsFilterPageState extends State { ], ), 16.height, - "Archived Requests".heading5(context), + "Archived WO".heading5(context), // 8.height, Row( children: [ diff --git a/lib/new_views/pages/land_page/requests/ppm_item_view.dart b/lib/new_views/pages/land_page/requests/ppm_item_view.dart index a4569881..ba30b5c7 100644 --- a/lib/new_views/pages/land_page/requests/ppm_item_view.dart +++ b/lib/new_views/pages/land_page/requests/ppm_item_view.dart @@ -49,10 +49,11 @@ class PpmItemView extends StatelessWidget { 8.height, (requestData?.typeTransaction ?? context.translation.ppmRequest).heading5(context), 8.height, + '${context.translation.assetName}: ${requestData!.assetName}'.bodyText(context), '${context.translation.assetNumber}: ${requestData!.assetNumber}'.bodyText(context), // '${context.translation.assetSN}: ${request.assetSN}'.bodyText(context),//todo ask ahmed // '${context.translation.code}: ${request.code}'.bodyText(context), - '${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context), + 'PM No: ${requestData!.requestNo}'.bodyText(context), 16.height, Row( mainAxisSize: MainAxisSize.min, @@ -99,10 +100,11 @@ class PpmItemView extends StatelessWidget { 8.height, (requestDetails?.nameOfType ?? context.translation.ppmRequest).heading5(context), 8.height, + '${context.translation.assetName}: ${requestDetails!.assetName}'.bodyText(context), '${context.translation.assetNumber}: ${requestDetails!.assetNo}'.bodyText(context), '${context.translation.assetSN}: ${requestDetails!.assetSN}'.bodyText(context), // '${context.translation.code}: ${request.code}'.bodyText(context), - '${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context), + 'PM No: ${requestDetails!.requestNo}'.bodyText(context), 16.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 e9b09bbc..928dc950 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 @@ -55,7 +55,7 @@ class ServiceRequestItemView extends StatelessWidget { '${context.translation.assetName}: ${requestData!.assetName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context), // '${context.translation.assetNumber}: ${request.assetNo}'.bodyText(context), // '${context.translation.requestType}: ${requestData!.requestTypeName}'.bodyText(context), - '${context.translation.requestNo}: ${requestData!.requestNo}'.bodyText(context), + 'CM Number: ${requestData!.requestNo}'.bodyText(context), if (requestData?.statusName == 'Canceled') ...[ '${context.translation.rejectionReason}: ${requestData!.rejectReason}'.bodyText(context), ], @@ -110,10 +110,12 @@ class ServiceRequestItemView extends StatelessWidget { 8.height, (requestDetails!.nameOfType ?? context.translation.correctiveMaintenance).heading5(context), 8.height, - '${context.translation.assetName}: ${requestDetails!.assetName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context), + + // '${context.translation.requestType}: ${requestDetails!.requestType}'.bodyText(context), + 'CM Number: ${requestDetails!.requestNo}'.bodyText(context), '${context.translation.assetNumber}: ${requestDetails!.assetNo}'.bodyText(context), - '${context.translation.requestType}: ${requestDetails!.requestType}'.bodyText(context), - '${context.translation.requestNo}: ${requestDetails!.requestNo}'.bodyText(context), + '${context.translation.assetName}: ${requestDetails!.assetName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context), + 8.height, Row( // mainAxisSize: MainAxisSize.min, diff --git a/lib/service_request_latest/views/components/asset_detail_card.dart b/lib/service_request_latest/views/components/asset_detail_card.dart index f86b30ad..2ba75907 100644 --- a/lib/service_request_latest/views/components/asset_detail_card.dart +++ b/lib/service_request_latest/views/components/asset_detail_card.dart @@ -47,7 +47,7 @@ class AssetDetailCard extends StatelessWidget { ]), 6.height, Text( - context.translation.assetSituation, + "Work Order Details", style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), ), Text( diff --git a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart b/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart index c0f9942e..25c26a43 100644 --- a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart +++ b/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; @@ -215,12 +214,14 @@ class _VerifyAssetDetailsState extends State with TickerProv } }, ), - 12.height, - context.translation.solutions.heading6(context).custom(color: AppColor.neutral50), - 8.height, - requestDetailProvider.engineerUpdateWorkOrderHelperModel?.solution != null - ? requestDetailProvider.engineerUpdateWorkOrderHelperModel!.solution!.bodyText2(context).custom(color: AppColor.neutral120) - : const SizedBox(), + if (requestDetailProvider.engineerUpdateWorkOrderHelperModel?.solution != null) ...[ + 12.height, + context.translation.solutions.heading6(context).custom(color: AppColor.neutral50), + 8.height, + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.solution != null + ? requestDetailProvider.engineerUpdateWorkOrderHelperModel!.solution!.bodyText2(context).custom(color: AppColor.neutral120) + : const SizedBox(), + ] ], ).toShadowContainer(context).paddingAll(16), ).expanded, diff --git a/lib/views/pages/user/ppm/ppm_details_page.dart b/lib/views/pages/user/ppm/ppm_details_page.dart index 107cc4d7..ecd40444 100644 --- a/lib/views/pages/user/ppm/ppm_details_page.dart +++ b/lib/views/pages/user/ppm/ppm_details_page.dart @@ -97,7 +97,7 @@ class _PpmDetailsPageState extends State { // '${context.translation.expectDate}: ${planPreventiveVisit.expectedDate?.toAssetDetailsFormat ?? ""}'.bodyText(context), //todo @baha, '${context.translation.actualDate}: ${planPreventiveVisit.acutalDateOfVisit?.toIso8601String().toAssetDetailsFormat ?? ""}'.bodyText(context), //todo @baha, const Divider().defaultStyle(context), - '${context.translation.engineerName}: ${planPreventiveVisit.assignedEmployee?.userName ?? ""}'.bodyText(context), //todo @baha, + '${context.translation.assignedEmployee}: ${planPreventiveVisit.assignedEmployee?.userName ?? ""}'.bodyText(context), //todo @baha, '${context.translation.site}: ${planPreventiveVisit.siteName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context), //todo @baha, '${context.translation.building}: ${planPreventiveVisit.buildingName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context), //todo @baha, '${context.translation.floor}: ${planPreventiveVisit.floorName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context), //todo @baha, @@ -112,7 +112,7 @@ class _PpmDetailsPageState extends State { await Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdatePpm(ppm: null, planPreventiveVisit: planPreventiveVisit))); getVisitData(); }, - label: context.translation.updateRequest, + label: context.translation.updateWorkOrder, ).paddingAll(16) ]); }), diff --git a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart index 407449bc..4e418aa3 100644 --- a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart +++ b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart @@ -40,7 +40,7 @@ class RecurrentTaskInfoWidget extends StatelessWidget { 2.height, '${context.translation.taskNo}: ${model!.taskNo!}'.bodyText2(context).custom(color: AppColor.neutral120), '${context.translation.site}: ${model!.site!.siteName!}'.bodyText2(context).custom(color: AppColor.neutral120), - '${context.translation.assignEngineer}: ${model!.engineer!.userName ?? ""}'.bodyText2(context).custom(color: AppColor.neutral120), + '${context.translation.assignedEmployee}: ${model!.engineer!.userName ?? ""}'.bodyText2(context).custom(color: AppColor.neutral120), '${context.translation.scheduledDate}: ${model!.scheduleDate!.toMonthYearFormat}'.bodyText2(context).custom(color: AppColor.neutral120), ], ).toShadowContainer(context), diff --git a/lib/views/pages/user/ppm/update_ppm/wo_info_form.dart b/lib/views/pages/user/ppm/update_ppm/wo_info_form.dart index a5e23ea4..b1b44b66 100644 --- a/lib/views/pages/user/ppm/update_ppm/wo_info_form.dart +++ b/lib/views/pages/user/ppm/update_ppm/wo_info_form.dart @@ -78,9 +78,6 @@ class _WoInfoFormState extends State { '${context.translation.pmPlanNo}: ${widget.planPreventiveVisit.planNo}'.bodyText2(context).custom(color: AppColor.neutral120), //need to add in translation it's suggestion from ahmed.. 'Work Order Number: ${widget.planPreventiveVisit.visitNo}'.bodyText2(context).custom(color: AppColor.neutral120), - '${context.translation.from}: ${widget.planPreventiveVisit.fromDate?.toMonthYearFormat}'.bodyText2(context).custom(color: AppColor.neutral120), - '${context.translation.to}: ${widget.planPreventiveVisit.toDate?.toMonthYearFormat}'.bodyText2(context).custom(color: AppColor.neutral120), - '${context.translation.nextPmDate}: ${widget.planPreventiveVisit.nextPMDate != null ? widget.planPreventiveVisit.nextPMDate!.toMonthYearFormat : '-'}' .bodyText2(context) .custom(color: AppColor.neutral120), @@ -248,7 +245,7 @@ class _WoInfoFormState extends State { _timerWidget(context, totalWorkingHours), 8.height, AppTextFormField( - labelText: context.translation.callComments, + labelText: context.translation.comment, backgroundColor: AppColor.neutral100, showShadow: false, initialValue: (widget.planPreventiveVisit.comments ?? "").toString(),