fix issue on soap design

merge-requests/484/head
Elham Rababah 5 years ago
parent bd08e00567
commit 5caa2da6f3

@ -31,7 +31,9 @@ class ExpandableSOAPWidget extends StatelessWidget {
width: 0.30), width: 0.30),
), ),
child: HeaderBodyExpandableNotifier( child: HeaderBodyExpandableNotifier(
headerWidget: Row( headerWidget: InkWell(
onTap: onTap,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
InkWell( InkWell(
@ -51,10 +53,14 @@ class ExpandableSOAPWidget extends StatelessWidget {
], ],
), ),
), ),
Icon( InkWell(
isExpanded ? EvaIcons.arrowIosUpwardOutline: EvaIcons.arrowIosDownwardOutline) onTap: onTap,
child: Icon(
isExpanded ? EvaIcons.arrowIosUpwardOutline: EvaIcons.arrowIosDownwardOutline),
)
], ],
), ),
),
bodyWidget: child, bodyWidget: child,
isExpand: isExpanded, isExpand: isExpanded,
), ),

@ -461,33 +461,6 @@ class _AddExaminationDailogState extends State<AddExaminationDailog> {
SizedBox( SizedBox(
height: 16, height: 16,
), ),
/*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),
),*/
]), ]),
))), ))),
)), )),

