From a91d64f10343c8bce76c8555337be0988b94d138 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Mon, 26 Apr 2021 23:06:18 +0300 Subject: [PATCH 1/3] samll fix --- lib/screens/patients/profile/patient_profile_screen.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/screens/patients/profile/patient_profile_screen.dart b/lib/screens/patients/profile/patient_profile_screen.dart index 9cb8a0d4..93f70876 100644 --- a/lib/screens/patients/profile/patient_profile_screen.dart +++ b/lib/screens/patients/profile/patient_profile_screen.dart @@ -80,6 +80,7 @@ class _PatientProfileScreenState extends Statewith SingleT child: Scaffold( appBar: AppBar( backgroundColor: Colors.white, + automaticallyImplyLeading: false, toolbarHeight: 65, elevation: 0, bottom: TabBar( From 48471bbc0747e94e6ea9996140f7ffd3ddd0b460 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Mon, 26 Apr 2021 23:07:07 +0300 Subject: [PATCH 2/3] fix small --- .../patients/patient_search/patient_search_screen_new.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/screens/patients/patient_search/patient_search_screen_new.dart b/lib/screens/patients/patient_search/patient_search_screen_new.dart index 14d65831..5c6b833f 100644 --- a/lib/screens/patients/patient_search/patient_search_screen_new.dart +++ b/lib/screens/patients/patient_search/patient_search_screen_new.dart @@ -296,7 +296,7 @@ class _PatientSearchScreenNewState extends State { patientFileInfoController.text.isNotEmpty ? true : false, isSearch: true, searchKey: patientFileInfoController.text, - isInpatient: selectedPatientType == PatientType.OutPatient && patientFileInfoController.text.isEmpty?false: true, + isInpatient: selectedPatientType == PatientType.OutPatient?false: true, ), ), ); From 29831e82071524b59397221ef357b47c082eef14 Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Mon, 26 Apr 2021 23:16:25 +0300 Subject: [PATCH 3/3] return code back --- .../patients/patient_search/patient_search_screen_new.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/screens/patients/patient_search/patient_search_screen_new.dart b/lib/screens/patients/patient_search/patient_search_screen_new.dart index 5c6b833f..14d65831 100644 --- a/lib/screens/patients/patient_search/patient_search_screen_new.dart +++ b/lib/screens/patients/patient_search/patient_search_screen_new.dart @@ -296,7 +296,7 @@ class _PatientSearchScreenNewState extends State { patientFileInfoController.text.isNotEmpty ? true : false, isSearch: true, searchKey: patientFileInfoController.text, - isInpatient: selectedPatientType == PatientType.OutPatient?false: true, + isInpatient: selectedPatientType == PatientType.OutPatient && patientFileInfoController.text.isEmpty?false: true, ), ), );