Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Refactor add_prescription_form

Browse Source
merge-requests/967/head
RoaaGhali98 3 years ago
parent 8cb5171bc9
commit c76900a868
3 changed files with 207 additions and 277 deletions
Show Stats Download Patch File Download Diff File

35
lib/screens/procedures/add-favourite-procedure.dart
Unescape Escape View File

@ -17,6 +17,7 @@ import 'package:flutter/material.dart';
import '../../config/config.dart';
import '../../widgets/shared/loader/gif_loader_dialog_utils.dart';
import '../patients/profile/soap_update/shared_soap_widgets/bottom_sheet_dialog_button.dart';
import 'ProcedureType.dart';
class AddFavouriteProcedure extends StatefulWidget {
@ -48,20 +49,18 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
@override
Widget build(BuildContext context) {
return BaseView<ProcedureViewModel>(
builder: (BuildContext context, ProcedureViewModel model_, Widget child) =>
builder: (BuildContext context, ProcedureViewModel model_,
Widget child) =>
AppScaffold(
isShowAppBar: false,
baseViewModel: model,
body: Column(
children: [
Container(
height: MediaQuery.of(context).size.height * 0.070,
),
(widget.previousProcedureViewModel.templateList.length != 0)
? Expanded(
child: EntityListCheckboxSearchFavProceduresWidget(
isProcedure:
!(widget.procedureType == ProcedureType.PRESCRIPTION),
isProcedure: !(widget.procedureType ==
ProcedureType.PRESCRIPTION),
model: widget.previousProcedureViewModel,
removeFavProcedure: (item) {
setState(() {
@ -86,23 +85,16 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
: Container(
child: Padding(
padding: EdgeInsets.symmetric(vertical: 50.0),
child: AppText('You Don\'t have favorite prescription'),
child: AppText(
'You Don\'t have favorite prescription'),
),
),
],
),
bottomSheet: Container(
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
child: Wrap(
alignment: WrapAlignment.center,
children: <Widget>[
AppButton(
title: widget.procedureType.getAddButtonTitle(context) ??
bottomSheet: BottomSheetDialogButton(
label: widget.procedureType.getAddButtonTitle(context) ??
TranslationBase.of(context).addSelectedProcedures,
color: AppGlobal.appGreenColor,
disabled: widget.previousProcedureViewModel.templateList.length == 0 ? true : false,
fontWeight: FontWeight.w700,
onPressed: () {
onTap: () async {
if (widget.procedureType == ProcedureType.PRESCRIPTION) {
if (groupProcedures == null) {
DrAppToastMsg.showErrorToast(
@ -146,12 +138,7 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
RouteSettings(name: 'ProcedureCheckOutScreen')),
);
}
},
),
],
),
),
),
})),
);
}

63
lib/screens/procedures/base_add_procedure_tab_page.dart
Unescape Escape View File

@ -82,36 +82,12 @@ class _BaseAddProcedureTabPageState extends State<BaseAddProcedureTabPage>
appBar: BottomSheetTitle(title: procedureType.getToolbarLabel(context),),
body: NetworkBaseView(
baseViewModel: model,
child: DraggableScrollableSheet(
minChildSize: 0.90,
initialChildSize: 0.95,
maxChildSize: 1.0,
builder:
(BuildContext context, ScrollController scrollController) {
return Container(
height: MediaQuery.of(context).size.height * 1.25,
child: Padding(
padding: EdgeInsets.all(12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: Expanded(
child: Scaffold(
extendBodyBehindAppBar: true,
appBar: PreferredSize(
preferredSize: Size.fromHeight(
MediaQuery.of(context).size.height * 0.070),
child: Container(
height:
MediaQuery.of(context).size.height * 0.070,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Theme.of(context).dividerColor,
width: 0.5), //width: 0.7
),
color: Colors.white),
child: Center(
child: TabBar(
isScrollable: false,
controller: _tabController,
@ -140,8 +116,6 @@ class _BaseAddProcedureTabPageState extends State<BaseAddProcedureTabPage>
],
),
),
),
),
body: Column(
children: [
Expanded(
@ -175,12 +149,7 @@ class _BaseAddProcedureTabPageState extends State<BaseAddProcedureTabPage>
],
),
),
),
],
),
),
);
}),
)
),
),
);
@ -210,32 +179,10 @@ class _BaseAddProcedureTabPageState extends State<BaseAddProcedureTabPage>
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
AppText(
title,
fontSize: SizeConfig.textMultiplier * 1.5,
color: isActive ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
),
TabHelper.getTabText(title: title, isActive: isActive),
if (counter != -1)
Container(
margin: EdgeInsets.all(4),
width: 15,
height: 15,
decoration: BoxDecoration(
color: isActive ? Colors.white : Color(0xFFD02127),
shape: BoxShape.circle,
),
child: Center(
child: FittedBox(
child: AppText(
"$counter",
fontSize: SizeConfig.textMultiplier * 1.5,
color: !isActive ? Colors.white : Color(0xFFD02127),
fontWeight: FontWeight.w700,
),
),
),
),
TabHelper.getTabCounter(isActive: isActive, counter: counter)
],
),
),

10
lib/screens/procedures/entity_list_fav_procedure.dart
Unescape Escape View File

@ -78,13 +78,11 @@ class _EntityListCheckboxSearchFavProceduresWidgetState
@override
Widget build(BuildContext context) {
return Container(
child: Column(
children: [
NetworkBaseView(
return SingleChildScrollView(
child: NetworkBaseView(
baseViewModel: widget.model,
child: Container(
height: MediaQuery.of(context).size.height * 0.60,
height: MediaQuery.of(context).size.height * 0.90,
child: Center(
child: Container(
margin: EdgeInsets.only(top: 15),
@ -134,8 +132,6 @@ class _EntityListCheckboxSearchFavProceduresWidgetState
)),
),
),
],
),
);
}

Write Preview
Loading…
Cancel
Save