From a7ca7fb271353e1b8698630fbbfbfbdace7e592e Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Thu, 21 Jan 2021 15:37:39 +0200 Subject: [PATCH] fix DA-151 --- .../profile/soap_update/steps_widget.dart | 4 +- .../soap_update/update_assessment_page.dart | 3 + .../soap_update/update_objective_page.dart | 57 +++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lib/widgets/patients/profile/soap_update/steps_widget.dart b/lib/widgets/patients/profile/soap_update/steps_widget.dart index ab088e36..ac5bee65 100644 --- a/lib/widgets/patients/profile/soap_update/steps_widget.dart +++ b/lib/widgets/patients/profile/soap_update/steps_widget.dart @@ -37,7 +37,7 @@ class StepsWidget extends StatelessWidget { child: InkWell( onTap: () => changeCurrentTab(0), child: Column( - crossAxisAlignment: CrossAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( width: index == 0 ? 70 : 50, @@ -259,7 +259,7 @@ class StepsWidget extends StatelessWidget { child: InkWell( onTap: () => changeCurrentTab(0), child: Column( - crossAxisAlignment: CrossAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( width: index == 0 ? 70 : 50, diff --git a/lib/widgets/patients/profile/soap_update/update_assessment_page.dart b/lib/widgets/patients/profile/soap_update/update_assessment_page.dart index 007ef737..7bcea474 100644 --- a/lib/widgets/patients/profile/soap_update/update_assessment_page.dart +++ b/lib/widgets/patients/profile/soap_update/update_assessment_page.dart @@ -694,6 +694,9 @@ class _AddAssessmentDetailsState extends State { maxLines: 18, minLines: 5, controller: remarkController, + onChanged:(value) { + widget.mySelectedAssessment.remark = remarkController.text; + }, validator: (value) { if (value == null) return TranslationBase diff --git a/lib/widgets/patients/profile/soap_update/update_objective_page.dart b/lib/widgets/patients/profile/soap_update/update_objective_page.dart index 13ed4c51..adf1e3d2 100644 --- a/lib/widgets/patients/profile/soap_update/update_objective_page.dart +++ b/lib/widgets/patients/profile/soap_update/update_objective_page.dart @@ -505,7 +505,7 @@ class _AddExaminationDailogState extends State { }, builder: (_, model, w) => AppScaffold( - // baseViewModel: model, + baseViewModel: model, isShowAppBar: false, body: Center( child: Container( @@ -518,41 +518,38 @@ class _AddExaminationDailogState extends State { height: 16, ), AppText( - "Examinations", + TranslationBase.of(context).physicalSystemExamination, fontWeight: FontWeight.bold, fontSize: 16, ), SizedBox( height: 16, ), - NetworkBaseView( - baseViewModel: model, - child: MasterKeyCheckboxSearchWidget( - model: model, - hintSearchText: TranslationBase.of(context).searchExamination, - buttonName: TranslationBase.of(context).addExamination, - masterList: model.physicalExaminationList, - removeHistory: (history){ - setState(() { - widget.removeExamination(history); - }); - }, - addHistory: (history){ - setState(() { - MySelectedExamination mySelectedExamination = new MySelectedExamination( - selectedExamination: history - ); - widget - .mySelectedExamination - .add( - mySelectedExamination); - }); - }, - addSelectedHistories: (){ - widget.addSelectedExamination(); - }, - isServiceSelected: (master) =>isServiceSelected(master), - ), + MasterKeyCheckboxSearchWidget( + model: model, + hintSearchText: TranslationBase.of(context).searchExamination, + buttonName: TranslationBase.of(context).addExamination, + masterList: model.physicalExaminationList, + removeHistory: (history){ + setState(() { + widget.removeExamination(history); + }); + }, + addHistory: (history){ + setState(() { + MySelectedExamination mySelectedExamination = new MySelectedExamination( + selectedExamination: history + ); + widget + .mySelectedExamination + .add( + mySelectedExamination); + }); + }, + addSelectedHistories: (){ + widget.addSelectedExamination(); + }, + isServiceSelected: (master) =>isServiceSelected(master), ), ]), ))),