fix issue on soap design

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

@ -31,29 +31,35 @@ class ExpandableSOAPWidget extends StatelessWidget {
width: 0.30), width: 0.30),
), ),
child: HeaderBodyExpandableNotifier( child: HeaderBodyExpandableNotifier(
headerWidget: Row( headerWidget: InkWell(
mainAxisAlignment: MainAxisAlignment.spaceBetween, onTap: onTap,
children: [ child: Row(
InkWell( mainAxisAlignment: MainAxisAlignment.spaceBetween,
onTap: onTap, children: [
child: Row( InkWell(
children: [ onTap: onTap,
Texts(headerTitle, child: Row(
variant: isExpanded ? "bodyText" : '', children: [
// bold: isExpanded ? true : false, Texts(headerTitle,
fontSize: 15, variant: isExpanded ? "bodyText" : '',
color: Colors.black), // bold: isExpanded ? true : false,
if(isRequired) fontSize: 15,
Icon( color: Colors.black),
FontAwesomeIcons.asterisk, if(isRequired)
size: 12, Icon(
) FontAwesomeIcons.asterisk,
], size: 12,
)
],
),
), ),
), InkWell(
Icon( onTap: onTap,
isExpanded ? EvaIcons.arrowIosUpwardOutline: EvaIcons.arrowIosDownwardOutline) 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),
),*/
]), ]),
))), ))),
)), )),

@ -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