Merge branch 'search_out_patient' into 'development'

Search out patient

See merge request Cloud_Solution/doctor_app_flutter!611
merge-requests/612/merge
Mohammad Aljammal 5 years ago
commit 17a2125724

@ -7,14 +7,13 @@ 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/patients/profile/PatientProfileButton.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/PatientProfileButton.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design_in_patient.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/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../../routes.dart'; import '../../../routes.dart';
@ -82,24 +81,42 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>with SingleT
appBarTitle: TranslationBase.of(context).patientProfile, appBarTitle: TranslationBase.of(context).patientProfile,
isShowAppBar: false,//TODO fix button location isShowAppBar: false,//TODO fix button location
// appBar: PatientProfileHeaderNewDesignAppBar(patient,arrivalType??'0',patientType,isInpatient: isInpatient,), // appBar: PatientProfileHeaderNewDesignAppBar(patient,arrivalType??'0',patientType,isInpatient: isInpatient,),
body: SingleChildScrollView( body: Container(
child: Container(
child: Column( child: Column(
children: [ children: [
Stack( Stack(
children: [ children: [
Column( Column(
children: [ children: [
PatientProfileHeaderNewDesignAppBar(patient,arrivalType??'0',patientType,isInpatient: isInpatient, height: (patient.patientStatusType != null && patient.patientStatusType == 43)?250:0,), PatientProfileHeaderNewDesignAppBar(
patient,
arrivalType ?? '0',
patientType,
isInpatient: isInpatient,
height: (patient.patientStatusType != null &&
patient.patientStatusType == 43)
? 210
: 0,
),
SingleChildScrollView(
child: Container(
height: MediaQuery.of(context).size.height *0.65,
child: ListView(
children: [
Container( Container(
child: isFromSearch ?Column( child: isFromSearch
? Column(
children: [ children: [
tabsBar(context, screenSize),
tabsBar(context,screenSize), SizedBox(
SizedBox(height: 10,), height: 10,
if(_activeTab==0) ),
if (_activeTab == 0)
Padding( Padding(
padding: const EdgeInsets.symmetric(vertical: 15.0,horizontal: 15), padding:
const EdgeInsets.symmetric(
vertical: 15.0,
horizontal: 15),
child: GridView.count( child: GridView.count(
shrinkWrap: true, shrinkWrap: true,
physics: NeverScrollableScrollPhysics(), physics: NeverScrollableScrollPhysics(),
@ -677,13 +694,17 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>with SingleT
), ),
], ],
), ),
),
),
],
),
if (patient.patientStatusType != null && if (patient.patientStatusType != null &&
patient.patientStatusType == 43) patient.patientStatusType == 43)
BaseView<SOAPViewModel>( BaseView<SOAPViewModel>(
onModelReady: (model) async {}, onModelReady: (model) async {},
builder: (_, model, w) => Positioned( builder: (_, model, w) => Positioned(
top: 210, top: 180,
left: 20, left: 20,
right: 20, right: 20,
child: Row( child: Row(
@ -769,7 +790,6 @@ class _PatientProfileScreenState extends State<PatientProfileScreen>with SingleT
], ],
), ),
), ),
),
)); ));
} }

@ -39,7 +39,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
), ),
height: height == 0 ? isInpatient? 220:200 : height, height: height == 0 ? isInpatient? 210:200 : height,
child: Container( child: Container(
padding: EdgeInsets.only(left: 10, right: 10, bottom: 10), padding: EdgeInsets.only(left: 10, right: 10, bottom: 10),
margin: EdgeInsets.only(top: 50), margin: EdgeInsets.only(top: 50),

Loading…
Cancel
Save