fix merger

pull/208/head
Mohammad Aljammal 5 years ago
parent 5669021add
commit a723ecbf1d

@ -569,7 +569,8 @@ class _PatientsScreenState extends State<PatientsScreen> {
), ),
], ],
), ),
Column( Expanded(
child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
// mainAxisAlignment: // mainAxisAlignment:
@ -664,6 +665,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
), ),
], ],
), ),
),
], ],
), ),
], ],

@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/models/SOAP/my_selected_assement.dart';
import 'package:doctor_app_flutter/models/SOAP/post_assessment_request_model.dart'; import 'package:doctor_app_flutter/models/SOAP/post_assessment_request_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/util/helpers.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';
@ -43,7 +44,7 @@ class _AssessmentPageState extends State<AssessmentPage> {
dynamic _referTo; dynamic _referTo;
TextEditingController remarksController = TextEditingController(); TextEditingController remarksController = TextEditingController();
Helpers helpers = Helpers();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final screenSize = MediaQuery.of(context).size; final screenSize = MediaQuery.of(context).size;

@ -183,7 +183,7 @@ class _AddAllergiesState extends State<AddAllergies> {
heightFactor: 0.7, heightFactor: 0.7,
child: BaseView<SOAPViewModel>( child: BaseView<SOAPViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
if (model.listOfAllergies.length == 0) { if (model.allergiesList.length == 0) {
await model.getMasterLookup(MasterKeysService.Allergies); await model.getMasterLookup(MasterKeysService.Allergies);
} }
if (model.allergySeverityList.length == 0) { if (model.allergySeverityList.length == 0) {
@ -216,7 +216,7 @@ class _AddAllergiesState extends State<AddAllergies> {
Container( Container(
height: screenSize.height * 0.070, height: screenSize.height * 0.070,
child: InkWell( child: InkWell(
onTap: model.listOfAllergies != null onTap: model.allergiesList != null
? () { ? () {
setState(() { setState(() {
_selectedAllergy = null; _selectedAllergy = null;
@ -227,7 +227,7 @@ class _AddAllergiesState extends State<AddAllergies> {
decoration: textFieldSelectorDecoration("Select Allergy", _selectedAllergy != null ? _selectedAllergy.nameEn : null, true,icon: EvaIcons.search), decoration: textFieldSelectorDecoration("Select Allergy", _selectedAllergy != null ? _selectedAllergy.nameEn : null, true,icon: EvaIcons.search),
itemSubmitted: (item) => setState(() => _selectedAllergy = item), itemSubmitted: (item) => setState(() => _selectedAllergy = item),
key: key, key: key,
suggestions: model.listOfAllergies, suggestions: model.allergiesList,
itemBuilder: (context, suggestion) => new Padding( itemBuilder: (context, suggestion) => new Padding(
child:Texts( projectViewModel.isArabic? suggestion.nameAr: suggestion.nameEn), child:Texts( projectViewModel.isArabic? suggestion.nameAr: suggestion.nameEn),
padding: EdgeInsets.all(8.0)), padding: EdgeInsets.all(8.0)),

Loading…
Cancel
Save