@ -27,10 +27,12 @@ import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'SOAP_step_header.dart'; import 'SOAP_step_header.dart';
import 'custom_validation_error.dart'; import 'custom_validation_error.dart';
import 'expandable_SOAP_widget.dart';
class UpdateAssessmentPage extends StatefulWidget { class UpdateAssessmentPage extends StatefulWidget {
final Function changePageViewIndex; final Function changePageViewIndex;
@ -113,11 +115,17 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
isShowAppBar: false, isShowAppBar: false,
backgroundColor: Theme
.of(context)
.scaffoldBackgroundColor,
// baseViewModel: model, // baseViewModel: model,
body: SingleChildScrollView( body: SingleChildScrollView(
physics: ScrollPhysics(), physics: ScrollPhysics(),
child: Container( child: Container(
color: Color(0xffF8F8F8),
color: Theme
.of(context)
.scaffoldBackgroundColor,
child: Center( child: Center(
child: FractionallySizedBox( child: FractionallySizedBox(
widthFactor: 0.9, widthFactor: 0.9,
@ -125,50 +133,16 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
SOAPStepHeader(currentIndex: widget.currentIndex, changePageViewIndex:widget.changePageViewIndex), SOAPStepHeader(currentIndex: widget.currentIndex, changePageViewIndex:widget.changePageViewIndex),
Container(
width: double.infinity, ExpandableSOAPWidget(
margin: EdgeInsets.only(top: 10, left: 10, right: 10), headerTitle: TranslationBase.of(context).assessment
padding: EdgeInsets.all(8.0), ,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(color: Colors.grey[200], width: 0.5),
),
child: HeaderBodyExpandableNotifier(
headerWidget: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: EdgeInsets.all(12.0),
child: Row(
children: [
Texts(TranslationBase.of(context).assessment,
variant:
isAssessmentExpand ? "bodyText" : '',
bold: isAssessmentExpand ? true : false,
color: Colors.black),
Icon(
FontAwesomeIcons.asterisk,
color: Colors.black,
size: 10,
)
],
),
),
InkWell(
onTap: () { onTap: () {
setState(() { setState(() {
isAssessmentExpand = !isAssessmentExpand; isAssessmentExpand = !isAssessmentExpand;
}); });
}, },
child: Icon(isAssessmentExpand child: Column(children: [
? EvaIcons.arrowUp
: EvaIcons.arrowDown))
],
),
bodyWidget: Column(children: [
SizedBox( SizedBox(
height: 20, height: 20,
), ),
@ -462,49 +436,348 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
], ],
) )
]), ]),
isExpand: isAssessmentExpand, isExpanded: isAssessmentExpand,
),
),
DividerWithSpacesAround(
height: 30,
), ),
// Container(
// width: double.infinity,
// margin: EdgeInsets.only(top: 10, left: 10, right: 10),
// padding: EdgeInsets.all(8.0),
// decoration: BoxDecoration(
// color: Colors.white,
// borderRadius: BorderRadius.all(
// Radius.circular(10.0),
// ),
// border: Border.all(color: Colors.grey[200], width: 0.5),
// ),
// child: HeaderBodyExpandableNotifier(
// headerWidget: Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Padding(
// padding: EdgeInsets.all(12.0),
// child: Row(
// children: [
// Texts(TranslationBase.of(context).assessment,
// variant:
// isAssessmentExpand ? "bodyText" : '',
// bold: isAssessmentExpand ? true : false,
// color: Colors.black),
// Icon(
// FontAwesomeIcons.asterisk,
// color: Colors.black,
// size: 10,
// )
// ],
// ),
// ),
// InkWell(
// onTap: () {
// setState(() {
// isAssessmentExpand = !isAssessmentExpand;
// });
// },
// child: Icon(isAssessmentExpand
// ? EvaIcons.arrowUp
// : EvaIcons.arrowDown))
// ],
// ),
// bodyWidget: Column(children: [
// SizedBox(
// height: 20,
// ),
// Column(
// children: [
// Container(
// margin:
// EdgeInsets.only(left: 5, right: 5, top: 15),
// child: TextFields(
// hintText: TranslationBase.of(context)
// .addAssessment,
// fontSize: 13.5,
// onTapTextFields: () {
// openAssessmentDialog(context,
// isUpdate: false, model: model);
// },
// readOnly: true,
// suffixIcon: EvaIcons.plusSquare,
// suffixIconColor: Colors.black,
// fontWeight: FontWeight.w600,
// validator: (value) {
// if (value == null)
// return TranslationBase.of(context)
// .emptyMessage;
// else
// return null;
// }),
// ),
// SizedBox(
// height: 20,
// ),
// Column(
// children: widget.mySelectedAssessmentList
// .map((assessment) {
// return Container(
// margin: EdgeInsets.only(
// left: 5, right: 5, top: 15),
// child: Row(
// mainAxisAlignment:
// MainAxisAlignment.spaceBetween,
// crossAxisAlignment:
// CrossAxisAlignment.start,
// children: [
// Column(
// crossAxisAlignment:
// CrossAxisAlignment.start,
// children: [
// Row( // Row(
// children: [ // children: [
// AppText(
// "ICD : ".toUpperCase(),
// fontSize: 10,
// color: Colors.grey,
// ),
// Container( // Container(
// width: MediaQuery.of(context).size.width * 0.4, // child: AppText(
// child: AppButton( // assessment.selectedICD.code
// title: 'Previous', // .trim()
// color: Colors.white38, // .toUpperCase() ??
// fontColor: Colors.black, // "",
// fontWeight: FontWeight.w700, // fontWeight: FontWeight.w700,
// loading: model.state == ViewState.BusyLocal, // fontSize: 11,
// onPressed: () async {
// Navigator.pop(context);
// },
// ), // ),
// ), // ),
// SizedBox( // ],
// width: MediaQuery.of(context).size.width * 0.05, // ),
// Row(
// mainAxisAlignment:
// MainAxisAlignment.start,
// crossAxisAlignment:
// CrossAxisAlignment.start,
// children: [
// AppText(
// TranslationBase.of(context)
// .ICDName +
// " : ",
// fontSize: 13,
// color: Colors.grey,
// ), // ),
// Container( // Container(
// width: MediaQuery.of(context).size.width * 0.4, // width: MediaQuery.of(context)
// child: AppButton( // .size
// title: TranslationBase.of(context).next, // .width *
// 0.29,
// child: AppText(
// assessment
// .selectedICD.description
// .toString(),
// fontWeight: FontWeight.w700, // fontWeight: FontWeight.w700,
// loading: model.state == ViewState.BusyLocal, // fontSize: 10,
// onPressed: () async { // ),
// if (widget.mySelectedAssessmentList.isEmpty) { // ),
// helpers.showErrorToast( // ],
// ),
// Row(
// mainAxisAlignment:
// MainAxisAlignment.start,
// children: [
// AppText(
// TranslationBase.of(context) // TranslationBase.of(context)
// .assessmentErrorMsg); // .appointmentNo,
// } else { // fontSize: 10,
// widget.changePageViewIndex(3); // color: Colors.grey,
// widget.changeLoadingState(true); // ),
// } // AppText(
// assessment.appointmentId
// .toString(),
// fontSize: 11,
// fontWeight: FontWeight.w700,
// ),
// ],
// ),
// Row(
// mainAxisAlignment:
// MainAxisAlignment.start,
// children: [
// AppText(
// TranslationBase.of(context)
// .condition +
// " : ",
// fontSize: 10,
// color: Colors.grey,
// ),
// AppText(
// projectViewModel.isArabic
// ? assessment
// .selectedDiagnosisCondition
// .nameAr
// : assessment
// .selectedDiagnosisCondition
// .nameEn,
// fontSize: 11,
// fontWeight: FontWeight.w700,
// ),
// ],
// ),
// Row(
// mainAxisAlignment:
// MainAxisAlignment.start,
// children: [
// AppText(
// TranslationBase.of(context)
// .dType +
// ' : ',
// fontSize: 10,
// color: Colors.grey,
// ),
// AppText(
// projectViewModel.isArabic
// ? assessment
// .selectedDiagnosisType
// .nameAr
// : assessment
// .selectedDiagnosisType
// .nameEn,
// fontSize: 11,
// fontWeight: FontWeight.w700,
// ),
// ],
// ),
// if (assessment.doctorName != null)
// Row(
// mainAxisAlignment:
// MainAxisAlignment.start,
// children: [
// AppText(
// TranslationBase.of(context)
// .doc,
// fontSize: 10,
// color: Colors.grey,
// ),
// AppText(
// assessment.doctorName ?? '',
// fontSize: 11,
// fontWeight: FontWeight.w700,
// ),
// ],
// ),
// SizedBox(
// height: 6,
// ),
// Row(
// mainAxisAlignment:
// MainAxisAlignment.start,
// children: [
// SizedBox(
// height: 6,
// ),
// AppText(
// assessment.remark != null ||
// assessment.remark ==
// ''
// ? TranslationBase.of(
// context)
// .remarks +
// " : "
// : '',
// fontSize: 10,
// color: Colors.grey,
// ),
// Container(
// width: MediaQuery.of(context)
// .size
// .width *
// 0.38,
// child: AppText(
// assessment.remark ?? "",
// fontSize: 11,
// fontWeight: FontWeight.w700,
// ),
// ),
// ],
// ),
// ],
// ),
// Column(
// crossAxisAlignment:
// CrossAxisAlignment.start,
// children: [
// Row(
// children: [
// AppText(
// assessment.createdOn != null
// ? DateTime.parse(
// assessment
// .createdOn)
// .day
// .toString()
// : DateTime.now()
// .day
// .toString(),
// fontWeight: FontWeight.bold,
// fontSize: 15,
// ),
// AppText(" "),
// AppText(
// Helpers.getMonth(assessment
// .createdOn !=
// null
// ? DateTime.parse(
// assessment
// .createdOn)
// .month
// : DateTime.now()
// .month)
// .toUpperCase(),
// fontSize: 13,
// color: Colors.grey,
// ),
// ],
// ),
// SizedBox(
// height: MediaQuery.of(context)
// .size
// .height *
// 0.05,
// ),
// InkWell(
// onTap: () {
// openAssessmentDialog(context,
// isUpdate: true,
// assessment: assessment,
// model: model);
// }, // },
// child: Icon(EvaIcons.edit2),
// )
// ],
// ), // ),
// // Column(
// // children: [
// // // SizedBox(
// // // height: 60,
// // // ),
// // InkWell(
// // onTap: () {
// // openAssessmentDialog(
// // context,
// // isUpdate: true,
// // assessment: assessment,
// // model: model);
// // },
// // child: Icon(EvaIcons.edit2),
// // )
// // ],
// // ),
// ],
// ), // ),
// );
// }).toList(),
// )
// ], // ],
// )
// ]),
// isExpand: isAssessmentExpand,
// ),
// ), // ),
SizedBox( SizedBox(
height: 130, height: 130,
@ -515,7 +788,16 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
), ),
), ),
), ),
bottomSheet: Padding( bottomSheet: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(0.0),
),
border: Border.all(
color: HexColor('#707070'),
width: 0),
), child: Padding(
padding: const EdgeInsets.all(12.0), padding: const EdgeInsets.all(12.0),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -557,6 +839,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
), ),
), ),
), ),
),
); );
} }

