diff --git a/lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart b/lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart index 24a69a0b..57eb065b 100644 --- a/lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart +++ b/lib/widgets/patients/profile/soap_update/expandable_SOAP_widget.dart @@ -38,7 +38,7 @@ class ExpandableSOAPWidget extends StatelessWidget { Texts(headerTitle, variant: isExpanded ? "bodyText" : '', bold: isExpanded ? true : false, - fontSize: 20, + fontSize: 15, color: Colors.black), Icon( FontAwesomeIcons.asterisk, diff --git a/lib/widgets/patients/profile/soap_update/steps_widget.dart b/lib/widgets/patients/profile/soap_update/steps_widget.dart index 9a6747c8..88c47706 100644 --- a/lib/widgets/patients/profile/soap_update/steps_widget.dart +++ b/lib/widgets/patients/profile/soap_update/steps_widget.dart @@ -222,6 +222,7 @@ class StepsWidget extends StatelessWidget { ), Center( child: Column( + crossAxisAlignment: CrossAxisAlignment.end, children: [ AppText( "Plan", diff --git a/lib/widgets/patients/profile/soap_update/subjective/update_Chief_complaints.dart b/lib/widgets/patients/profile/soap_update/subjective/update_Chief_complaints.dart index 90211413..ef1caeb5 100644 --- a/lib/widgets/patients/profile/soap_update/subjective/update_Chief_complaints.dart +++ b/lib/widgets/patients/profile/soap_update/subjective/update_Chief_complaints.dart @@ -28,80 +28,78 @@ class UpdateChiefComplaints extends StatelessWidget { SizedBox( height: 20, ), - - Container( - - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all( - Radius.circular(10.0), - ), - border: Border.all( - color: HexColor('#707070'), - width: 0.30), - ), - child: NewTextFields( - hintText: TranslationBase.of(context).addChiefComplaints, - controller: complaintsController, - ), - ), - Container( - margin: - EdgeInsets.only(left: 10, right: 10, top: 15), - child: TextFields( - hasLabelText: complaintsController.text != '' - ? true - : false, - hintText: TranslationBase - .of(context) - .addChiefComplaints, - fontSize: 13.5, - // hintColor: Colors.black, - showLabelText: true, - fontWeight: FontWeight.w600, - maxLines: 25, - minLines: 13, - controller: complaintsController, - validator: (value) { - if (value == null || value == "") - return TranslationBase.of(context) - .emptyMessage; - else if (value.length < 25) - return TranslationBase - .of(context) - .chiefComplaintLength; - //""; - else - return null; - }), + //TODO handel error cases + NewTextFields( + hintText: TranslationBase.of(context).addChiefComplaints, + controller: complaintsController, + maxLines: 25, + minLines: 13, ), + + // Container( + // margin: + // EdgeInsets.only(left: 10, right: 10, top: 15), + // child: TextFields( + // hasLabelText: complaintsController.text != '' + // ? true + // : false, + // hintText: TranslationBase + // .of(context) + // .addChiefComplaints, + // fontSize: 13.5, + // // hintColor: Colors.black, + // showLabelText: true, + // fontWeight: FontWeight.w600, + // maxLines: 25, + // minLines: 13, + // controller: complaintsController, + // validator: (value) { + // if (value == null || value == "") + // return TranslationBase.of(context) + // .emptyMessage; + // else if (value.length < 25) + // return TranslationBase + // .of(context) + // .chiefComplaintLength; + // //""; + // else + // return null; + // }), + // ), SizedBox( height: 20, ), - Container( - margin: - EdgeInsets.only(left: 10, right: 10, top: 15), - child: TextFields( - hasLabelText: - illnessController.text != '' ? true : false, - showLabelText: true, - hintText: TranslationBase - .of(context) - .historyOfPresentIllness, - fontSize: 13.5, - // hintColor: Colors.black, - fontWeight: FontWeight.w600, - maxLines: 25, - minLines: 13, - controller: illnessController, - validator: (value) { - if (value == null || value == "") - return TranslationBase.of(context) - .emptyMessage; - else - return null; - }), + + NewTextFields( + hintText: TranslationBase.of(context).historyOfPresentIllness, + controller: illnessController, + maxLines: 25, + minLines: 13, ), + // Container( + // margin: + // EdgeInsets.only(left: 10, right: 10, top: 15), + // child: TextFields( + // hasLabelText: + // illnessController.text != '' ? true : false, + // showLabelText: true, + // hintText: TranslationBase + // .of(context) + // .historyOfPresentIllness, + // fontSize: 13.5, + // // hintColor: Colors.black, + // fontWeight: FontWeight.w600, + // maxLines: 25, + // minLines: 13, + // controller: illnessController, + // validator: (value) { + // if (value == null || value == "") + // return TranslationBase.of(context) + // .emptyMessage; + // else + // return null; + // }), + // ), SizedBox( height: 20, ), @@ -114,31 +112,38 @@ class UpdateChiefComplaints extends StatelessWidget { SizedBox( height: 10, ), - Container( - margin: - EdgeInsets.only(left: 10, right: 10, top: 15), - child: TextFields( - hasLabelText: medicationController.text != '' - ? true - : false, - showLabelText: true, - hintText: TranslationBase - .of(context) - .currentMedications, - fontSize: 13.5, - // hintColor: Colors.black, - fontWeight: FontWeight.w600, - maxLines: 23, - minLines: 10, - controller: medicationController, - validator: (value) { - if (value == null || value == "") - return TranslationBase - .of(context) - .emptyMessage; - else - return null; - }), + // Container( + // margin: + // EdgeInsets.only(left: 10, right: 10, top: 15), + // child: TextFields( + // hasLabelText: medicationController.text != '' + // ? true + // : false, + // showLabelText: true, + // hintText: TranslationBase + // .of(context) + // .currentMedications, + // fontSize: 13.5, + // // hintColor: Colors.black, + // fontWeight: FontWeight.w600, + // maxLines: 23, + // minLines: 10, + // controller: medicationController, + // validator: (value) { + // if (value == null || value == "") + // return TranslationBase + // .of(context) + // .emptyMessage; + // else + // return null; + // }), + // ), + + NewTextFields( + hintText: TranslationBase.of(context).currentMedications, + controller: medicationController, + maxLines: 23, + minLines: 10, ), SizedBox( height: 10, diff --git a/lib/widgets/shared/new_text_Field.dart b/lib/widgets/shared/new_text_Field.dart index dc361abd..6ad3d570 100644 --- a/lib/widgets/shared/new_text_Field.dart +++ b/lib/widgets/shared/new_text_Field.dart @@ -2,6 +2,7 @@ import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:hexcolor/hexcolor.dart'; class NumberTextInputFormatter extends TextInputFormatter { @override @@ -158,9 +159,15 @@ class _NewTextFieldsState extends State { duration: Duration(milliseconds: 300), decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), + border: Border.all( + color: HexColor('#707070'), + width: 0.30), color: Colors.white), child: Container( margin: EdgeInsets.only(top: 8), + padding: EdgeInsets.only(top: 8), + + child: TextFormField( enabled: widget.isEnabled, initialValue: widget.initialValue,