From cb3a8435663362c5c2b283e9bd2542c46af8e9c8 Mon Sep 17 00:00:00 2001
From: Mohamed Nouffer <nouffer@gmail.com>
Date: Fri, 8 Mar 2024 15:31:49 +0530
Subject: [PATCH] update popup conditions

---
 lib/pages/camera/camera_page.dart                 | 5 ++++-
 lib/pages/destination/destination_controller.dart | 4 +++-
 lib/widgets/bottom_sheet_new.dart                 | 7 +++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/pages/camera/camera_page.dart b/lib/pages/camera/camera_page.dart
index baaf4cd..23e60e4 100644
--- a/lib/pages/camera/camera_page.dart
+++ b/lib/pages/camera/camera_page.dart
@@ -136,7 +136,9 @@ class CameraPage extends StatelessWidget {
     }
 
     if (destinationController.isAtGoal.value &&
-        destinationController.isInRog.value) {
+        destinationController.isInRog.value &&
+        destination.cp == -1) {
+      //goal
       return Row(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
         children: [
@@ -210,6 +212,7 @@ class CameraPage extends StatelessWidget {
       );
     } else if (destinationController.isInRog.value &&
         dbDest?.checkedin != null &&
+        destination.cp != -1 &&
         dbDest?.checkedin == true) {
       //make buypoint image
       return Row(
diff --git a/lib/pages/destination/destination_controller.dart b/lib/pages/destination/destination_controller.dart
index 432ce05..d671559 100644
--- a/lib/pages/destination/destination_controller.dart
+++ b/lib/pages/destination/destination_controller.dart
@@ -227,7 +227,9 @@ class DestinationController extends GetxController {
           });
         }
         return;
-      } else if (isInRog.value == true && indexController.rogMode.value == 1) {
+      } else if (isInRog.value == true &&
+          indexController.rogMode.value == 1 &&
+          d.cp != -1) {
         // print("----- in location popup checkin   cp - ${d.cp}----");
         chekcs = 2;
         isInCheckin.value = true;
diff --git a/lib/widgets/bottom_sheet_new.dart b/lib/widgets/bottom_sheet_new.dart
index dbcbf8e..d5f63b5 100644
--- a/lib/widgets/bottom_sheet_new.dart
+++ b/lib/widgets/bottom_sheet_new.dart
@@ -205,12 +205,11 @@ class BottomSheetNew extends GetView<BottomSheetController> {
               barrierDismissible:
                   false, // User must tap a button to close the dialog
             );
-          } else if (destinationController.isInRog.value == true) {
+          } else if (destinationController.isInRog.value == true &&
+              destination.cp != -1) {
             //print("counted ${destinationController.rogainingCounted.value}");
             // Existing logic for other conditions
-            if (destination.cp == -1) {
-              return;
-            }
+
             Get.back();
             await destinationController.callforCheckin(destination);
           } else {