From cf30e729262c9eff303d9bedcc380b71bb9bc2b1 Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 Date: Mon, 28 Apr 2025 16:53:02 +0300 Subject: [PATCH] added missing information on task detail page and also added value for task on dashboard list --- .../widgets/request_category_list.dart | 64 +++++++++++++------ .../task_request_detail_view.dart | 31 ++++----- .../tasks_request/task_request_item_view.dart | 53 +++++++++++++++ 3 files changed, 110 insertions(+), 38 deletions(-) diff --git a/lib/dashboard_latest/widgets/request_category_list.dart b/lib/dashboard_latest/widgets/request_category_list.dart index 7c651dd3..6999fb78 100644 --- a/lib/dashboard_latest/widgets/request_category_list.dart +++ b/lib/dashboard_latest/widgets/request_category_list.dart @@ -8,6 +8,7 @@ import 'package:test_sa/new_views/pages/land_page/requests/gas_refill_item_view. import 'package:test_sa/new_views/pages/land_page/requests/ppm_item_view.dart'; import 'package:test_sa/new_views/pages/land_page/requests/recurrent_wo_item_view.dart'; import 'package:test_sa/new_views/pages/land_page/requests/service_request_item_view.dart'; +import 'package:test_sa/views/pages/user/tasks_request/task_request_item_view.dart'; class RequestCategoryList extends StatelessWidget { final List list; @@ -34,28 +35,49 @@ class RequestCategoryList extends StatelessWidget { } Widget _buildRequestItem(Data request) { - bool isServiceRequest = request.transactionNo == 1; - bool isGasRefill = request.transactionNo == 2; - bool isAssetTransfer = request.transactionNo == 3; - bool isPPMs = request.transactionNo == 4; - bool isRecurrentTask = request.transactionNo == 5; - - if (isServiceRequest) { - return ServiceRequestItemView(requestData: request); - } else if (isGasRefill) { - return GasRefillItemView(requestData: request); - } else if (isPPMs) { + // bool isServiceRequest = request.transactionNo == 1; + // bool isGasRefill = request.transactionNo == 2; + // bool isAssetTransfer = request.transactionNo == 3; + // bool isPPMs = request.transactionNo == 4; + // bool isRecurrentTask = request.transactionNo == 5; + switch(request.transactionNo){ + case 1: + return ServiceRequestItemView(requestData: request); + case 2: + return GasRefillItemView(requestData: request); + case 3: + return AssetItemView(requestData: request); + case 4: return PpmItemView(requestData: request); - } else if (isAssetTransfer) { - return AssetItemView(requestData: request); - } else if (isRecurrentTask) { - return RecurrentWoItemView(requestData: request); - } else { - return Container( - height: 100, - width: double.infinity, - color: Colors.grey, - ); + case 5: + return RecurrentWoItemView(requestData: request); + case 6: + return TaskRequestItemView(requestData: request,); + default: + return Container( + height: 100, + width: double.infinity, + color: Colors.grey, + ); + } + + // if (isServiceRequest) { + // return ServiceRequestItemView(requestData: request); + // } else if (isGasRefill) { + // return GasRefillItemView(requestData: request); + // } else if (isPPMs) { + // return PpmItemView(requestData: request); + // } else if (isAssetTransfer) { + // return AssetItemView(requestData: request); + // } else if (isRecurrentTask) { + // return RecurrentWoItemView(requestData: request); + // } else { + // return Container( + // height: 100, + // width: double.infinity, + // color: Colors.grey, + // ); + // } } } diff --git a/lib/views/pages/user/tasks_request/task_request_detail_view.dart b/lib/views/pages/user/tasks_request/task_request_detail_view.dart index 73a7005e..e288433b 100644 --- a/lib/views/pages/user/tasks_request/task_request_detail_view.dart +++ b/lib/views/pages/user/tasks_request/task_request_detail_view.dart @@ -94,15 +94,14 @@ class _TaskRequestDetailsViewState extends State { ], ), 8.height, - - if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) ...[installationWidget(taskModel: taskProvider.taskRequestModel!)], - if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[ - assetDetails(taskModel: taskProvider.taskRequestModel!), + if (taskProvider.taskRequestModel?.taskType?.relatedTo?.value == 1) ...[ + assetDetails(taskModel: taskProvider.taskRequestModel!), ], + if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) ...[installationWidget(taskModel: taskProvider.taskRequestModel!)], if (taskProvider.taskRequestModel?.taskType?.relatedTo?.value == 2) ...[ linkWithLocationWidget(taskModel: taskProvider.taskRequestModel!), ], - 8.height, + const Divider().defaultStyle(context), Text( "Task Details".addTranslation, style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), @@ -111,8 +110,14 @@ class _TaskRequestDetailsViewState extends State { '${context.translation.taskNo}: ${widget.requestDetails?.requestNo ?? "-"}'.bodyText(context), if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[ recallAlertTypeWidget(taskModel: taskProvider.taskRequestModel!), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + 'Risk Level: ${taskProvider.taskRequestModel?.riskLevel?.name}'.bodyText(context), + 'Resource: ${taskProvider.taskRequestModel?.resource?.name}'.bodyText(context) + ], + ), ], - if (taskProvider.taskRequestModel?.callComment != null) ...[ const Divider().defaultStyle(context), Text( @@ -150,8 +155,7 @@ class _TaskRequestDetailsViewState extends State { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - assetDetails(taskModel: taskModel), - const Divider().defaultStyle(context), + const Divider().defaultStyle(context), Text( "Site Details".addTranslation, style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), @@ -188,7 +192,7 @@ class _TaskRequestDetailsViewState extends State { ), '${context.translation.site}: ${taskModel.site?.name ?? "-"}'.bodyText(context), '${context.translation.building}: ${taskModel.building?.name ?? "-"}'.bodyText(context), - '${context.translation.floor}: ${taskModel.floor?.name?? "-"}'.bodyText(context), + '${context.translation.floor}: ${taskModel.floor?.name ?? "-"}'.bodyText(context), '${context.translation.department}: ${taskModel.department?.name ?? "-"}'.bodyText(context), '${context.translation.room}: ${taskModel.room?.name ?? "-"}'.bodyText(context), ], @@ -218,14 +222,7 @@ class _TaskRequestDetailsViewState extends State { if (taskModel.typeOfAlert != null) { switch (taskModel.typeOfAlert!.value) { case 1: - return Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - '${context.translation.acknowledge}: ${taskModel.isUserAcknowledge ?? "-"}'.bodyText(context), - 'Risk Level: ${taskModel.riskLevel?.name}'.bodyText(context), - 'Resource: ${taskModel.resource?.name}'.bodyText(context)], - ); + return '${context.translation.acknowledge}: ${taskModel.isUserAcknowledge ?? "-"}'.bodyText(context); case 2: return Column( mainAxisSize: MainAxisSize.min, diff --git a/lib/views/pages/user/tasks_request/task_request_item_view.dart b/lib/views/pages/user/tasks_request/task_request_item_view.dart index fe0d7f7f..35cfe864 100644 --- a/lib/views/pages/user/tasks_request/task_request_item_view.dart +++ b/lib/views/pages/user/tasks_request/task_request_item_view.dart @@ -6,6 +6,7 @@ import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/all_requests_and_count_model.dart'; import 'package:test_sa/models/device/asset_transfer.dart'; +import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/new_models/dashboard_detail.dart'; import 'package:test_sa/models/plan_preventive_visit/plan_preventive_visit_model.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; @@ -23,6 +24,58 @@ class TaskRequestItemView extends StatelessWidget { @override Widget build(BuildContext context) { + if (requestData != null) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + StatusLabel( + label: requestData!.priorityName!, + textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.priorityName!), + backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.priorityName!), + ), + 8.width, + StatusLabel( + label: requestData!.statusName!, + textColor: AppColor.getRequestStatusTextColorByName(context, requestData!.statusName!), + backgroundColor: AppColor.getRequestStatusColorByName(context, requestData!.statusName!), + ), + 1.width.expanded, + Text( + requestData!.transactionDate?.toServiceRequestCardFormat ?? "", + textAlign: TextAlign.end, + style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50), + ), + ], + ), + 8.height, + (requestData?.typeTransaction ?? context.translation.taskRequest).heading5(context), + infoWidget(label: context.translation.requestNo, value: requestData?.requestNo, context: context), + infoWidget(label: context.translation.assetName, value: requestData?.assetName, context: context), + infoWidget(label: context.translation.assetNo, value: requestData?.assetNumber, context: context), + 12.height, + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + context.translation.viewDetails, + style: AppTextStyles.bodyText.copyWith(color: AppColor.blueStatus(context)), + ), + 4.width, + Icon(Icons.arrow_forward, color: AppColor.blueStatus(context), size: 14) + ], + ), + ], + ).toShadowContainer(context, withShadow: showShadow).onPress(() async { + Navigator.of(context).push(MaterialPageRoute( + builder: (_) => TaskRequestDetailsView( + taskId: requestData!.id!, + requestDetails: RequestsDetails(nameOfType: requestData?.nameOfType, status: requestData?.statusName, priority: requestData?.priorityName, date: requestData?.transactionDate), + ))); + }); + } return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [