From aeecc12cbe8ab11cc0c54ccd7311a6038bd607dc Mon Sep 17 00:00:00 2001 From: mosazaid Date: Wed, 7 Apr 2021 15:39:23 +0300 Subject: [PATCH] fix bug --- .../objective/examination-item-card.dart | 15 +++-- .../objective/update_objective_page.dart | 60 +++++++++++-------- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart b/lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart index ff5d0a6c..903dc69c 100644 --- a/lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart +++ b/lib/widgets/patients/profile/soap_update/objective/examination-item-card.dart @@ -19,6 +19,7 @@ class ExaminationIitemCard extends StatelessWidget { return Container( color: Colors.white, padding: EdgeInsets.all(8), + margin: EdgeInsets.only(bottom: 8), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -77,14 +78,12 @@ class ExaminationIitemCard extends StatelessWidget { SizedBox( height: 4, ), - Expanded( - child: AppText( - examination.remark, - fontWeight: FontWeight.normal, - fontFamily: 'Poppins', - color: Colors.grey.shade500, - fontSize: SizeConfig.textMultiplier * 1.8, - ), + AppText( + examination.remark, + fontWeight: FontWeight.normal, + fontFamily: 'Poppins', + color: Colors.grey.shade500, + fontSize: SizeConfig.textMultiplier * 1.8, ), ], ), diff --git a/lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart b/lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart index ba9368bb..9a8146f5 100644 --- a/lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart +++ b/lib/widgets/patients/profile/soap_update/objective/update_objective_page.dart @@ -134,7 +134,7 @@ class _UpdateObjectivePageState extends State { HeaderBodyExpandableNotifier( headerWidget: Row( mainAxisAlignment: - MainAxisAlignment.spaceBetween, + MainAxisAlignment.spaceBetween, children: [ Row( children: [ @@ -142,7 +142,7 @@ class _UpdateObjectivePageState extends State { "${TranslationBase.of(context).physicalSystemExamination}", fontFamily: 'Poppins', fontSize: - SizeConfig.textMultiplier * 2.0, + SizeConfig.textMultiplier * 2.0, fontWeight: isSysExaminationExpand ? FontWeight.w700 : FontWeight.normal, @@ -158,7 +158,7 @@ class _UpdateObjectivePageState extends State { onTap: () { setState(() { isSysExaminationExpand = - !isSysExaminationExpand; + !isSysExaminationExpand; }); }, child: Icon(isSysExaminationExpand @@ -176,7 +176,7 @@ class _UpdateObjectivePageState extends State { padding: EdgeInsets.symmetric( vertical: 8, horizontal: 8.0), margin: - EdgeInsets.symmetric(vertical: 8), + EdgeInsets.symmetric(vertical: 8), decoration: BoxDecoration( border: Border.all( color: Colors.grey.shade400, @@ -188,33 +188,33 @@ class _UpdateObjectivePageState extends State { ), child: Row( mainAxisAlignment: - MainAxisAlignment.spaceBetween, + MainAxisAlignment.spaceBetween, crossAxisAlignment: - CrossAxisAlignment.center, + CrossAxisAlignment.center, children: [ Expanded( child: Column( - crossAxisAlignment: + crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - "${TranslationBase.of(context).addExamination}", - fontSize: SizeConfig + children: [ + AppText( + "${TranslationBase.of(context).addExamination}", + fontSize: SizeConfig .textMultiplier * - 1.8, - color: Colors.black, - fontWeight: FontWeight.bold, - ), - AppText( - "${TranslationBase.of(context).searchHere}", - fontSize: SizeConfig + 1.8, + color: Colors.black, + fontWeight: FontWeight.bold, + ), + AppText( + "${TranslationBase.of(context).searchHere}", + fontSize: SizeConfig .textMultiplier * - 1.8, - color: Colors.grey.shade700, - fontWeight: FontWeight.bold, - ), - ], - )), + 1.8, + color: Colors.grey.shade700, + fontWeight: FontWeight.bold, + ), + ], + )), Icon( Icons.add_box_rounded, size: 25, @@ -223,6 +223,18 @@ class _UpdateObjectivePageState extends State { ), ), ), + /* ...List.generate( + widget.mySelectedExamination.length, + (index) => Container( + child: ExaminationIitemCard( + widget.mySelectedExamination[ + index], () { + removeExamination(widget + .mySelectedExamination[ + index] + .selectedExamination); + }), + )),*/ Column( children: widget.mySelectedExamination .map((examination) {