From bd954c687371b2a30d965c1fe5f19f2ef968b43f Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Tue, 19 Dec 2023 10:37:55 +0300 Subject: [PATCH] Fix visit date issue in work oder details --- .../work_order/edit_service_report.dart | 2 +- .../work_order/work_order_details_page.dart | 153 ++++++++++-------- 2 files changed, 83 insertions(+), 72 deletions(-) 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 4d57b11a..b54be757 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 @@ -133,7 +133,7 @@ class _EditServiceReportState extends State with TickerProvid date: DateTime.tryParse(_serviceReport.visitDate ?? ""), onDatePicker: (date) { _serviceReport.visitDate = date?.toIso8601String(); - // setState(() {}); + setState(() {}); }, ), 8.height, 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 cd2b654d..6c077aaa 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 @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:test_sa/controllers/providers/api/service_requests_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart'; @@ -11,10 +12,12 @@ import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/views/pages/sub_workorder/create_sub_workorder_page.dart'; import 'package:test_sa/views/pages/user/requests/work_order/update_service_report.dart'; +import 'package:test_sa/views/widgets/loaders/app_loading.dart'; import '../../../../../controllers/providers/api/user_provider.dart'; import '../../../../../models/enums/user_types.dart'; import '../../../../../models/service_request/search_work_order.dart'; +import '../../../../../models/service_request/service_report.dart'; import '../../../../widgets/requests/request_status.dart'; class WorkOrderDetailsPage extends StatelessWidget { @@ -29,79 +32,87 @@ class WorkOrderDetailsPage extends StatelessWidget { UserProvider userProvider = Provider.of(context); return Scaffold( appBar: DefaultAppBar(title: context.translation.workOrder), - body: Column( - children: [ - SingleChildScrollView( - child: Row( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, + body: FutureBuilder( + future: Provider.of(context).getSingleServiceReport(context, reportId: workOrder.id), + builder: (context, snapshot) { + final workOrderDetails = snapshot.data; + return Column( children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - StatusLabel( - label: workOrder.currentSituation.name, - textColor: AppColor.getRequestStatusTextColorByName(context, workOrder.currentSituation.name), - backgroundColor: AppColor.getRequestStatusColorByName(context, workOrder.currentSituation.name), - ), - 8.height, - Text(serviceRequest.requestCode, style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)), - 8.height, - Text( - '${context.translation.assetName}: ${workOrder.callRequest.asset.modelDefinition.assetName}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), - ), - Text( - '${context.translation.status}: ${workOrder.currentSituation.name}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), - ), - Text( - '${context.translation.orderWorkNumber}: ${workOrder.workOrderNo}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), - ), - Text( - '${context.translation.assignedEmployee}: ${workOrder.assignedEmployee?.name ?? ""}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), - ), - Text('${context.translation.assetSN}: ${workOrder.callRequest.asset.assetSerialNo ?? ""}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), - Text('${context.translation.assetName}: ${workOrder.callRequest.asset.modelDefinition.assetName ?? ""}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), - Text('${context.translation.assetNumber}: ${workOrder.callRequest.asset.assetNumber ?? ""}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), - Text('${context.translation.model}: ${workOrder.callRequest.asset.modelDefinition.modelName ?? ""}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), - Text('${context.translation.site}: ${workOrder.callRequest.asset.site.custName ?? ""}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), - Text('${context.translation.callLastSituation}: ${workOrder.calllastSituation.name ?? '' ?? ""}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), - ], - ).expanded, - Column( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - if (userProvider.user.type == UsersTypes.engineer && serviceRequest.statusValue != 5 && serviceRequest.statusValue != 3) - Align(alignment: AlignmentDirectional.centerEnd, child: "edit".toSvgAsset(height: 48, width: 48)).onPress(() { - Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateServiceReport(workOrder: workOrder, request: serviceRequest))); - }), - if (userProvider.user.type == UsersTypes.engineer && serviceRequest.statusValue != 5 && serviceRequest.statusValue != 3) 8.height, - Text(workOrder.visitDate?.toServiceRequestCardFormat ?? "", style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), - ], - ) + snapshot.connectionState == ConnectionState.waiting + ? const Expanded(child: ALoading()) + : SingleChildScrollView( + child: Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + StatusLabel( + label: workOrderDetails.currentSituation.name, + textColor: AppColor.getRequestStatusTextColorByName(context, workOrderDetails.currentSituation.name), + backgroundColor: AppColor.getRequestStatusColorByName(context, workOrderDetails.currentSituation.name), + ), + 8.height, + 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}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), + ), + Text( + '${context.translation.status}: ${workOrderDetails.currentSituation.name}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), + ), + Text( + '${context.translation.orderWorkNumber}: ${workOrderDetails.workOrderNo}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), + ), + Text( + '${context.translation.assignedEmployee}: ${workOrderDetails.assignedEmployee?.name ?? ""}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), + ), + Text('${context.translation.assetSN}: ${workOrderDetails.callRequest.asset.assetSerialNo ?? ""}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), + Text('${context.translation.assetName}: ${workOrderDetails.callRequest.asset.modelDefinition.assetName ?? ""}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), + Text('${context.translation.assetNumber}: ${workOrderDetails.callRequest.asset.assetNumber ?? ""}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), + Text('${context.translation.model}: ${workOrderDetails.callRequest.asset.modelDefinition.modelName ?? ""}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), + Text('${context.translation.site}: ${workOrderDetails.callRequest.asset.site.custName ?? ""}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), + Text('${context.translation.callLastSituation}: ${workOrderDetails.calllastSituation.name ?? '' ?? ""}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), + ], + ).expanded, + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + if (userProvider.user.type == UsersTypes.engineer && serviceRequest.statusValue != 5 && serviceRequest.statusValue != 3) + Align(alignment: AlignmentDirectional.centerEnd, child: "edit".toSvgAsset(height: 48, width: 48)).onPress(() { + Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateServiceReport(workOrder: workOrder, request: serviceRequest))); + }), + if (userProvider.user.type == UsersTypes.engineer && serviceRequest.statusValue != 5 && serviceRequest.statusValue != 3) 8.height, + Text(workOrderDetails.visitDate?.toServiceRequestCardFormat ?? "", + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), + ], + ) + ], + ).toShadowContainer(context), + ).paddingAll(16).expanded, + if (userProvider.user.type == UsersTypes.engineer && serviceRequest.statusValue != 5 && serviceRequest.statusValue != 3) + AppFilledButton( + onPressed: () { + Navigator.of(context).push( + MaterialPageRoute(builder: (context) => CreateSubWorkOrderPage(workOrder: workOrder)), + ); + }, + label: context.translation.createSubWorkOrder, + ).paddingAll(16), ], - ).toShadowContainer(context), - ).paddingAll(16).expanded, - if (userProvider.user.type == UsersTypes.engineer && serviceRequest.statusValue != 5 && serviceRequest.statusValue != 3) - AppFilledButton( - onPressed: () { - Navigator.of(context).push( - MaterialPageRoute(builder: (context) => CreateSubWorkOrderPage(workOrder: workOrder)), - ); - }, - label: context.translation.createSubWorkOrder, - ).paddingAll(16), - ], - ), + ); + }), ); } }