From 80d96ba785403c4c3cc4eb70b2ac627da1fd21ed Mon Sep 17 00:00:00 2001
From: Sultan Khan <sultan.khan@hmg.local>
Date: Thu, 11 Mar 2021 12:27:08 +0300
Subject: [PATCH] Privilege issue fixed

---
 lib/pages/DrawerPages/family/my-family.dart | 12 +++++++-----
 lib/widgets/drawer/app_drawer_widget.dart   |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart
index a2312220..0a5c5091 100644
--- a/lib/pages/DrawerPages/family/my-family.dart
+++ b/lib/pages/DrawerPages/family/my-family.dart
@@ -57,7 +57,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
   ProjectViewModel projectViewModel;
   AuthenticatedUser user;
   VitalSignService _vitalSignService = locator<VitalSignService>();
-  PharmacyModuleViewModel pharmacyModuleViewModel = locator<PharmacyModuleViewModel>();
+  PharmacyModuleViewModel pharmacyModuleViewModel =
+      locator<PharmacyModuleViewModel>();
 
   var isVaiable = false;
   @override
@@ -707,10 +708,11 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
   loginAfter(result, context) async {
     GifLoaderDialogUtils.hideDialog(context);
     var currentLang = await sharedPref.getString(APP_LANGUAGE);
-    result = list.CheckActivationCode.fromJson(result);
-    var familyFile = await sharedPref.getObject(FAMILY_FILE);
     Provider.of<ProjectViewModel>(context, listen: false)
         .setPrivilege(privilegeList: result, isLoginChild: true);
+    result = list.CheckActivationCode.fromJson(result);
+    var familyFile = await sharedPref.getObject(FAMILY_FILE);
+
     result = list.CheckActivationCode.fromJson(result);
     var mainUser = await sharedPref.getObject(MAIN_USER);
     var bloodType = await sharedPref.getString(BLOOD_TYPE);
@@ -731,8 +733,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     Provider.of<ProjectViewModel>(context, listen: false)
         .setUser(authenticatedUserObject.user);
 
-   await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
-      if(pharmacyModuleViewModel.error.isNotEmpty)
+    await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
+      if (pharmacyModuleViewModel.error.isNotEmpty)
         await pharmacyModuleViewModel.createUser();
     });
 
diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart
index 83b0df5f..dd5f65c1 100644
--- a/lib/widgets/drawer/app_drawer_widget.dart
+++ b/lib/widgets/drawer/app_drawer_widget.dart
@@ -525,9 +525,10 @@ class _AppDrawerState extends State<AppDrawer> {
 
   loginAfter(result, context) async {
     Utils.hideProgressDialog();
-    result = CheckActivationCode.fromJson(result);
     Provider.of<ProjectViewModel>(context, listen: false)
         .setPrivilege(privilegeList: result, isLoginChild: true);
+    result = CheckActivationCode.fromJson(result);
+
     var familyFile = await sharedPref.getObject(FAMILY_FILE);
     var currentLang = await sharedPref.getString(APP_LANGUAGE);
     var mainUser = await sharedPref.getObject(MAIN_USER);