From dfafb6b66487c4103bab8681f5b6e666c42652d5 Mon Sep 17 00:00:00 2001
From: haroon amjad <amjad.haroon@hmg.local>
Date: Tue, 5 Oct 2021 12:28:16 +0300
Subject: [PATCH] fixes

---
 lib/core/service/base_service.dart                        | 4 ++--
 .../NewCMC/new_cmc_step_one_page.dart                     | 8 ++++----
 .../components/DocAvailableAppointments.dart              | 6 ++++--
 lib/widgets/app_map/google_huawei_map.dart                | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/core/service/base_service.dart b/lib/core/service/base_service.dart
index c2d31cf1..34b7e1f6 100644
--- a/lib/core/service/base_service.dart
+++ b/lib/core/service/base_service.dart
@@ -23,9 +23,9 @@ class BaseService {
   }
 
   getUser() async {
-    if (user==null) {
+    // if (user==null) {
       var userData = await sharedPref.getObject(USER_PROFILE);
       if (userData != null) user = AuthenticatedUser.fromJson(userData);
-    }
+    // }
   }
 }
diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart
index 5ad9edaa..15325f42 100644
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart
@@ -177,9 +177,9 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
 
                   widget.cMCInsertPresOrderRequestModel.patientERCMCInsertServicesList = [patientERCMCInsertServicesList];
                   await widget.model.getCustomerInfo();
-                  if (widget.model.state == ViewState.ErrorLocal) {
-                    Utils.showErrorToast();
-                  } else {
+                  // if (widget.model.state == ViewState.ErrorLocal) {
+                  //   Utils.showErrorToast();
+                  // } else {
                     navigateTo(
                       context,
                       NewCMCStepTowPage(
@@ -189,7 +189,7 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {
                         model: widget.model,
                       ),
                     );
-                  }
+                  // }
                 }
               },
             ),
diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
index 65c9443f..aaceb5ca 100644
--- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
+++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
@@ -111,10 +111,14 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
 
   void _onVisibleDaysChanged(DateTime first, DateTime last, CalendarFormat format) {
     print('CALLBACK: _onVisibleDaysChanged');
+    print(first);
+    print(last);
   }
 
   void _onCalendarCreated(DateTime first, DateTime last, CalendarFormat format) {
     print('CALLBACK: _onCalendarCreated');
+    print(first);
+    print(last);
   }
 
   @override
@@ -274,8 +278,6 @@ class _DocAvailableAppointmentsState extends State<DocAvailableAppointments> wit
       selectedButtonIndex = 0;
 
       DocAvailableAppointments.selectedTime = dayEvents[selectedButtonIndex].isoTime;
-
-//      _scrollController.animateTo(0.0, duration: new Duration(seconds: 1), curve: Curves.ease);
     });
   }
 
diff --git a/lib/widgets/app_map/google_huawei_map.dart b/lib/widgets/app_map/google_huawei_map.dart
index f7b986db..ff9efeff 100644
--- a/lib/widgets/app_map/google_huawei_map.dart
+++ b/lib/widgets/app_map/google_huawei_map.dart
@@ -59,7 +59,7 @@ class AppMapState extends State<AppMap> {
   Widget googleMap() {
     return GoogleMap(
       mapType: MapType.normal,
-      zoomControlsEnabled: false,
+      zoomControlsEnabled: true,
       myLocationButtonEnabled: true,
       myLocationEnabled: true,
       initialCameraPosition: CameraPosition.fromMap(widget.initialCamera),