From 318ae666c1813cab209eb9bf30c68cb8a27d3087 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 14 Oct 2024 11:24:42 +0300 Subject: [PATCH] completed request improvement. --- .../widgets/request_item_view_list.dart | 2 +- .../service_request_bottomsheet.dart | 36 +++++++++---------- .../views/components/request_detail_view.dart | 11 +++--- .../requests/service_request_details.dart | 8 ++--- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/lib/new_views/pages/land_page/widgets/request_item_view_list.dart b/lib/new_views/pages/land_page/widgets/request_item_view_list.dart index 3a1b18f9..5050a9c8 100644 --- a/lib/new_views/pages/land_page/widgets/request_item_view_list.dart +++ b/lib/new_views/pages/land_page/widgets/request_item_view_list.dart @@ -19,7 +19,7 @@ class RequestItemViewList extends StatelessWidget { @override Widget build(BuildContext context) { return (list.isEmpty && !isLoading) - ? NoDataFound(message: context.translation.noDataFound) + ? NoDataFound(message: context.translation.noDataFound).center : ListView.separated( padding: const EdgeInsets.all(16), shrinkWrap: true, diff --git a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart b/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart index 5989533d..2f4ab2ff 100644 --- a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart +++ b/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/app_strings/app_asset.dart'; -import 'package:test_sa/dashboard_latest/widgets/request_category_list.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'; @@ -612,6 +611,7 @@ class ServiceRequestBottomSheet { ); })); } + static Future nurseRejectBackBottomSheet({required BuildContext context}) { String feedback = ''; return buildBottomSheetParent( @@ -656,7 +656,7 @@ class ServiceRequestBottomSheet { ); requestDetailProvider.nurseReject(); Navigator.pop(context); - if(requestDetailProvider.currentWorkOrder!.data!.requestId!=null){ + if (requestDetailProvider.currentWorkOrder!.data!.requestId != null) { requestDetailProvider.getWorkOrderById(id: requestDetailProvider.currentWorkOrder!.data!.requestId!); } } @@ -695,13 +695,13 @@ class ServiceRequestBottomSheet { InkWell( child: acknowledge ? const Icon( - Icons.check_box, - color: AppColor.primary10, - ) + Icons.check_box, + color: AppColor.primary10, + ) : const Icon( - Icons.check_box_outline_blank, - color: AppColor.neutral120, - ), + Icons.check_box_outline_blank, + color: AppColor.neutral120, + ), onTap: () { setState(() { acknowledge = !acknowledge; @@ -710,9 +710,7 @@ class ServiceRequestBottomSheet { ), 6.width, Flexible( - child: context.translation.nurseAcknowledge - .bodyText(context) - .custom(color: context.isDark ? AppColor.primary50 : AppColor.neutral120), + child: context.translation.nurseAcknowledge.bodyText(context).custom(color: context.isDark ? AppColor.primary50 : AppColor.neutral120), ), ], ), @@ -723,18 +721,17 @@ class ServiceRequestBottomSheet { newSignature: newSignature, backgroundColor: AppColor.neutral100, showShadow: false, - onChange:(signature){ + onChange: (signature) { + if (signature == null || signature.isEmpty) return; setState(() { - if (signature == null || signature.isEmpty) return; newSignature = signature; nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}"; print('signature i got is ${newSignature}'); }); - }, + }, onSaved: (signature) { - + if (signature == null || signature.isEmpty) return; setState(() { - if (signature == null || signature.isEmpty) return; newSignature = signature; nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}"; print('signature i got is ${newSignature}'); @@ -767,6 +764,7 @@ class ServiceRequestBottomSheet { AppFilledButton( label: context.translation.confirm, maxWidth: true, + loading: requestDetailProvider.isLoading, buttonColor: AppColor.green70, onPressed: () async { if (newSignature != null) { @@ -774,12 +772,12 @@ class ServiceRequestBottomSheet { workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, signatureNurse: nurseSignature, ); - requestDetailProvider.nurseConfirm(); - if(requestDetailProvider.currentWorkOrder!.data!.requestId!=null){ + await requestDetailProvider.nurseConfirm(); + if (requestDetailProvider.currentWorkOrder!.data!.requestId != null) { requestDetailProvider.getWorkOrderById(id: requestDetailProvider.currentWorkOrder!.data!.requestId!); } Navigator.pop(context); - }else{ + } else { //show some toast... } }, diff --git a/lib/service_request_latest/views/components/request_detail_view.dart b/lib/service_request_latest/views/components/request_detail_view.dart index ab590e87..34367773 100644 --- a/lib/service_request_latest/views/components/request_detail_view.dart +++ b/lib/service_request_latest/views/components/request_detail_view.dart @@ -58,7 +58,7 @@ class WorkOrderDetailView extends StatelessWidget { context: context), ], ), - if (requestProvider.timer!=null&&requestProvider.timer!.isActive)...[ + if (requestProvider.timer != null && requestProvider.timer!.isActive) ...[ const TimerWidget(), ] ], @@ -67,7 +67,6 @@ class WorkOrderDetailView extends StatelessWidget { } Widget workOrderDetailCard(BuildContext context, WorkOrderData workOrder, UserProvider userProvider) { - return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -102,10 +101,10 @@ class WorkOrderDetailView extends StatelessWidget { Column( crossAxisAlignment: CrossAxisAlignment.end, children: [ - if (userProvider.user!.type == UsersTypes.normal_user) - context.translation.code.toSvgAsset(width: 48).onPress(() { - // Navigator.push(context, MaterialPageRoute(builder: (context) => UpdateServiceRequestPage(serviceRequest: serviceRequest))); - }), + // if (userProvider.user!.type == UsersTypes.normal_user) + // context.translation.code.toSvgAsset(width: 48).onPress(() { + // // Navigator.push(context, MaterialPageRoute(builder: (context) => UpdateServiceRequestPage(serviceRequest: serviceRequest))); + // }), if (userProvider.user!.type == UsersTypes.engineer) 16.height, Text( workOrder.requestedDate!.toString().toServiceRequestCardFormat, diff --git a/lib/views/pages/user/requests/service_request_details.dart b/lib/views/pages/user/requests/service_request_details.dart index ce3ad62c..2c619510 100644 --- a/lib/views/pages/user/requests/service_request_details.dart +++ b/lib/views/pages/user/requests/service_request_details.dart @@ -119,10 +119,10 @@ class _ServiceRequestDetailsPageState extends State { Column( crossAxisAlignment: CrossAxisAlignment.end, children: [ - if (userProvider.user!.type == UsersTypes.normal_user) - context.translation.code.toSvgAsset(width: 48).onPress(() { - Navigator.push(context, MaterialPageRoute(builder: (context) => UpdateServiceRequestPage(serviceRequest: serviceRequest))); - }), + // if (userProvider.user!.type == UsersTypes.normal_user) + // context.translation.code.toSvgAsset(width: 48).onPress(() { + // Navigator.push(context, MaterialPageRoute(builder: (context) => UpdateServiceRequestPage(serviceRequest: serviceRequest))); + // }), if (userProvider.user!.type == UsersTypes.engineer) 16.height, Text( serviceRequest.date!.toServiceRequestCardFormat,