From 3795381e3b636f2b31d18bd00f2e68118893f479 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 7 Apr 2021 19:27:46 +0300 Subject: [PATCH] assessment fix --- .../profile/soap_update/steps_widget.dart | 298 +++++++++--------- .../soap_update/update_assessment_page.dart | 2 +- 2 files changed, 155 insertions(+), 145 deletions(-) diff --git a/lib/widgets/patients/profile/soap_update/steps_widget.dart b/lib/widgets/patients/profile/soap_update/steps_widget.dart index 2e2c77c0..3ad583d0 100644 --- a/lib/widgets/patients/profile/soap_update/steps_widget.dart +++ b/lib/widgets/patients/profile/soap_update/steps_widget.dart @@ -47,24 +47,24 @@ class StepsWidget extends StatelessWidget { border: index == 0 ? Border.all(color: Color(0xFFCC9B14), width: 2) : index > 0 - ? null - : Border.all( - color: Colors.black, width: 0.75), + ? null + : Border.all( + color: Colors.black, width: 0.75), shape: BoxShape.circle, color: index == 0 ? Color(0xFFCC9B14) : index > 0 - ? Color(0xFF359846) - : Color(0xFFCCCCCC), + ? Color(0xFF359846) + : Color(0xFFCCCCCC), ), child: Center( - child: Icon(FontAwesomeIcons.check, size: 20, - color: Colors.white,) - ), - ), - SizedBox( - height:5 + child: Icon( + FontAwesomeIcons.check, + size: 20, + color: Colors.white, + )), ), + SizedBox(height: 5), Column( mainAxisAlignment: MainAxisAlignment.start, children: [ @@ -73,8 +73,10 @@ class StepsWidget extends StatelessWidget { fontWeight: FontWeight.bold, fontSize: 12, ), - StatusLabel(selectedStepId: index, stepId: 0,), - + StatusLabel( + selectedStepId: index, + stepId: 0, + ), ], ), ], @@ -83,10 +85,7 @@ class StepsWidget extends StatelessWidget { ), Positioned( top: 50, - left: MediaQuery - .of(context) - .size - .width * 0.28, + left: MediaQuery.of(context).size.width * 0.28, child: InkWell( onTap: () => index >= 1 ? changeCurrentTab(1) : null, child: Column( @@ -99,23 +98,25 @@ class StepsWidget extends StatelessWidget { border: index == 1 ? Border.all(color: Color(0xFFCC9B14), width: 2) : index > 2 - ? null - : Border.all( - color: Color(0xFFCCCCCC), width: 0.75), + ? null + : Border.all( + color: Color(0xFFCCCCCC), width: 0.75), shape: BoxShape.circle, color: index == 1 ? Color(0xFFCC9B14) : index > 1 - ? Color(0xFF359846) - : Color(0xFFCCCCCC), + ? Color(0xFF359846) + : Color(0xFFCCCCCC), ), child: Center( - child: Icon(FontAwesomeIcons.check, size: 20, - color: Colors.white,) - ), + child: Icon( + FontAwesomeIcons.check, + size: 20, + color: Colors.white, + )), ), SizedBox( - height:5, + height: 5, ), Column( mainAxisAlignment: MainAxisAlignment.start, @@ -125,9 +126,10 @@ class StepsWidget extends StatelessWidget { fontWeight: FontWeight.bold, fontSize: 12, ), - - StatusLabel(selectedStepId: index, stepId: 1,), - + StatusLabel( + selectedStepId: index, + stepId: 1, + ), ], ), ], @@ -136,14 +138,10 @@ class StepsWidget extends StatelessWidget { ), Positioned( top: 50, - left: MediaQuery - .of(context) - .size - .width * 0.52, + left: MediaQuery.of(context).size.width * 0.52, child: InkWell( onTap: () { - if (index >= 3) - changeCurrentTab(2); + if (index >= 3) changeCurrentTab(2); }, child: Column( crossAxisAlignment: CrossAxisAlignment.center, @@ -155,23 +153,25 @@ class StepsWidget extends StatelessWidget { border: index == 2 ? Border.all(color: Color(0xFFCC9B14), width: 2) : index > 2 - ? null - : Border.all( - color: Color(0xFFCCCCCC), width: 0.75), + ? null + : Border.all( + color: Color(0xFFCCCCCC), width: 0.75), shape: BoxShape.circle, color: index == 2 ? Color(0xFFCC9B14) : index > 2 - ? Color(0xFFCC9B14) - : Color(0xFFCCCCCC), + ? Color(0xFF359846) + : Color(0xFFCCCCCC), ), child: Center( - child: Icon(FontAwesomeIcons.check, size: 20, - color: Colors.white,) - ), + child: Icon( + FontAwesomeIcons.check, + size: 20, + color: Colors.white, + )), ), SizedBox( - height:5, + height: 5, ), Column( mainAxisAlignment: MainAxisAlignment.start, @@ -181,7 +181,10 @@ class StepsWidget extends StatelessWidget { fontWeight: FontWeight.bold, fontSize: 12, ), - StatusLabel(selectedStepId: index, stepId: 2,), + StatusLabel( + selectedStepId: index, + stepId: 2, + ), ], ), ], @@ -203,38 +206,43 @@ class StepsWidget extends StatelessWidget { border: index == 3 ? Border.all(color: Color(0xFFCC9B14), width: 2) : index > 3 - ? null - : Border.all( - color: Color(0xFFCCCCCC), width: 0.75), + ? null + : Border.all( + color: Color(0xFFCCCCCC), width: 0.75), shape: BoxShape.circle, color: index == 3 ? Color(0xFFCC9B14) : index > 3 - ? Color(0xFF359846) - : Color(0xFFCCCCCC), + ? Color(0xFF359846) + : Color(0xFFCCCCCC), ), child: Center( - child: Icon(FontAwesomeIcons.check, size: 20, - color: Colors.white,) - ), + child: Icon( + FontAwesomeIcons.check, + size: 20, + color: Colors.white, + )), ), SizedBox( - height:5, + height: 5, + ), + Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + AppText( + "Plan", + fontWeight: FontWeight.bold, + textAlign: TextAlign.center, + fontSize: 12, + ), + StatusLabel( + selectedStepId: index, + stepId: 3, + ), + ], + ), ), - Center( - child: Column( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - AppText( - "Plan", - fontWeight: FontWeight.bold, - textAlign: TextAlign.center, - fontSize: 12, - ), - StatusLabel(selectedStepId: index, stepId: 3,), - ], - ), - ), ], ), ), @@ -245,10 +253,7 @@ class StepsWidget extends StatelessWidget { children: [ Container( height: height == 0 ? 150 : height, - width: MediaQuery - .of(context) - .size - .width, + width: MediaQuery.of(context).size.width, color: Colors.transparent, child: Center( child: Divider( @@ -273,24 +278,24 @@ class StepsWidget extends StatelessWidget { border: index == 0 ? Border.all(color: Color(0xFFCC9B14), width: 2) : index > 0 - ? null - : Border.all( - color: Colors.black, width: 0.75), + ? null + : Border.all( + color: Colors.black, width: 0.75), shape: BoxShape.circle, color: index == 0 ? Color(0xFFCC9B14) : index > 0 - ? Color(0xFF359846) - : Color(0xFFCCCCCC), + ? Color(0xFF359846) + : Color(0xFFCCCCCC), ), child: Center( - child: Icon(FontAwesomeIcons.check, size: 20, - color: Colors.white,) - ), - ), - SizedBox( - height:5 + child: Icon( + FontAwesomeIcons.check, + size: 20, + color: Colors.white, + )), ), + SizedBox(height: 5), AppText( "شخصي", fontWeight: FontWeight.bold, @@ -302,10 +307,7 @@ class StepsWidget extends StatelessWidget { ), Positioned( top: 50, - right: MediaQuery - .of(context) - .size - .width * 0.28, + right: MediaQuery.of(context).size.width * 0.28, child: InkWell( onTap: () => index >= 2 ? changeCurrentTab(1) : null, child: Column( @@ -318,28 +320,28 @@ class StepsWidget extends StatelessWidget { border: index == 1 ? Border.all(color: Color(0xFFCC9B14), width: 2) : index > 2 - ? null - : Border.all( - color: Color(0xFFCCCCCC), width: 0.75), + ? null + : Border.all( + color: Color(0xFFCCCCCC), width: 0.75), shape: BoxShape.circle, color: index == 1 ? Color(0xFFCC9B14) : index > 1 - ? Color(0xFF359846) - : Color(0xFFCCCCCC), + ? Color(0xFF359846) + : Color(0xFFCCCCCC), ), child: Center( - child: Icon(FontAwesomeIcons.check, size: 20, - color: Colors.white,) - ), - ), - SizedBox( - height:5 + child: Icon( + FontAwesomeIcons.check, + size: 20, + color: Colors.white, + )), ), + SizedBox(height: 5), AppText( "هدف", fontWeight: FontWeight.bold, - fontSize:14, + fontSize: 14, ), ], ), @@ -347,10 +349,7 @@ class StepsWidget extends StatelessWidget { ), Positioned( top: 50, - right: MediaQuery - .of(context) - .size - .width * 0.52, + right: MediaQuery.of(context).size.width * 0.52, child: InkWell( onTap: () => index >= 3 ? changeCurrentTab(2) : null, child: Column( @@ -363,32 +362,33 @@ class StepsWidget extends StatelessWidget { border: index == 2 ? Border.all(color: Color(0xFFCC9B14), width: 2) : index > 2 - ? null - : Border.all( - color: Color(0xFFCCCCCC), width: 0.75), + ? null + : Border.all( + color: Color(0xFFCCCCCC), width: 0.75), shape: BoxShape.circle, color: index == 2 ? Color(0xFFCC9B14) : index > 2 - ? Color(0xFFCC9B14) - : Color(0xFFCCCCCC), + ? Color(0xFFCC9B14) + : Color(0xFFCCCCCC), ), child: Center( - child: Icon(FontAwesomeIcons.check, size: 20, - color: Colors.white,) - ), + child: Icon( + FontAwesomeIcons.check, + size: 20, + color: Colors.white, + )), ), SizedBox( - height:5, + height: 5, ), Padding( - padding: const EdgeInsets.only(right: 2), child: AppText( - "تقدير", - fontWeight: FontWeight.bold, - fontSize:14, - ), + "تقدير", + fontWeight: FontWeight.bold, + fontSize: 14, + ), ), ], ), @@ -409,44 +409,48 @@ class StepsWidget extends StatelessWidget { border: index == 3 ? Border.all(color: Color(0xFFCC9B14), width: 2) : index > 3 - ? null - : Border.all( - color: Color(0xFFCCCCCC), width: 0.75), + ? null + : Border.all( + color: Color(0xFFCCCCCC), width: 0.75), shape: BoxShape.circle, color: index == 3 ? Color(0xFFCC9B14) : index > 3 - ? Color(0xFFCC9B14) - : Color(0xFFCCCCCC), + ? Color(0xFFCC9B14) + : Color(0xFFCCCCCC), ), child: Center( - child: Icon(FontAwesomeIcons.check, size: 20, - color: Colors.white,) - ), + child: Icon( + FontAwesomeIcons.check, + size: 20, + color: Colors.white, + )), ), SizedBox( - height:5, + height: 5, ), - Container( - margin: EdgeInsets.only(right:index == 3? 15:0), - child: AppText( + Container( + margin: EdgeInsets.only(right: index == 3 ? 15 : 0), + child: AppText( "خطة", fontWeight: FontWeight.bold, - fontSize:14, - ), - ), + fontSize: 14, + ), + ), ], ), ), ), ], - ); + ); } } class StatusLabel extends StatelessWidget { const StatusLabel({ - Key key, this.stepId, this.selectedStepId, + Key key, + this.stepId, + this.selectedStepId, }) : super(key: key); final int stepId; @@ -458,24 +462,30 @@ class StatusLabel extends StatelessWidget { width: 65, padding: EdgeInsets.symmetric(horizontal: 2, vertical: 3), decoration: BoxDecoration( - color: stepId == selectedStepId ? Color(0xFFF1E9D3) : stepId < - selectedStepId ? Color(0xFFD8E8DB) : Color(0xFFCCCCCC), + color: stepId == selectedStepId + ? Color(0xFFF1E9D3) + : stepId < selectedStepId + ? Color(0xFFD8E8DB) + : Color(0xFFCCCCCC), borderRadius: BorderRadius.all( Radius.circular(5.0), ), - border: Border.all( - color: HexColor('#707070'), - width: 0.30), + border: Border.all(color: HexColor('#707070'), width: 0.30), ), child: AppText( - stepId == selectedStepId ? "inProgress" : stepId < selectedStepId - ? "Completed" - : " Locked ", + stepId == selectedStepId + ? "inProgress" + : stepId < selectedStepId + ? "Completed" + : " Locked ", fontWeight: FontWeight.bold, textAlign: TextAlign.center, fontSize: 10, - color: stepId == selectedStepId ? Color(0xFFCC9B14) : stepId < - selectedStepId ? Color(0xFF359846) : Color(0xFF969696), + color: stepId == selectedStepId + ? Color(0xFFCC9B14) + : stepId < selectedStepId + ? Color(0xFF359846) + : Color(0xFF969696), ), ); } 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 f13dd897..18f4f19d 100644 --- a/lib/widgets/patients/profile/soap_update/update_assessment_page.dart +++ b/lib/widgets/patients/profile/soap_update/update_assessment_page.dart @@ -529,7 +529,7 @@ class _UpdateAssessmentPageState extends State { fontWeight: FontWeight.w700, loading: model.state == ViewState.BusyLocal, onPressed: () async { - Navigator.pop(context); + widget.changePageViewIndex(1); }, ), ),