From b5bfb3c0c069c2fe1ccfbdf0aeba3da7d1428136 Mon Sep 17 00:00:00 2001
From: WaseemAbbasi22 <muhammad.abbasi@cloudsolutions.com.sa>
Date: Wed, 15 Jan 2025 14:16:46 +0300
Subject: [PATCH] arrival bottomsheet dismiss  fixes and add check for next
 step value

---
 lib/controllers/api_routes/urls.dart          |  4 +-
 .../action_button/footer_action_button.dart   |  2 +-
 .../service_request_bottomsheet.dart          | 60 +++++++++++++------
 3 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart
index 45d4f56b..137d2f3a 100644
--- a/lib/controllers/api_routes/urls.dart
+++ b/lib/controllers/api_routes/urls.dart
@@ -5,8 +5,8 @@ class URLs {
   static const host1 = "https://atomsmdev.hmg.com"; // local UAT url
 
   // static String _baseUrl = "$_host/mobile";
-  // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
-  static final String _baseUrl = "$_host/v3/mobile"; // new V3 apis
+  static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
+  // static final String _baseUrl = "$_host/v3/mobile"; // new V3 apis
 
   static String _host = host1;
 
diff --git a/lib/service_request_latest/views/components/action_button/footer_action_button.dart b/lib/service_request_latest/views/components/action_button/footer_action_button.dart
index 3cc99492..7159aac1 100644
--- a/lib/service_request_latest/views/components/action_button/footer_action_button.dart
+++ b/lib/service_request_latest/views/components/action_button/footer_action_button.dart
@@ -38,7 +38,7 @@ class FooterActionButton {
       {required WorkOrderNextStepEnum workOrderNextStepStatus, List<Activities> activities = const [], required BuildContext context, required UserProvider userProvider}) {
     ServiceRequestDetailProvider requestDetailProvider = Provider.of<ServiceRequestDetailProvider>(context, listen: false);
 
-    bool showMarkAsFixedButton = activities.isEmpty ? false : activities.any((object) => object.activityStatus!.value == 14 || object.activityStatus!.value == 14);// 14 = Fixed and 14 = Out of scope //todo  Ask backend for out of scope value
+    bool showMarkAsFixedButton = activities.isEmpty ? false : activities.any((object) => object.activityStatus!.value == 14 || object.activityStatus!.value == 19);// 14 = Fixed and 14 = Out of scope //todo  Ask backend for out of scope value
     if (userProvider.user?.type == UsersTypes.engineer) {
       switch (workOrderNextStepStatus) {
         case WorkOrderNextStepEnum.onlyView:
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 f9881ab3..f5afcc2e 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
@@ -1068,6 +1068,7 @@ class ServiceRequestBottomSheet {
   static Future nurseVerifyArrivalBottomSheet({required BuildContext context}) {
     return buildBottomSheetParent(
         context: context,
+
         childWidget: Consumer<ServiceRequestDetailProvider>(builder: (context, ServiceRequestDetailProvider requestDetailProvider, child) {
           return Column(
             crossAxisAlignment: CrossAxisAlignment.center,
@@ -1128,26 +1129,49 @@ class ServiceRequestBottomSheet {
   static Future waitingForApprovalBottomSheet({required BuildContext context}) {
     return buildBottomSheetParent(
         context: context,
+        isDismissible: false,
         childWidget: Consumer<ServiceRequestDetailProvider>(builder: (context, ServiceRequestDetailProvider requestDetailProvider, child) {
-          return Column(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              "Waiting...".heading4(context),
-              12.height,
-              Text(
-                "Request Sent, Waiting for requester to confirm arrival",
-                style: TextStyle(
-                  fontSize: 16.toScreenWidth,
-                  fontWeight: FontWeight.w500,
-                  fontStyle: FontStyle.normal,
-                  decoration: TextDecoration.none,
+          return  WillPopScope(
+            onWillPop: () async {
+              // Return `false` to block back navigation
+
+              return false;
+            },
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    "Waiting...".heading4(context),
+                    Container(
+                      padding: EdgeInsets.all(5.toScreenHeight),
+                      decoration: const BoxDecoration(
+                        shape: BoxShape.circle,
+                        color: AppColor.neutral80
+                      ),
+                      child: const Icon(Icons.close),
+                    ).onPress((){
+                      Navigator.pop(context);
+                    }),
+                  ],
                 ),
-              ),
-              12.height,
-              "waiting".toLottieAsset(height: 100).center,
-              12.height,
-            ],
+                12.height,
+                Text(
+                  "Request Sent, Waiting for requester to confirm arrival",
+                  style: TextStyle(
+                    fontSize: 16.toScreenWidth,
+                    fontWeight: FontWeight.w500,
+                    fontStyle: FontStyle.normal,
+                    decoration: TextDecoration.none,
+                  ),
+                ),
+                12.height,
+                "waiting".toLottieAsset(height: 100).center,
+                12.height,
+              ],
+            ),
           );
         }));
   }