From 4d8f42b517f15ecb0d7f74541d544c0942f8b13b Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 22 Dec 2020 14:25:41 +0200 Subject: [PATCH] fix issues vital sign issue --- lib/config/localized_values.dart | 2 +- lib/core/service/client/base_app_client.dart | 3 +- lib/core/viewModels/dashboard_view_model.dart | 14 +++--- lib/pages/landing/home_page.dart | 1 - .../vital_sign_item_details_screen.dart | 49 ++----------------- .../others/app_expandable_notifier.dart | 17 ++++--- 6 files changed, 25 insertions(+), 61 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index e354f5da..7c8ce344 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -305,7 +305,7 @@ const Map localizedValues = { "recieved-requests": {"en": "Recieved Requests", "ar": "الطلبات المستلمة"}, "manage-files": {"en": "Manage Family Files", "ar": "إدارة ملفات العائلة"}, 'oxygenation': {'en': 'Oxygenation', 'ar': 'الأوكسجين'}, - 'bodyMeasurements': {'en': 'body Mass', 'ar': 'قياسات الجسم'}, + 'bodyMeasurements': {'en': 'body Mass Index', 'ar': 'مؤشر الكتلة'}, 'temperature': {'en': 'Temperature', 'ar': 'درجة الحرارة'}, 'pulse': {'en': 'Pulse', 'ar': 'النبض'}, 'respiration': {'en': 'Respiration', 'ar': 'التنفس'}, diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 54ba6963..130e4af6 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -133,12 +133,11 @@ class BaseAppClient { parsed['SMSLoginRequired'] == true) { onSuccess(parsed, statusCode); } - else if(parsed['MessageStatus'] == 2){ + else if(parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']){ onFailure( parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode); } - else if (!parsed['IsAuthenticated']) { await logout(); diff --git a/lib/core/viewModels/dashboard_view_model.dart b/lib/core/viewModels/dashboard_view_model.dart index 8dad8b82..4f261c65 100644 --- a/lib/core/viewModels/dashboard_view_model.dart +++ b/lib/core/viewModels/dashboard_view_model.dart @@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import '../../locator.dart'; class DashboardViewModel extends BaseViewModel { @@ -11,21 +12,22 @@ class DashboardViewModel extends BaseViewModel { String get weightKg => _vitalSignService.weightKg; String get heightCm => _vitalSignService.heightCm; - String booldType=""; + String booldType = "-"; + // ToDoCountProviderModel toDoProvider = // Provider.of(AppGlobal.context); getPatientRadOrders() async { - booldType = await sharedPref.getString(BLOOD_TYPE); if (isLogin && _vitalSignService.weightKg.isEmpty) { - setState(ViewState.Busy); + setState(ViewState.Busy); await _vitalSignService.getPatientRadOrders(); if (_vitalSignService.hasError) { error = _vitalSignService.error; - setState(ViewState.Error); - } else + setState(ViewState.ErrorLocal); + } else { + booldType = await sharedPref.getString(BLOOD_TYPE) ?? "-"; setState(ViewState.Idle); - bloadType = await sharedPref.getString(BLOOD_TYPE) ?? "-"; + } } } diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index f220c3e0..03c803b7 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -54,7 +54,6 @@ class _HomePageState extends State { return BaseView( onModelReady: (model) => model.getPatientRadOrders(), builder: (_, model, wi) => AppScaffold( - isShowDecPage: false, body: Container( width: double.infinity, diff --git a/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart b/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart index 0c786f2e..6db865b6 100644 --- a/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart +++ b/lib/pages/medical/vital_sign/vital_sign_item_details_screen.dart @@ -23,53 +23,14 @@ class VitalSignItemDetailsScreen extends StatelessWidget { case VitalSignDetails.BodyMeasurements: VSchart = [ { - 'name': 'Height', - 'nameAr': 'الطول', + 'name': 'BMI', + 'nameAr': 'مؤشر الكتلة', 'title1': 'Date', - 'title2': 'Cm', - 'title2Ar': 'سم', - 'viewKey': 'HeightCm', - }, - { - 'name': 'Weight Kg', - 'nameAr': 'الوزن كجم', - 'title1': 'Date', - 'title2': 'Kg', - 'title2Ar': 'كجم', - 'viewKey': 'WeightKg', - }, - { - 'name': 'BMI ', - 'nameAr': 'مؤشر كتلة الجسم', - 'title1': 'Date', - 'title2': 'BodyMass', - 'title2Ar': 'كتلة الجسم', + 'title2': 'BMI', + 'title2Ar': 'الكتلة', 'viewKey': 'BodyMassIndex', }, - { - 'name': 'Head Circum Cm', - 'nameAr': 'محيط رأس سم', - 'title1': 'Date', - 'title2': 'Cm', - 'title2Ar': 'سم', - 'viewKey': 'HeadCircumCm', - }, - { - 'name': 'Ideal Body Weight (Lbs)', - 'nameAr': 'وزن الجسم المثالي (رطل)', - 'title1': 'Date', - 'title2': 'Ideal Weight', - 'title2Ar': 'الوزن المثالي', - 'viewKey': 'IdealBodyWeightLbs', - }, - { - 'name': 'Lean Body WeightLbs (Lbs)', - 'nameAr': 'رطل وزن الجسم النحيل (رطل)', - 'title1': 'Date', - 'title2': 'Lean Weight', - 'title2Ar': 'وزن خفيف', - 'viewKey': 'LeanBodyWeightLbs', - } + ]; break; diff --git a/lib/widgets/others/app_expandable_notifier.dart b/lib/widgets/others/app_expandable_notifier.dart index eb422a63..98997ec5 100644 --- a/lib/widgets/others/app_expandable_notifier.dart +++ b/lib/widgets/others/app_expandable_notifier.dart @@ -27,14 +27,21 @@ class AppExpandableNotifier extends StatefulWidget { } class _AppExpandableNotifier extends State { + @override - Widget build(BuildContext context) { + void initState() { setState(() { - if (widget.isExpand == true) { + if (widget.isExpand) { widget.expandFlag = widget.isExpand; widget.controller.expanded = true; } }); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return ExpandableNotifier( child: Padding( padding: const EdgeInsets.only(left: 10, right: 10, top: 4), @@ -90,11 +97,7 @@ class _AppExpandableNotifier extends State { onPressed: () { setState(() { widget.expandFlag = !widget.expandFlag; - if (widget.expandFlag == true) { - widget.controller.expanded = true; - } else { - widget.controller.expanded = false; - } + widget.controller.expanded = widget.expandFlag; }); }), ]),