fix merger

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

@ -569,100 +569,102 @@ class _PatientsScreenState extends State<PatientsScreen> {
), ),
], ],
), ),
Column( Expanded(
crossAxisAlignment: child: Column(
CrossAxisAlignment.start, crossAxisAlignment:
// mainAxisAlignment: CrossAxisAlignment.start,
// MainAxisAlignment // mainAxisAlignment:
// .spaceBetween, // MainAxisAlignment
children: < // .spaceBetween,
Widget>[ children: <
SizedBox( Widget>[
height: SizedBox(
0.5, height:
), 0.5,
SizedBox( ),
height: SizedBox(
0, height:
), 0,
Wrap( ),
children: [ Wrap(
AppText( children: [
TranslationBase.of(context).age2, AppText(
fontSize: 1.8 * SizeConfig.textMultiplier, TranslationBase.of(context).age2,
fontWeight: FontWeight.bold, fontSize: 1.8 * SizeConfig.textMultiplier,
backGroundcolor: Colors.white, fontWeight: FontWeight.bold,
), backGroundcolor: Colors.white,
AppText( ),
item.age.toString(), AppText(
fontSize: 1.8 * SizeConfig.textMultiplier, item.age.toString(),
fontWeight: FontWeight.w300, fontSize: 1.8 * SizeConfig.textMultiplier,
backGroundcolor: Colors.white, fontWeight: FontWeight.w300,
), backGroundcolor: Colors.white,
], ),
), ],
SizedBox( ),
height: SizedBox(
2.5, height:
), 2.5,
Wrap( ),
children: [ Wrap(
AppText( children: [
TranslationBase.of(context).gender2, AppText(
fontSize: 1.8 * SizeConfig.textMultiplier, TranslationBase.of(context).gender2,
fontWeight: FontWeight.bold, fontSize: 1.8 * SizeConfig.textMultiplier,
backGroundcolor: Colors.white, fontWeight: FontWeight.bold,
), backGroundcolor: Colors.white,
AppText( ),
item.gender.toString() == '1' ? 'Male' : 'Female', AppText(
fontSize: 1.8 * SizeConfig.textMultiplier, item.gender.toString() == '1' ? 'Male' : 'Female',
fontWeight: FontWeight.w300, fontSize: 1.8 * SizeConfig.textMultiplier,
backGroundcolor: Colors.white, fontWeight: FontWeight.w300,
), backGroundcolor: Colors.white,
], ),
), ],
SizedBox( ),
height: SizedBox(
8, height:
), 8,
SERVICES_PATIANT2[int.parse(patientType)] == "List_MyOutPatient" ),
? Row( SERVICES_PATIANT2[int.parse(patientType)] == "List_MyOutPatient"
mainAxisAlignment: MainAxisAlignment.spaceBetween, ? Row(
children: <Widget>[ mainAxisAlignment: MainAxisAlignment.spaceBetween,
Container( children: <Widget>[
height: 15, Container(
width: 60, height: 15,
decoration: BoxDecoration( width: 60,
borderRadius: BorderRadius.circular(25), decoration: BoxDecoration(
color: HexColor("#20A169"), borderRadius: BorderRadius.circular(25),
color: HexColor("#20A169"),
),
child: AppText(
item.startTime,
color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
),
), ),
child: AppText( SizedBox(
item.startTime, width: 3.5,
color: Colors.white,
fontSize: 1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
), ),
), Container(
SizedBox( child: AppText(
width: 3.5, convertDateFormat2(item.appointmentDate.toString()),
), fontSize: 1.5 * SizeConfig.textMultiplier,
Container( fontWeight: FontWeight.bold,
child: AppText( ),
convertDateFormat2(item.appointmentDate.toString()),
fontSize: 1.5 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
), ),
), SizedBox(
SizedBox( height: 25.5,
height: 25.5, ),
), ],
], )
) : SizedBox(
: SizedBox( height: 15,
height: 15, ),
), ],
], ),
), ),
], ],
), ),

@ -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