Merge branch 'in-patient-medication' into 'development'

favorite prescription hot fix

See merge request Cloud_Solution/doctor_app_flutter!836
merge-requests/837/merge
Mohammad Aljammal 5 years ago
commit 6b7fc1bf56

@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/screens/procedures/procedure_checkout_screen.
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.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/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -46,10 +47,8 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<ProcedureViewModel>( return BaseView<ProcedureViewModel>(
onModelReady: (model) => onModelReady: (model) => model.getProcedureTemplate(categoryID: widget.procedureType.getCategoryId()),
model.getProcedureTemplate(categoryID: widget.procedureType.getCategoryId()), builder: (BuildContext context, ProcedureViewModel model, Widget child) => AppScaffold(
builder: (BuildContext context, ProcedureViewModel model, Widget child) =>
AppScaffold(
isShowAppBar: false, isShowAppBar: false,
baseViewModel: model, baseViewModel: model,
body: Column( body: Column(
@ -57,8 +56,8 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
Container( Container(
height: MediaQuery.of(context).size.height * 0.070, height: MediaQuery.of(context).size.height * 0.070,
), ),
if (model.templateList.length != 0) (model.templateList.length != 0)
Expanded( ? Expanded(
child: EntityListCheckboxSearchFavProceduresWidget( child: EntityListCheckboxSearchFavProceduresWidget(
isProcedure: !(widget.procedureType == ProcedureType.PRESCRIPTION), isProcedure: !(widget.procedureType == ProcedureType.PRESCRIPTION),
model: model, model: model,
@ -72,8 +71,7 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
entityList.add(history); entityList.add(history);
}); });
}, },
isEntityFavListSelected: (master) => isEntityFavListSelected: (master) => isEntityListSelected(master),
isEntityListSelected(master),
groupProcedures: groupProcedures, groupProcedures: groupProcedures,
selectProcedures: (selectedProcedure) { selectProcedures: (selectedProcedure) {
setState(() { setState(() {
@ -81,8 +79,16 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
}); });
}, },
), ),
)
: Container(
child: Padding(
padding: EdgeInsets.symmetric(vertical: 50.0),
child: AppText('You Don\'t have favorite prescription'),
), ),
Container( ),
],
),
bottomSheet: Container(
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
child: Wrap( child: Wrap(
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
@ -91,9 +97,10 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
title: widget.procedureType.getAddButtonTitle(context) ?? title: widget.procedureType.getAddButtonTitle(context) ??
TranslationBase.of(context).addSelectedProcedures, TranslationBase.of(context).addSelectedProcedures,
color: Color(0xff359846), color: Color(0xff359846),
disabled: model.templateList.length == 0 ? true : false,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
onPressed: () { onPressed: () {
if(widget.procedureType == ProcedureType.PRESCRIPTION){ if (widget.procedureType == ProcedureType.PRESCRIPTION) {
if (groupProcedures == null) { if (groupProcedures == null) {
DrAppToastMsg.showErrorToast( DrAppToastMsg.showErrorToast(
'Please Select item ', 'Please Select item ',
@ -108,14 +115,13 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
patient: widget.patient, patient: widget.patient,
model: widget.prescriptionModel, model: widget.prescriptionModel,
groupProcedures: groupProcedures, groupProcedures: groupProcedures,
), settings: RouteSettings(name: 'PrescriptionCheckOutScreen')
), ),
settings: RouteSettings(name: 'PrescriptionCheckOutScreen')),
); );
} else { } else {
if (entityList.isEmpty == true) { if (entityList.isEmpty == true) {
DrAppToastMsg.showErrorToast( DrAppToastMsg.showErrorToast(
TranslationBase.of(context) TranslationBase.of(context).fillTheMandatoryProcedureDetails,
.fillTheMandatoryProcedureDetails,
); );
return; return;
} }
@ -128,8 +134,8 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
patient: widget.patient, patient: widget.patient,
addButtonTitle: widget.procedureType.getAddButtonTitle(context), addButtonTitle: widget.procedureType.getAddButtonTitle(context),
toolbarTitle: widget.procedureType.getToolbarLabel(context), toolbarTitle: widget.procedureType.getToolbarLabel(context),
), settings: RouteSettings(name: 'ProcedureCheckOutScreen')
), ),
settings: RouteSettings(name: 'ProcedureCheckOutScreen')),
); );
} }
}, },
@ -137,17 +143,13 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
], ],
), ),
), ),
],
),
), ),
); );
} }
bool isEntityListSelected(ProcedureTempleteDetailsModel masterKey) { bool isEntityListSelected(ProcedureTempleteDetailsModel masterKey) {
Iterable<ProcedureTempleteDetailsModel> history = entityList.where( Iterable<ProcedureTempleteDetailsModel> history = entityList.where(
(element) => (element) => masterKey.templateID == element.templateID && masterKey.procedureName == element.procedureName);
masterKey.templateID == element.templateID &&
masterKey.procedureName == element.procedureName);
if (history.length > 0) { if (history.length > 0) {
return true; return true;
} }

Loading…
Cancel
Save