@ -101,7 +101,9 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
// baseViewModel: model, // baseViewModel: model,
backgroundColor: Colors.grey[200], backgroundColor: Theme
.of(context)
.scaffoldBackgroundColor,
isShowAppBar: false, isShowAppBar: false,
body: SingleChildScrollView( body: SingleChildScrollView(
physics: ScrollPhysics(), physics: ScrollPhysics(),

@ -89,7 +89,7 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
// PatientPageHeaderWidget(patient), // PatientPageHeaderWidget(patient),
PatientProfileHeaderNewDesign(patient, '7', '7', height: MediaQuery.of(context).size.height * 0.28,), PatientProfileHeaderNewDesign(patient, '7', '7',),
Container( Container(
width: double.infinity, width: double.infinity,
height: 1, height: 1,

@ -16,6 +16,7 @@ import 'package:provider/provider.dart';
import 'app-textfield-custom.dart'; import 'app-textfield-custom.dart';
import 'app_texts_widget.dart'; import 'app_texts_widget.dart';
import 'dialogs/master_key_dailog.dart'; import 'dialogs/master_key_dailog.dart';
import 'divider_with_spaces_around.dart';
import 'expandable-widget-header-body.dart'; import 'expandable-widget-header-body.dart';
class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget { class MasterKeyCheckboxSearchAllergiesWidget extends StatefulWidget {
@ -77,17 +78,21 @@ class _MasterKeyCheckboxSearchAllergiesWidgetState
color: Colors.white), color: Colors.white),
child: Column( child: Column(
children: [ children: [
TextFields( AppTextFieldCustom(
hintText: widget.hintSearchText ?? height: MediaQuery.of(context).size.height * 0.070,
TranslationBase.of(context).selectAllergy, hintText: TranslationBase.of(context).selectAllergy,
borderWidth: 0.0, isDropDown: true,
padding: EdgeInsets.all(20), hasBorder: false,
borderRadius: 0, // controller: filteredSearchController,
suffixIcon: EvaIcons.search,
onChanged: (value) { onChanged: (value) {
filterSearchResults(value); filterSearchResults(value);
}, },
suffixIcon: Icon(
Icons.search,
color: Colors.black,
),
), ),
DividerWithSpacesAround(),
SizedBox( SizedBox(
height: 10, height: 10,
), ),

@ -3,16 +3,15 @@ import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'app-textfield-custom.dart';
import 'app_texts_widget.dart'; import 'app_texts_widget.dart';
class MasterKeyCheckboxSearchWidget extends StatefulWidget { class MasterKeyCheckboxSearchWidget extends StatefulWidget {
@ -56,7 +55,16 @@ class _MasterKeyCheckboxSearchWidgetState extends State<MasterKeyCheckboxSearchW
children: [ children: [
Expanded( Expanded(
child: Container( child: Container(
height: MediaQuery.of(context).size.height * 0.62, decoration: BoxDecoration(
shape: BoxShape.rectangle,
color: Colors.white,
borderRadius: BorderRadius.circular(12),
border: Border.fromBorderSide(BorderSide(
color: Colors.grey.shade400,
width: 0.4,
)),
),
height: MediaQuery.of(context).size.height * 0.60,
child: Center( child: Center(
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
@ -64,18 +72,21 @@ class _MasterKeyCheckboxSearchWidgetState extends State<MasterKeyCheckboxSearchW
color: Colors.white), color: Colors.white),
child: ListView( child: ListView(
children: [ children: [
TextFields( AppTextFieldCustom(
hintText: widget.hintSearchText ?? TranslationBase height: MediaQuery.of(context).size.height * 0.070,
.of(context) hintText: TranslationBase.of(context).searchHistory,
.searchHistory, isDropDown: true,
borderWidth: 0.0, hasBorder: false,
padding: EdgeInsets.all(20), // controller: filteredSearchController,
borderRadius: 0,
suffixIcon: EvaIcons.search,
onChanged: (value) { onChanged: (value) {
filterSearchResults(value); filterSearchResults(value);
}, },
suffixIcon: Icon(
Icons.search,
color: Colors.black,
),
), ),
// SizedBox(height: 15,), // SizedBox(height: 15,),
DividerWithSpacesAround(), DividerWithSpacesAround(),
Container( Container(

Loading…
Cancel
Save