From 709c11d10341e219ea2dcf8bc7c06d4efe171aba Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Sun, 4 Apr 2021 12:35:32 +0300 Subject: [PATCH] Design Fixes --- .../medical-file/medical_file_details.dart | 8 +-- .../prescription/add_prescription_form.dart | 63 +++++++++++-------- .../procedures/add-procedure-form.dart | 29 +++++++-- lib/screens/procedures/add_lab_orders.dart | 29 +++++++-- .../procedures/add_radiology_order.dart | 29 +++++++-- lib/screens/procedures/update-procedure.dart | 19 +++++- .../profile_medical_info_widget_search.dart | 10 +++ 7 files changed, 141 insertions(+), 46 deletions(-) diff --git a/lib/screens/medical-file/medical_file_details.dart b/lib/screens/medical-file/medical_file_details.dart index 77fddfe5..b52fabed 100644 --- a/lib/screens/medical-file/medical_file_details.dart +++ b/lib/screens/medical-file/medical_file_details.dart @@ -61,10 +61,10 @@ class _MedicalFileDetailsState extends State { this.encounterNumber, this.pp, this.patient}); - bool isPhysicalExam = false; - bool isProcedureExpand = false; - bool isHistoryExpand = false; - bool isAssessmentExpand = false; + bool isPhysicalExam = true; + bool isProcedureExpand = true; + bool isHistoryExpand = true; + bool isAssessmentExpand = true; @override Widget build(BuildContext context) { diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 5dc04221..7431279a 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -218,8 +218,8 @@ class _PrescriptionFormWidgetState extends State { FocusScope.of(context).requestFocus(new FocusNode()); }, child: DraggableScrollableSheet( - initialChildSize: 0.90, - maxChildSize: 0.90, + initialChildSize: 0.98, + maxChildSize: 0.98, minChildSize: 0.9, builder: (BuildContext context, ScrollController scrollController) { @@ -234,25 +234,30 @@ class _PrescriptionFormWidgetState extends State { crossAxisAlignment: CrossAxisAlignment.start, //mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - Row( + Column( children: [ - AppText( - 'New Prescription Order', - fontWeight: FontWeight.w700, - fontSize: 20, + Row( + children: [ + InkWell( + child: Icon( + Icons.close, + size: 24.0, + ), + onTap: () { + Navigator.pop(context); + }, + ), + ], ), - SizedBox( - width: MediaQuery.of(context).size.width * 0.32, + Row( + children: [ + AppText( + 'New Prescription Order', + fontWeight: FontWeight.w700, + fontSize: 20, + ), + ], ), - InkWell( - child: Icon( - Icons.close, - size: 23.0, - ), - onTap: () { - Navigator.pop(context); - }, - ) ], ), SizedBox( @@ -511,15 +516,19 @@ class _PrescriptionFormWidgetState extends State { } : null, child: TextField( - decoration: - textFieldSelectorDecoration( - 'UNIT', - units != null - ? units['description'] - : null, - true), - enabled: false, - ), + decoration: + textFieldSelectorDecoration( + 'UNIT', + units != null + ? units[ + 'description'] + : null, + true), + enabled: + model.itemMedicineListUnit != + null + ? false + : true), ), ), ], diff --git a/lib/screens/procedures/add-procedure-form.dart b/lib/screens/procedures/add-procedure-form.dart index 605bb61c..39aed026 100644 --- a/lib/screens/procedures/add-procedure-form.dart +++ b/lib/screens/procedures/add-procedure-form.dart @@ -156,10 +156,31 @@ class _AddSelectedProcedureState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - 'Please Select Category', - fontWeight: FontWeight.w900, - fontSize: 15.0, + Column( + children: [ + Row( + children: [ + InkWell( + child: Icon( + Icons.close, + size: 24.0, + ), + onTap: () { + Navigator.pop(context); + }, + ), + ], + ), + Row( + children: [ + AppText( + 'Please Select Category', + fontWeight: FontWeight.w700, + fontSize: 20, + ), + ], + ), + ], ), SizedBox( height: 10.0, diff --git a/lib/screens/procedures/add_lab_orders.dart b/lib/screens/procedures/add_lab_orders.dart index d72ffa65..5c0cde24 100644 --- a/lib/screens/procedures/add_lab_orders.dart +++ b/lib/screens/procedures/add_lab_orders.dart @@ -157,10 +157,31 @@ class _AddSelectedLabOrderState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - 'New Lab Order', - fontWeight: FontWeight.w900, - fontSize: 18.0, + Column( + children: [ + Row( + children: [ + InkWell( + child: Icon( + Icons.close, + size: 24.0, + ), + onTap: () { + Navigator.pop(context); + }, + ), + ], + ), + Row( + children: [ + AppText( + 'New Radiology Order', + fontWeight: FontWeight.w700, + fontSize: 20, + ), + ], + ), + ], ), SizedBox( height: 10.0, diff --git a/lib/screens/procedures/add_radiology_order.dart b/lib/screens/procedures/add_radiology_order.dart index d3ae723d..9fc76dc4 100644 --- a/lib/screens/procedures/add_radiology_order.dart +++ b/lib/screens/procedures/add_radiology_order.dart @@ -157,10 +157,31 @@ class _AddSelectedRadiologyOrderState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText( - 'New Radiology Order', - fontWeight: FontWeight.w900, - fontSize: 18.0, + Column( + children: [ + Row( + children: [ + InkWell( + child: Icon( + Icons.close, + size: 24.0, + ), + onTap: () { + Navigator.pop(context); + }, + ), + ], + ), + Row( + children: [ + AppText( + 'New Radiology Order', + fontWeight: FontWeight.w700, + fontSize: 20, + ), + ], + ), + ], ), SizedBox( height: 10.0, diff --git a/lib/screens/procedures/update-procedure.dart b/lib/screens/procedures/update-procedure.dart index 0cfe9d53..d9c6a20a 100644 --- a/lib/screens/procedures/update-procedure.dart +++ b/lib/screens/procedures/update-procedure.dart @@ -279,19 +279,22 @@ class _UpdateProcedureWidgetState extends State { child: TextFields( fontSize: 15.0, controller: widget.remarksController, + hintText: widget.remarksController.text.isEmpty + ? 'No Remarks Added' + : '', maxLines: 3, minLines: 2, onChanged: (value) {}, ), ), SizedBox( - height: 50.0, + height: 70.0, ), Container( margin: EdgeInsets.all(SizeConfig.widthMultiplier * 2), - child: Wrap( - alignment: WrapAlignment.center, + child: Column( + //alignment: WrapAlignment.center, children: [ AppButton( color: Color(0xff359846), @@ -320,6 +323,16 @@ class _UpdateProcedureWidgetState extends State { // authorizationForm(context); }, ), + SizedBox( + height: 20.0, + ), + AppButton( + title: TranslationBase.of(context).cancel, + color: Color(0xFFB9382C), + onPressed: () { + Navigator.pop(context); + }, + ) ], ), ), diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart index c49c4576..b4c445ca 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart @@ -134,6 +134,16 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { nameLine1: TranslationBase.of(context).progress, nameLine2: TranslationBase.of(context).note, icon: 'patient/Progress_notes.png'), + if (int.parse(patientType) == 7 || int.parse(patientType) == 6) + PatientProfileButton( + key: key, + patient: patient, + patientType: patientType, + arrivalType: arrivalType, + route: ORDER_PROCEDURE, + nameLine1: TranslationBase.of(context).orders, + nameLine2: TranslationBase.of(context).procedures, + icon: 'patient/Order_Procedures.png'), ], ), );