Merge branch 'king_kahild_app' into king_kahild_app_updated_3.32

lib/pages/BookAppointment/DoctorProfile.dart

@@ -135,21 +135,21 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
                 showConfirmMessageDialog: false,
                 isNeedToShowButton: !widget.isLiveCareAppointment,
                 onTap: () {
-                  Navigator.push(
-                    context,
-                    FadePage(
-                      page: SchedulePage(doctorList: widget.doctor),
-                    ),
-                  ).then((value) {
-                    setState(() {
-                      if (_tabController.index == 0) {
-                        _tabController.animateTo((_tabController.index + 1) % 2);
-                        showFooterButton = true;
-                      }
-                      this.doctorSchedule = value;
-                    });
-                  });
-                  projectViewModel.analytics.appointment.book_appointment_schedule(appointment_type: 'regular', doctor: widget.doctor);
+                  // Navigator.push(
+                  //   context,
+                  //   FadePage(
+                  //     page: SchedulePage(doctorList: widget.doctor),
+                  //   ),
+                  // ).then((value) {
+                  //   setState(() {
+                  //     if (_tabController.index == 0) {
+                  //       _tabController.animateTo((_tabController.index + 1) % 2);
+                  //       showFooterButton = true;
+                  //     }
+                  //     this.doctorSchedule = value;
+                  //   });
+                  // });
+                  // projectViewModel.analytics.appointment.book_appointment_schedule(appointment_type: 'regular', doctor: widget.doctor);
                 },
                 onRatingAndReviewTap: () {
                   getDoctorRatingsDetails();
@@ -162,12 +162,12 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
                 onTap: (index) {
                   setState(() {
                     if (index == 1) {
-                      if (widget.doctor.clinicID == 23 || widget.doctor.clinicID == 47 || widget.isLiveCareAppointment) {
+                      // if (widget.doctor.clinicID == 23 || widget.doctor.clinicID == 47 || widget.isLiveCareAppointment) {
                         _tabController.index = _tabController.previousIndex;
-                        showFooterButton = false;
-                      } else {
-                        showFooterButton = true;
-                      }
+                         showFooterButton = false;
+                      // } else {
+                      //   showFooterButton = true;
+                      // }
                     }
                     print(showFooterButton);
                   });
@@ -185,6 +185,7 @@ class _DoctorProfileState extends State<DoctorProfile> with TickerProviderStateM
                     ),
                   ),
                   Tab(
+
                     child: Text(
                       TranslationBase.of(context).availableAppo,
                       style: TextStyle(

lib/pages/MyAppointments/AppointmentDetails.dart

@@ -131,20 +131,20 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
               showConfirmMessageDialog: false,
               onRatingAndReviewTap: getDoctorRatingsDetails,
               onTap: () {
-                Navigator.push(
-                  context,
-                  FadePage(
-                    page: SchedulePage(doctorList: doctorList, appo: widget.appo),
-                  ),
-                ).then((value) {
-                  setState(() {
-                    if (_tabController!.index == 0) {
-                      _tabController!.animateTo((_tabController!.index + 1) % 2);
-                      this.enableFooterButton();
-                    }
-                    widget.doctorSchedule = value;
-                  });
-                });
+                // Navigator.push(
+                //   context,
+                //   FadePage(
+                //     page: SchedulePage(doctorList: doctorList, appo: widget.appo),
+                //   ),
+                // ).then((value) {
+                //   setState(() {
+                //     if (_tabController!.index == 0) {
+                //       _tabController!.animateTo((_tabController!.index + 1) % 2);
+                //       this.enableFooterButton();
+                //     }
+                //     widget.doctorSchedule = value;
+                //   });
+                // });
               },
             ),
             SizedBox(height: 10),
@@ -154,20 +154,22 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
                 onTap: (index) {
                   setState(() {
                     if (index == 1) {
-                      if (widget.appo.clinicID == 17 ||
-                          widget.appo.clinicID == 47 ||
-                          widget.appo.clinicID == 23 ||
-                          widget.appo.clinicID == 253 ||
-                          widget.appo.clinicID == 265 ||
-                          widget.appo.clinicID == 134 ||
-                          widget.appo.clinicID == 253 ||
-                          widget.appo.isExecludeDoctor! ||
-                          widget.appo.isLiveCareAppointment!) {
                         _tabController!.index = _tabController!.previousIndex;
                         AppointmentDetails.showFooterButton = false;
-                      } else {
-                        AppointmentDetails.showFooterButton = true;
-                      }
+                      // if (widget.appo.clinicID == 17 ||
+                      //     widget.appo.clinicID == 47 ||
+                      //     widget.appo.clinicID == 23 ||
+                      //     widget.appo.clinicID == 253 ||
+                      //     widget.appo.clinicID == 265 ||
+                      //     widget.appo.clinicID == 134 ||
+                      //     widget.appo.clinicID == 253 ||
+                      //     widget.appo.isExecludeDoctor! ||
+                      //     widget.appo.isLiveCareAppointment!) {
+                      //   _tabController!.index = _tabController!.previousIndex;
+                      //   AppointmentDetails.showFooterButton = false;
+                      // } else {
+                      //   AppointmentDetails.showFooterButton = true;
+                      // }
                     }
                   });
                 },
@@ -591,13 +593,13 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
   }
 
   void openSchedule() {
-    Navigator.push(
-        context,
-        FadePage(
-            page: SchedulePage(
-          doctorList: getDoctorObject(),
-          appo: widget.appo,
-        )));
+    // Navigator.push(
+    //     context,
+    //     FadePage(
+    //         page: SchedulePage(
+    //       doctorList: getDoctorObject(),
+    //       appo: widget.appo,
+    //     )));
   }
 
   setTab() async {

lib/pages/landing/landing_page.dart

@@ -672,19 +672,20 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
         //   changeIndex: changeCurrentTab,
         //   index: currentTab,
         // ),
-        floatingActionButtonLocation: FloatingActionButtonLocation.endContained,
-        floatingActionButton:
-            (projectViewModel.havePrivilege(34) && currentTab == 0)
-                ? Padding(
-                  padding: const EdgeInsets.only(bottom: 50.0, right: 10),
-                  child: FloatingButton(
-                      elevation: true,
-                      onTap: () {
-                        changeCurrentTab(2);
-                      },
-                    ),
-                )
-                : null);
+        // floatingActionButtonLocation: FloatingActionButtonLocation.endContained,
+        // floatingActionButton:
+        //     (projectViewModel.havePrivilege(34) && currentTab == 0)
+        //         ? Padding(x
+        //           padding: const EdgeInsets.only(bottom: 50.0, right: 10),
+        //           child: FloatingButton(
+        //               elevation: true,
+        //               onTap: () {
+        //                 changeCurrentTab(2);
+        //               },
+        //             ),
+        //         )
+        //         : null);
+    );
   }
 
   triggerRobot() {