From ddc7eca605828801bcd1ecd3c4dd64759be9bbf0 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Wed, 18 Nov 2020 16:16:09 +0200 Subject: [PATCH 1/3] fix Insurance Cards --- lib/core/service/insurance_service.dart | 2 +- lib/core/service/medical/my_balance_service.dart | 2 +- lib/core/viewModels/insurance_card_View_model.dart | 2 +- lib/pages/medical/balance/advance_payment_page.dart | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/core/service/insurance_service.dart b/lib/core/service/insurance_service.dart index 02061612..4b9e0c3a 100644 --- a/lib/core/service/insurance_service.dart +++ b/lib/core/service/insurance_service.dart @@ -55,7 +55,7 @@ class InsuranceCardService extends BaseService { Future getInsuranceUpdate() async { hasError = false; - // _cardList.clear(); + _cardList.clear(); await baseAppClient.post(GET_PAtIENTS_INSURANCE_UPDATED, onSuccess: (dynamic response, int statusCode) { _cardUpdated.clear(); diff --git a/lib/core/service/medical/my_balance_service.dart b/lib/core/service/medical/my_balance_service.dart index 383c37f1..c456b38c 100644 --- a/lib/core/service/medical/my_balance_service.dart +++ b/lib/core/service/medical/my_balance_service.dart @@ -148,7 +148,7 @@ class MyBalanceService extends BaseService { await sharedPref.getObject(FAMILY_FILE)); return getAllSharedRecordsByStatusResponse; } else { - return getSharedRecordByStatus(); + return await getSharedRecordByStatus(); } } } diff --git a/lib/core/viewModels/insurance_card_View_model.dart b/lib/core/viewModels/insurance_card_View_model.dart index e99a53f6..003135c9 100644 --- a/lib/core/viewModels/insurance_card_View_model.dart +++ b/lib/core/viewModels/insurance_card_View_model.dart @@ -65,7 +65,7 @@ class InsuranceViewModel extends BaseViewModel { } Future getFamilyFiles() async { - await _insuranceCardService.getFamilyFiles(); + await _insuranceCardService.getSharedRecordByStatus(); if (_insuranceCardService.hasError) { error = _insuranceCardService.error; setState(ViewState.Error); diff --git a/lib/pages/medical/balance/advance_payment_page.dart b/lib/pages/medical/balance/advance_payment_page.dart index 02d08682..f19b03ed 100644 --- a/lib/pages/medical/balance/advance_payment_page.dart +++ b/lib/pages/medical/balance/advance_payment_page.dart @@ -331,6 +331,7 @@ class _AdvancePaymentPageState extends State { void confirmSelectFamilyDialog( List getAllSharedRecordsByStatusList) { + if(getAllSharedRecordsByStatusList.isNotEmpty) showDialog( context: context, child: SelectPatientFamilyDialog( From b785f87dacf94f5c05b0b13135383d91d060e191 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Wed, 18 Nov 2020 16:34:41 +0200 Subject: [PATCH 2/3] fix App drawer after logout --- lib/core/service/client/base_app_client.dart | 3 +++ lib/pages/pharmacies/medicine_search_screen.dart | 1 + lib/widgets/drawer/app_drawer_widget.dart | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 7a916419..172e338a 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -2,10 +2,12 @@ import 'dart:convert'; import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:http/http.dart' as http; +import 'package:provider/provider.dart'; import '../../../locator.dart'; import '../../../routes.dart'; @@ -159,6 +161,7 @@ class BaseAppClient { logout() async { await sharedPref.remove(LOGIN_TOKEN_ID); await authenticatedUserObject.getUser(); + Provider.of(AppGlobal.context, listen: false).isLogin = false; Navigator.of(AppGlobal.context).pushReplacementNamed(HOME); } diff --git a/lib/pages/pharmacies/medicine_search_screen.dart b/lib/pages/pharmacies/medicine_search_screen.dart index df7b19fc..49f7f883 100644 --- a/lib/pages/pharmacies/medicine_search_screen.dart +++ b/lib/pages/pharmacies/medicine_search_screen.dart @@ -80,6 +80,7 @@ class MedicineSearch extends StatelessWidget { ], ), ), + if(model.pharmacy.isNotEmpty) Container( margin: EdgeInsets.only( left: SizeConfig.heightMultiplier * 2), diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 66be3e48..a523eaf3 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -66,7 +66,7 @@ class _AppDrawerState extends State { margin: EdgeInsets.all( SizeConfig.imageSizeMultiplier * 4), ), - user != null + (user != null && projectProvider.isLogin) ? Padding( padding: EdgeInsets.all(15), child: Column( @@ -143,7 +143,7 @@ class _AppDrawerState extends State { } }, ), - user != null + (user != null && projectProvider.isLogin) ? Column( mainAxisAlignment: MainAxisAlignment.start, children: [ From 3c1257b3796aa31acd7b80600833cc7c00453b2d Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Wed, 18 Nov 2020 17:16:55 +0200 Subject: [PATCH 3/3] fix Medicine Search --- lib/config/localized_values.dart | 3 +++ lib/pages/pharmacies/medicine_search_screen.dart | 13 +++++++------ lib/uitl/translations_delegate_base.dart | 3 +++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index fbffcf56..4e15c74c 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -950,4 +950,7 @@ const Map localizedValues = { }, "selectClinic": {"en": "Select Clinic", "ar": " بحث بالعيادة"}, "reviews": {"en": "Reviews", "ar": "تقييمات"}, + "searchItemError": {"en": "Item name should be more than 3 character ", "ar": "يجب أن يكون اسم العنصر أكثر من 3 أحرف"}, + "YouCanFind": {"en": "YouCanFind", "ar": "باستطاعتك العثور على "}, + "ItemInSearch": {"en": " Item In Search", "ar": " عنصر في البحث "}, }; diff --git a/lib/pages/pharmacies/medicine_search_screen.dart b/lib/pages/pharmacies/medicine_search_screen.dart index 49f7f883..a41fde16 100644 --- a/lib/pages/pharmacies/medicine_search_screen.dart +++ b/lib/pages/pharmacies/medicine_search_screen.dart @@ -51,9 +51,10 @@ class MedicineSearch extends StatelessWidget { controller: textController, validator: (value) { if (value.isEmpty) { - return TranslationBase.of(context) - .pleaseEnterMedicineName; - } + return TranslationBase.of(context).pleaseEnterMedicineName; + }else if( value.length <4){ + return TranslationBase.of(context).searchItemError; + }else return null; }, ), @@ -88,9 +89,9 @@ class MedicineSearch extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Texts( - 'You Can Find ' + - '${model.pharmacy == null ? '0' : model.pharmacy.length.toString()}' - ' Item In Search ', + TranslationBase.of(context).youCanFind+ + '${model.pharmacy == null ? '0' : model.pharmacy.length.toString()}'+ + TranslationBase.of(context).itemInSearch, ), ], ), diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index d4e382a4..63cae066 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -825,6 +825,9 @@ class TranslationBase { String get selectPart => localizedValues['select-part'][locale.languageCode]; String get number => localizedValues['number'][locale.languageCode]; String get notClassified => localizedValues['not-classified'][locale.languageCode]; + String get searchItemError => localizedValues['searchItemError'][locale.languageCode]; + String get youCanFind => localizedValues['YouCanFind'][locale.languageCode]; + String get itemInSearch => localizedValues['ItemInSearch'][locale.languageCode]; }