Procedure updates

merge-requests/252/head
hussam al-habibeh 5 years ago
parent debcad3a3d
commit b0410dc744

@ -61,7 +61,7 @@ class _EntityListCheckboxSearchWidgetState
child: ListView( child: ListView(
children: [ children: [
TextFields( TextFields(
hintText: 'Search ', hintText: 'Search Procedure',
suffixIcon: EvaIcons.search, suffixIcon: EvaIcons.search,
onChanged: (value) { onChanged: (value) {
filterSearchResults(value); filterSearchResults(value);

@ -568,18 +568,26 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
builder: (BuildContext context, ProcedureViewModel model, Widget child) => builder: (BuildContext context, ProcedureViewModel model, Widget child) =>
NetworkBaseView( NetworkBaseView(
baseViewModel: model, baseViewModel: model,
child: SingleChildScrollView( child: DraggableScrollableSheet(
minChildSize: 0.90,
initialChildSize: 0.95,
maxChildSize: 1.0,
builder: (BuildContext context, ScrollController scrollController) {
return SingleChildScrollView(
child: Container( child: Container(
height: 810, height: MediaQuery.of(context).size.height * 1.20,
child: Padding( child: Padding(
padding: EdgeInsets.all(12.0), padding: EdgeInsets.all(12.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
AppText( AppText(
'Select Procedure'.toUpperCase(), 'Search Procedure Category'.toUpperCase(),
fontWeight: FontWeight.w900, fontWeight: FontWeight.w900,
), ),
SizedBox(
height: 5.0,
),
Container( Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: InkWell( child: InkWell(
@ -595,8 +603,8 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
setState(() { setState(() {
selectedCategory = selectedValue; selectedCategory = selectedValue;
model.getProcedureCategory( model.getProcedureCategory(
categoryName: categoryName: selectedCategory[
selectedCategory['categoryName']); 'categoryName']);
}); });
}, },
); );
@ -626,9 +634,12 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
), ),
), ),
if (widget.model.categoriesList.length != 0) if (widget.model.categoriesList.length != 0)
EntityListCheckboxSearchWidget( NetworkBaseView(
baseViewModel: model,
child: EntityListCheckboxSearchWidget(
model: widget.model, model: widget.model,
masterList: widget.model.categoriesList[0].entityList, masterList:
widget.model.categoriesList[0].entityList,
removeHistory: (item) { removeHistory: (item) {
setState(() { setState(() {
entityList.remove(item); entityList.remove(item);
@ -646,6 +657,7 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
isEntityListSelected: (master) => isEntityListSelected: (master) =>
isEntityListSelected(master), isEntityListSelected(master),
), ),
),
SizedBox( SizedBox(
height: 15.0, height: 15.0,
), ),
@ -676,12 +688,14 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
height: 50.0, height: 50.0,
), ),
Container( Container(
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), margin: EdgeInsets.all(
SizeConfig.widthMultiplier * 5),
child: Wrap( child: Wrap(
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: 'add Selected Procedures'.toUpperCase(), title:
'add Selected Procedures'.toUpperCase(),
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pop(context);
postProcedure( postProcedure(
@ -700,7 +714,8 @@ class _AddSelectedProcedureState extends State<AddSelectedProcedure> {
), ),
), ),
), ),
), );
}),
), ),
); );
} }
@ -760,7 +775,7 @@ void updateProcedureForm(context,
isScrollControlled: true, isScrollControlled: true,
builder: (BuildContext bc) { builder: (BuildContext bc) {
return Container( return Container(
height: 400, height: MediaQuery.of(context).size.height * 0.55,
child: Form( child: Form(
child: Padding( child: Padding(
padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 10.0), padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 10.0),

Loading…
Cancel
Save