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

fix vital Sign

See merge request Cloud_Solution/diplomatic-quarter!126

lib/core/service/client/base_app_client.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
+import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/utils.dart';
@@ -23,6 +24,7 @@ AppSharedPreferences sharedPref = new AppSharedPreferences();
 ///
 AuthenticatedUserObject authenticatedUserObject =
     locator<AuthenticatedUserObject>();
+VitalSignService _vitalSignService = locator<VitalSignService>();
 
 class BaseAppClient {
   post(String endPoint,
@@ -165,6 +167,8 @@ class BaseAppClient {
     await sharedPref.remove(LOGIN_TOKEN_ID);
     await authenticatedUserObject.getUser();
     Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isLogin = false;
+    _vitalSignService.weightKg ="";
+    _vitalSignService.heightCm="";
     Navigator.of(AppGlobal.context).pushReplacementNamed(HOME);
   }
 

lib/pages/landing/home_page.dart

@@ -57,7 +57,7 @@ class _HomePageState extends State<HomePage> {
     ProjectViewModel projectViewModel = Provider.of(context);
     toDoProvider = Provider.of<ToDoCountProviderModel>(context);
     return BaseView<DashboardViewModel>(
-      onModelReady: (model) => {},//model.getPatientRadOrders(),
+      onModelReady: (model) => model.getPatientRadOrders(),
       builder: (_, model, wi) => AppScaffold(
         isShowDecPage: false,
         body: Container(

lib/widgets/drawer/app_drawer_widget.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
+import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
 import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart';
@@ -39,8 +40,9 @@ class _AppDrawerState extends State<AppDrawer> {
   var familyFileProvider = FamilyFilesProvider();
   AuthenticatedUser user;
   AuthenticatedUser mainUser;
-  AuthenticatedUserObject authenticatedUserObject =
-      locator<AuthenticatedUserObject>();
+  AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>();
+  VitalSignService _vitalSignService = locator<VitalSignService>();
+
 
   @override
   Widget build(BuildContext context) {
@@ -408,6 +410,8 @@ class _AppDrawerState extends State<AppDrawer> {
     authenticatedUserObject.logout();
     projectProvider.isLogin = false;
     await authenticatedUserObject.getUser();
+    _vitalSignService.heightCm ="";
+    _vitalSignService.weightKg ="";
     await sharedPref.clear();
     this.user = null;
     Navigator.of(context).pushNamed(HOME);