From 0ac599ea1ca85187f22136a4b07e88a8810fae7c Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Wed, 25 Nov 2020 14:38:58 +0200 Subject: [PATCH] fix vital Sign --- lib/core/service/client/base_app_client.dart | 4 ++++ lib/pages/landing/home_page.dart | 2 +- lib/widgets/drawer/app_drawer_widget.dart | 8 ++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 11095fd3..ff7e7776 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/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(); +VitalSignService _vitalSignService = locator(); class BaseAppClient { post(String endPoint, @@ -165,6 +167,8 @@ class BaseAppClient { await sharedPref.remove(LOGIN_TOKEN_ID); await authenticatedUserObject.getUser(); Provider.of(AppGlobal.context, listen: false).isLogin = false; + _vitalSignService.weightKg =""; + _vitalSignService.heightCm=""; Navigator.of(AppGlobal.context).pushReplacementNamed(HOME); } diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 3c353a80..6716535b 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -57,7 +57,7 @@ class _HomePageState extends State { ProjectViewModel projectViewModel = Provider.of(context); toDoProvider = Provider.of(context); return BaseView( - onModelReady: (model) => {},//model.getPatientRadOrders(), + onModelReady: (model) => model.getPatientRadOrders(), builder: (_, model, wi) => AppScaffold( isShowDecPage: false, body: Container( diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index f29ea4c6..f9658c02 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/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 { var familyFileProvider = FamilyFilesProvider(); AuthenticatedUser user; AuthenticatedUser mainUser; - AuthenticatedUserObject authenticatedUserObject = - locator(); + AuthenticatedUserObject authenticatedUserObject = locator(); + VitalSignService _vitalSignService = locator(); + @override Widget build(BuildContext context) { @@ -408,6 +410,8 @@ class _AppDrawerState extends State { authenticatedUserObject.logout(); projectProvider.isLogin = false; await authenticatedUserObject.getUser(); + _vitalSignService.heightCm =""; + _vitalSignService.weightKg =""; await sharedPref.clear(); this.user = null; Navigator.of(context).pushNamed(HOME);