Merge branch 'allergyies' into 'development'

add medication almost done

See merge request Cloud_Solution/doctor_app_flutter!466
merge-requests/467/merge
Mohammad Aljammal 5 years ago
commit 6f11c365d3

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -1,5 +1,4 @@
import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:autocomplete_textfield/autocomplete_textfield.dart';
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart';
import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart';
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
@ -10,12 +9,14 @@ import 'package:doctor_app_flutter/screens/base/base_view.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/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-textfield-custom.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/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/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart'; import 'package:doctor_app_flutter/widgets/shared/dialogs/master_key_dailog.dart';
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:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -120,17 +121,20 @@ class _AddMedicationState extends State<AddMedication> {
String hintText, String selectedText, bool isDropDown, String hintText, String selectedText, bool isDropDown,
{IconData icon}) { {IconData icon}) {
return InputDecoration( return InputDecoration(
filled: true,
fillColor: Colors.white,
contentPadding: EdgeInsets.symmetric(vertical: 10, horizontal: 10), contentPadding: EdgeInsets.symmetric(vertical: 10, horizontal: 10),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.grey, width: 1.0), borderSide: BorderSide(color: Colors.grey, width: 0.00),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.grey, width: 1.0), borderSide: BorderSide(color: Colors.grey, width: 0.00),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
disabledBorder: OutlineInputBorder( disabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.grey, width: 1.0), borderSide: BorderSide(color: Colors.grey, width: 0.00),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
hintText: selectedText != null ? selectedText : hintText, hintText: selectedText != null ? selectedText : hintText,
@ -152,7 +156,6 @@ class _AddMedicationState extends State<AddMedication> {
.of(context) .of(context)
.size; .size;
return FractionallySizedBox( return FractionallySizedBox(
heightFactor: 0.7,
child: BaseView<SOAPViewModel>( child: BaseView<SOAPViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
if (model.medicationStrengthList.length == 0) { if (model.medicationStrengthList.length == 0) {
@ -174,24 +177,69 @@ class _AddMedicationState extends State<AddMedication> {
AppScaffold( AppScaffold(
baseViewModel: model, baseViewModel: model,
isShowAppBar: false, isShowAppBar: false,
body: SingleChildScrollView( body: Center(
child: Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding:
EdgeInsets.only(left: 0, right: 5, bottom: 5, top: 5),
decoration: BoxDecoration(
color: Colors.white,
),
height: 115,
child: Container(
padding: EdgeInsets.only(left: 10, right: 10),
margin: EdgeInsets.only(top: 40),
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
RichText(
text: TextSpan(
style: TextStyle(
fontSize: 20, color: Colors.black),
children: <TextSpan>[
new TextSpan(
text: TranslationBase.of(context)
.addMedication,
style: TextStyle(
color: Color(0xFF2B353E),
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontSize: 20)),
],
),
),
InkWell(
onTap: () {
Navigator.pop(context);
},
child: Icon(FontAwesomeIcons.times,
size: 30, color: Color(0xFF2B353E)))
],
),
],
),
),
),
SizedBox(
height: 10,
),
SizedBox(
height: 16,
),
Expanded(
child: Center( child: Center(
child: FractionallySizedBox( child: FractionallySizedBox(
widthFactor: 0.9, widthFactor: 0.9,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox( SizedBox(
height: 16, height: 16,
), ),
AppText(
TranslationBase
.of(context)
.addMedication,
fontWeight: FontWeight.bold,
fontSize: 16,
),
SizedBox( SizedBox(
height: 16, height: 16,
), ),
@ -208,77 +256,83 @@ class _AddMedicationState extends State<AddMedication> {
child: _selectedMedication == null child: _selectedMedication == null
? AutoCompleteTextField< ? AutoCompleteTextField<
GetMedicationResponseModel>( GetMedicationResponseModel>(
decoration: textFieldSelectorDecoration( decoration:
TranslationBase textFieldSelectorDecoration(
.of(context)
TranslationBase.of(context)
.searchMedicineNameHere, .searchMedicineNameHere,
_selectedMedication != null _selectedMedication != null
? _selectedMedication.genericName ? _selectedMedication
.genericName
: null, : null,
true, true,
icon: EvaIcons.search), icon: EvaIcons.search),
itemSubmitted: (item) => itemSubmitted: (item) => setState(
setState( () =>
() => _selectedMedication = item), _selectedMedication = item),
key: key, key: key,
suggestions: model.allMedicationList, suggestions:
itemBuilder: (context, suggestion) => model.allMedicationList,
itemBuilder: (context,
suggestion) =>
new Padding( new Padding(
child: Texts( child: Texts(suggestion
suggestion.description + '/' + .description +
'/' +
suggestion.genericName), suggestion.genericName),
padding: EdgeInsets.all(8.0)), padding:
EdgeInsets.all(8.0)),
itemSorter: (a, b) => 1, itemSorter: (a, b) => 1,
itemFilter: (suggestion, input) => itemFilter: (suggestion, input) =>
suggestion.genericName suggestion.genericName
.toLowerCase() .toLowerCase()
.startsWith(input.toLowerCase()) || .startsWith(
input.toLowerCase()) ||
suggestion.description suggestion.description
.toLowerCase() .toLowerCase()
.startsWith(input.toLowerCase()) || .startsWith(
input.toLowerCase()) ||
suggestion.keywords suggestion.keywords
.toLowerCase() .toLowerCase()
.startsWith(input.toLowerCase()), .startsWith(
input.toLowerCase()),
) )
: TextField( : AppTextFieldCustom(
hintText: _selectedMedication != null
? _selectedMedication
.description +
(' (${_selectedMedication.genericName} )')
: TranslationBase.of(context)
.searchMedicineNameHere,
minLines: 2, minLines: 2,
maxLines: 2, maxLines: 2,
decoration: textFieldSelectorDecoration(
TranslationBase
.of(context)
.searchMedicineNameHere,
_selectedMedication != null
? _selectedMedication.description +
(' (${_selectedMedication
.genericName} )')
: null,
true,
icon: EvaIcons.search),
enabled: false, enabled: false,
), ),
), ),
), ),
if(isFormSubmitted && _selectedMedication == null) if (isFormSubmitted &&
_selectedMedication == null)
CustomValidationError(), CustomValidationError(),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
TextFields( AppTextFieldCustom(
onTapTextFields: model.medicationDoseTimeList != enabled: false,
null onClick: model.medicationDoseTimeList != null
? () { ? () {
MasterKeyDailog dialog = MasterKeyDailog( MasterKeyDailog dialog =
MasterKeyDailog(
list: model.medicationDoseTimeList, list: model.medicationDoseTimeList,
okText: TranslationBase okText:
.of(context) TranslationBase.of(context).ok,
.ok,
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
_selectedMedicationDose = _selectedMedicationDose =
selectedValue; selectedValue;
doseController.text = doseController
projectViewModel.isArabic .text = projectViewModel
.isArabic
? _selectedMedicationDose ? _selectedMedicationDose
.nameAr .nameAr
: _selectedMedicationDose : _selectedMedicationDose
@ -295,52 +349,41 @@ class _AddMedicationState extends State<AddMedication> {
); );
} }
: null, : null,
hasLabelText: doseController.text != hintText:
'' ? true : false, TranslationBase.of(context).doseTime,
showLabelText: true,
hintText: TranslationBase
.of(context)
.doseTime,
//TODO add translation //TODO add translation
fontSize: 13.5,
readOnly: true,
// hintColor: Colors.black,
fontWeight: FontWeight.w600,
maxLines: 2, maxLines: 2,
minLines: 1, minLines: 2,
isDropDown: true,
controller: doseController, controller: doseController,
validator: (value) { ),
if (value == null)
return TranslationBase
.of(context)
.emptyMessage;
else
return null;
}),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
if(isFormSubmitted && if (isFormSubmitted &&
_selectedMedicationDose == null) _selectedMedicationDose == null)
CustomValidationError(), SizedBox( CustomValidationError(),
SizedBox(
height: 5, height: 5,
), ),
TextFields( AppTextFieldCustom(
onTapTextFields: model enabled: false,
.medicationStrengthList != null isDropDown: true,
onClick: model.medicationStrengthList != null
? () { ? () {
MasterKeyDailog dialog = MasterKeyDailog( MasterKeyDailog dialog =
MasterKeyDailog(
list: model.medicationStrengthList, list: model.medicationStrengthList,
okText: TranslationBase okText:
.of(context) TranslationBase.of(context).ok,
.ok,
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
_selectedMedicationStrength = _selectedMedicationStrength =
selectedValue; selectedValue;
strengthController.text = strengthController
projectViewModel.isArabic .text = projectViewModel
.isArabic
? _selectedMedicationStrength ? _selectedMedicationStrength
.nameAr .nameAr
: _selectedMedicationStrength : _selectedMedicationStrength
@ -357,53 +400,41 @@ class _AddMedicationState extends State<AddMedication> {
); );
} }
: null, : null,
hasLabelText: strengthController.text != hintText:
'' ? true : false, TranslationBase.of(context).strength,
showLabelText: true,
hintText: TranslationBase
.of(context)
.strength,
fontSize: 13.5,
readOnly: true,
// hintColor: Colors.black, // hintColor: Colors.black,
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
maxLines: 2, maxLines: 2,
minLines: 1, minLines: 2,
controller: strengthController, controller: strengthController,
validator: (value) { ),
if (value == null) SizedBox(
return TranslationBase
.of(context)
.emptyMessage;
else
return null;
}), SizedBox(
height: 5, height: 5,
), ),
if(isFormSubmitted && if (isFormSubmitted &&
_selectedMedicationStrength == null) _selectedMedicationStrength == null)
CustomValidationError(), CustomValidationError(),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
AppTextFieldCustom(
TextFields( enabled: false,
onTapTextFields: model isDropDown: true,
.medicationRouteList != null onClick: model.medicationRouteList != null
? () { ? () {
MasterKeyDailog dialog = MasterKeyDailog( MasterKeyDailog dialog =
MasterKeyDailog(
list: model.medicationRouteList, list: model.medicationRouteList,
okText: TranslationBase okText:
.of(context) TranslationBase.of(context).ok,
.ok,
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
_selectedMedicationRoute = _selectedMedicationRoute =
selectedValue; selectedValue;
routeController.text = routeController
projectViewModel.isArabic .text = projectViewModel
.isArabic
? _selectedMedicationRoute ? _selectedMedicationRoute
.nameAr .nameAr
: _selectedMedicationRoute : _selectedMedicationRoute
@ -420,52 +451,36 @@ class _AddMedicationState extends State<AddMedication> {
); );
} }
: null, : null,
hasLabelText: routeController.text != hintText: TranslationBase.of(context).route,
'' ? true : false,
showLabelText: true,
hintText: TranslationBase
.of(context)
.route,
fontSize: 13.5,
readOnly: true,
// hintColor: Colors.black,
fontWeight: FontWeight.w600,
maxLines: 2, maxLines: 2,
minLines: 1, minLines: 2,
controller: routeController, controller: routeController,
validator: (value) { ),
if (value == null)
return TranslationBase
.of(context)
.emptyMessage;
else
return null;
}),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
if(isFormSubmitted && if (isFormSubmitted &&
_selectedMedicationRoute == null) _selectedMedicationRoute == null)
CustomValidationError(), CustomValidationError(),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
TextFields( AppTextFieldCustom(
onTapTextFields: model onClick: model.medicationFrequencyList != null
.medicationFrequencyList != null
? () { ? () {
MasterKeyDailog dialog = MasterKeyDailog( MasterKeyDailog dialog =
MasterKeyDailog(
list: model.medicationFrequencyList, list: model.medicationFrequencyList,
okText: TranslationBase okText:
.of(context) TranslationBase.of(context).ok,
.ok,
okFunction: (selectedValue) { okFunction: (selectedValue) {
setState(() { setState(() {
_selectedMedicationFrequency = _selectedMedicationFrequency =
selectedValue; selectedValue;
frequencyController.text = frequencyController
projectViewModel.isArabic .text = projectViewModel
.isArabic
? _selectedMedicationFrequency ? _selectedMedicationFrequency
.nameAr .nameAr
: _selectedMedicationFrequency : _selectedMedicationFrequency
@ -482,78 +497,80 @@ class _AddMedicationState extends State<AddMedication> {
); );
} }
: null, : null,
hasLabelText: frequencyController.text != hintText:
'' ? true : false, TranslationBase.of(context).frequency,
showLabelText: true,
hintText: TranslationBase
.of(context)
.frequency,
//TODO add translation //TODO add translation
fontSize: 13.5, enabled: false,
readOnly: true,
// hintColor: Colors.black, // hintColor: Colors.black,
fontWeight: FontWeight.w600,
maxLines: 2, maxLines: 2,
minLines: 1, minLines: 2,
isDropDown: true,
controller: frequencyController, controller: frequencyController,
validator: (value) { ),
if (value == null)
return TranslationBase
.of(context)
.emptyMessage;
else
return null;
}),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
if(isFormSubmitted && if (isFormSubmitted &&
_selectedMedicationFrequency == null) _selectedMedicationFrequency == null)
CustomValidationError(), CustomValidationError(),
SizedBox( SizedBox(
height: 30, height: 30,
), ),
AppButton( ],
title: TranslationBase )),
.of(context) ),
.add ),
.toUpperCase(), ]),
),
),
bottomSheet: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(color: HexColor('#707070'), width: 0.30),
),
height: MediaQuery.of(context).size.height * 0.1,
width: double.infinity,
child: Column(
children: [
SizedBox(
height: 10,
),
Container(
child: FractionallySizedBox(
widthFactor: .80,
child: Center(
child: AppButton(
title: TranslationBase.of(context).addMedication.toUpperCase(),
color: Color(0xFF359846),
onPressed: () { onPressed: () {
setState(() { setState(() {
isFormSubmitted = true; isFormSubmitted = true;
}); });
if (_selectedMedication != null && if (_selectedMedication != null &&
_selectedMedicationDose != _selectedMedicationDose != null &&
null &&
_selectedMedicationStrength != null && _selectedMedicationStrength != null &&
_selectedMedicationRoute != null && _selectedMedicationRoute != null &&
_selectedMedicationFrequency != null) { _selectedMedicationFrequency != null) {
widget.medicationController.text = widget.medicationController.text = widget
widget.medicationController.text + .medicationController.text +
'${_selectedMedication '${_selectedMedication.description} (${TranslationBase.of(context).doseTime} ) ${doseController.text} (${TranslationBase.of(context).strength}) ${strengthController.text} (${TranslationBase.of(context).route}) ${routeController.text} (${TranslationBase.of(context).frequency}) ${frequencyController.text} \n \n';
.description } (${TranslationBase
.of(context)
.doseTime} ) ${doseController
.text} (${TranslationBase
.of(context)
.strength}) ${strengthController
.text} (${TranslationBase
.of(context)
.route }) ${routeController
.text} (${TranslationBase
.of(context)
.frequency }) ${frequencyController
.text} \n \n';
Navigator.of(context).pop(); Navigator.of(context).pop();
} }
}, },
), ),
]
), ),
), ),
), ),
),), SizedBox(
height: 5,
),
],
),
),
),
), ),
); );
} }

@ -640,7 +640,8 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
{IconData icon}) { {IconData icon}) {
return InputDecoration( return InputDecoration(
fillColor: Colors.white, fillColor: Colors.white,
contentPadding: EdgeInsets.symmetric(vertical: 10, horizontal: 10),
contentPadding: EdgeInsets.symmetric(vertical: 15, horizontal: 10),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Color(0Xffffffff), width: 1.0), borderSide: BorderSide(color: Color(0Xffffffff), width: 1.0),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
@ -763,6 +764,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
.mySelectedAssessment.selectedICD == .mySelectedAssessment.selectedICD ==
null null
? AutoCompleteTextField<MasterKeyModel>( ? AutoCompleteTextField<MasterKeyModel>(
decoration: textFieldSelectorDecoration( decoration: textFieldSelectorDecoration(
TranslationBase.of(context) TranslationBase.of(context)
.nameOrICD, .nameOrICD,

Loading…
Cancel
Save