Merge branch 'sultan' into 'diplomatic-quarter-live'

Sultan

See merge request Cloud_Solution/diplomatic-quarter!213

lib/pages/DrawerPages/family/my-family.dart

@@ -13,6 +13,8 @@ import 'package:diplomaticquarterapp/models/Authentication/check_activation_code
 import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart';
 import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart';
 import 'package:diplomaticquarterapp/pages/base/base_view.dart';
+import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
+import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doctor.dart';
 import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
@@ -25,6 +27,7 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:diplomaticquarterapp/widgets/others/bottom_bar.dart';
 import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart';
 import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
+import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
@@ -704,7 +707,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
   }
 
   loginAfter(result, context) async {
-    GifLoaderDialogUtils.hideDialog(context);
+    //GifLoaderDialogUtils.hideDialog(context);
     var currentLang = await sharedPref.getString(APP_LANGUAGE);
     result = list.CheckActivationCode.fromJson(result);
     var familyFile = await sharedPref.getObject(FAMILY_FILE);
@@ -722,13 +725,38 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID);
     this.sharedPref.setString(TOKEN, result.authenticationTokenID);
     await authenticatedUserObject.getUser(getUser: true);
+
     Provider.of<ProjectViewModel>(context, listen: false)
         .setUser(authenticatedUserObject.user);
-
-    //this.checkIfUserAgreedBefore(result),
-    Navigator.of(context).pushNamed(
-      HOME,
-    );
+    appointmentRateViewModel
+        .getIsLastAppointmentRatedList()
+        .then((value) => {
+              //getToDoCount(),
+              // Utils.hideProgressDialog(),
+              if (appointmentRateViewModel.isHaveAppointmentNotRate)
+                {
+                  Navigator.pushAndRemoveUntil(
+                      context,
+                      FadePage(
+                        page: RateAppointmentDoctor(),
+                      ),
+                      (r) => false)
+                }
+              else
+                {
+                  Navigator.pushAndRemoveUntil(
+                      context,
+                      FadePage(
+                        page: LandingPage(),
+                      ),
+                      (r) => false)
+                }
+            })
+        .catchError((err) {
+      print(err);
+      // Utils.hideProgressDialog();
+      // GifLoaderDialogUtils.hideDialog(context);
+    });
   }
 
   deactivateRequest(ID, status, context) {

lib/pages/landing/landing_page.dart

@@ -14,6 +14,8 @@ import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart';
 import 'package:diplomaticquarterapp/pages/livecare/incoming_call.dart';
 import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart';
 import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
+import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart'
+    as family;
 import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
 import 'package:diplomaticquarterapp/theme/theme_notifier.dart';
 import 'package:diplomaticquarterapp/theme/theme_value.dart';
@@ -60,7 +62,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
   final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
   final authService = new AuthProvider();
   var event = RobotProvider();
-
+  var familyFileProvider = family.FamilyFilesProvider();
   void _requestIOSPermissions() {
     flutterLocalNotificationsPlugin
         .resolvePlatformSpecificImplementation<
@@ -604,6 +606,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
                 sharedPref.setString(NOTIFICATION_COUNT, notificationCount);
               })
             });
+        familyFileProvider.getSharedRecordByStatus();
       }
     }
   }

lib/widgets/drawer/app_drawer_widget.dart

@@ -165,6 +165,7 @@ class _AppDrawerState extends State<AppDrawer> {
                                             sideArrow: true,
                                           ),
                                           onTap: () {
+                                            Navigator.of(context).pop();
                                             Navigator.of(context).pushNamed(
                                               MY_FAMILIY,
                                             );
@@ -549,10 +550,10 @@ class _AppDrawerState extends State<AppDrawer> {
         .familyFileProvider
         .silentLoggin(user is AuthenticatedUser ? null : user,
             mainUser: user is AuthenticatedUser)
-        .then((value) async {
+        .then((value) {
       _vitalSignService.heightCm = "";
       _vitalSignService.weightKg = "";
-      GifLoaderDialogUtils.hideDialog(context);
+
       loginAfter(value, context);
     }).catchError((err) {
       GifLoaderDialogUtils.hideDialog(context);
@@ -579,6 +580,7 @@ class _AppDrawerState extends State<AppDrawer> {
     this.sharedPref.setObject(FAMILY_FILE, familyFile);
     this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID);
     this.sharedPref.setString(TOKEN, result.authenticationTokenID);
+    // Navigator.of(context).pop();
     await authenticatedUserObject.getUser(getUser: true);
     Provider.of<ProjectViewModel>(context, listen: false)
         .setUser(authenticatedUserObject.user);
@@ -586,7 +588,7 @@ class _AppDrawerState extends State<AppDrawer> {
         .getIsLastAppointmentRatedList()
         .then((value) => {
               //getToDoCount(),
-              Utils.hideProgressDialog(),
+              //Utils.hideProgressDialog(),
               if (appointmentRateViewModel.isHaveAppointmentNotRate)
                 {
                   Navigator.pushAndRemoveUntil(
@@ -608,7 +610,7 @@ class _AppDrawerState extends State<AppDrawer> {
             })
         .catchError((err) {
       print(err);
-      Utils.hideProgressDialog();
+      //Utils.hideProgressDialog();
       // GifLoaderDialogUtils.hideDialog(context);
     });
   }