From 94b86ee4b92643ead7e1480fec4fae9cb3c99a00 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 5 Jan 2022 09:59:50 +0200 Subject: [PATCH 1/3] fix the size of the button inside the app --- lib/widgets/shared/buttons/app_buttons_widget.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/widgets/shared/buttons/app_buttons_widget.dart b/lib/widgets/shared/buttons/app_buttons_widget.dart index 5f2d3faf..395a8cd2 100644 --- a/lib/widgets/shared/buttons/app_buttons_widget.dart +++ b/lib/widgets/shared/buttons/app_buttons_widget.dart @@ -54,12 +54,12 @@ class _AppButtonState extends State { Widget build(BuildContext context) { if (widget.fontSize == null) { widget.fontSize = SizeConfig.getHeightMultiplier() * - (SizeConfig.isHeightVeryShort ? 1.3 : 1.7); + (SizeConfig.isHeightVeryShort ? 2.1 :SizeConfig.isHeightShort?1.8: 1.7); } return Container( // height: MediaQuery.of(context).size.height * 0.075, height: widget.height?? SizeConfig.heightMultiplier * - (SizeConfig.isHeightVeryShort ? 6 : 5), + (SizeConfig.isHeightVeryShort ? 6 :SizeConfig.isHeightShort?5.5: 5), child: IgnorePointer( ignoring: widget.loading || widget.disabled, child: RawMaterialButton( From 175565030481ecb5ba3b5755ded9c5257bb21b89 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 5 Jan 2022 10:38:00 +0200 Subject: [PATCH 2/3] fix add progress note --- .../all_lab_special_result_page.dart | 3 +++ .../notes/note/progress_note_screen.dart | 22 +++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart b/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart index 6dfe77b0..0f550191 100644 --- a/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart +++ b/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart @@ -88,6 +88,9 @@ class _AllLabSpecialResultState extends State { ], ), ), + if(model.allSpecialLabList.length == 0) + ErrorMessage(error: TranslationBase.of(context).noItem), + if(model.allSpecialLabList.length > 0) ListView.builder( physics: NeverScrollableScrollPhysics(), itemCount: model.allSpecialLabList.length, diff --git a/lib/screens/patients/profile/notes/note/progress_note_screen.dart b/lib/screens/patients/profile/notes/note/progress_note_screen.dart index ae6681e7..c5efe09b 100644 --- a/lib/screens/patients/profile/notes/note/progress_note_screen.dart +++ b/lib/screens/patients/profile/notes/note/progress_note_screen.dart @@ -88,16 +88,7 @@ class _ProgressNoteState extends State { patient, isInpatient: true, ), - body: model.patientProgressNoteList == null || - model.patientProgressNoteList.length == 0 - ? widget.visitType == 3 - ? ErrorMessage( - error: TranslationBase.of(context).errorNoOrders, - ) - : ErrorMessage( - error: TranslationBase.of(context).errorNoProgressNote, - ) - : Container( + body: Container( color: Colors.grey[200], child: Column( children: [ @@ -125,7 +116,16 @@ class _ProgressNoteState extends State { ? TranslationBase.of(context).addNewOrderSheet : TranslationBase.of(context).addProgressNote, ), - Expanded( + model.patientProgressNoteList == null || + model.patientProgressNoteList.length == 0 + ? widget.visitType == 3 + ? ErrorMessage( + error: TranslationBase.of(context).errorNoOrders, + ) + : ErrorMessage( + error: TranslationBase.of(context).errorNoProgressNote, + ) + :Expanded( child: Container( child: ListView.builder( itemCount: model.patientProgressNoteList.length, From 294d979255990f8012d793a567b06d5e47944f31 Mon Sep 17 00:00:00 2001 From: Elham Rababh Date: Wed, 5 Jan 2022 10:51:44 +0200 Subject: [PATCH 3/3] small fix --- .../profile/notes/note/progress_note_screen.dart | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/screens/patients/profile/notes/note/progress_note_screen.dart b/lib/screens/patients/profile/notes/note/progress_note_screen.dart index c5efe09b..b8220939 100644 --- a/lib/screens/patients/profile/notes/note/progress_note_screen.dart +++ b/lib/screens/patients/profile/notes/note/progress_note_screen.dart @@ -116,16 +116,7 @@ class _ProgressNoteState extends State { ? TranslationBase.of(context).addNewOrderSheet : TranslationBase.of(context).addProgressNote, ), - model.patientProgressNoteList == null || - model.patientProgressNoteList.length == 0 - ? widget.visitType == 3 - ? ErrorMessage( - error: TranslationBase.of(context).errorNoOrders, - ) - : ErrorMessage( - error: TranslationBase.of(context).errorNoProgressNote, - ) - :Expanded( + Expanded( child: Container( child: ListView.builder( itemCount: model.patientProgressNoteList.length,