From 94f7d7773f285a3302756257cbcf530034cb66be Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Mon, 23 Aug 2021 10:48:18 +0300 Subject: [PATCH] fix issue in login and inpatient --- lib/screens/auth/verification_methods_screen.dart | 2 +- .../profile_screen/patient_profile_screen.dart | 4 ++-- pubspec.lock | 13 ++++++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart index 379d3cb6..d48c538d 100644 --- a/lib/screens/auth/verification_methods_screen.dart +++ b/lib/screens/auth/verification_methods_screen.dart @@ -515,7 +515,7 @@ class _VerificationMethodsScreenState extends State { return AppLoaderWidget(); }); - this.checkActivationCode(value: value); + this.checkActivationCode(value: value,isSilentLogin: false); }, () => { diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index 94eb8979..56dc848f 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -198,7 +198,7 @@ class _PatientProfileScreenState extends State with Single ), ], ), - if (isFromLiveCare + if ( isInpatient? true:isFromLiveCare ? patient.episodeNo != null : patient.patientStatusType != null && patient.patientStatusType == 43) BaseView( @@ -253,7 +253,7 @@ class _PatientProfileScreenState extends State with Single AppButton( title: "${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}", - color: isFromLiveCare + color: isInpatient || isFromLiveCare ? Colors.red.shade700 : patient.patientStatusType == 43 ? Colors.red.shade700 diff --git a/pubspec.lock b/pubspec.lock index 491e4c5b..e2215d0c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -43,6 +43,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.7.3" + badges: + dependency: "direct main" + description: + name: badges + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" barcode_scan_fix: dependency: "direct main" description: @@ -657,7 +664,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.4" + version: "1.3.0-nullsafety.3" mime: dependency: transitive description: @@ -949,7 +956,7 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.2" + version: "1.10.0-nullsafety.1" sticky_headers: dependency: "direct main" description: @@ -1147,5 +1154,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.10.0 <=2.11.0-213.1.beta" + dart: ">=2.10.0 <2.11.0" flutter: ">=1.22.0 <2.0.0"