Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient

merge-requests/601/head
Mohammad Aljammal 5 years ago
commit 3c4f7654a1

@ -545,6 +545,12 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
hasBorder: false, hasBorder: false,
onTap: () { onTap: () {
String date = DateUtils.convertDateToFormat(
DateTime(DateTime.now().year, DateTime.now().month,
DateTime.now().day ),
'yyyy-MM-dd');
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
@ -553,7 +559,7 @@ class _HomeScreenState extends State<HomeScreen> {
isSearch: false, isSearch: false,
isInpatient: false, isInpatient: false,
patientSearchRequestModel: patientSearchRequestModel:
PatientSearchRequestModel(), PatientSearchRequestModel(from: date, to: date),
selectedPatientType: selectedPatientType:
PatientType.OutPatient, PatientType.OutPatient,
isSearchWithKeyInfo: false, isSearchWithKeyInfo: false,

@ -93,7 +93,12 @@ class _PatientsScreenNewState extends State<PatientsScreenNew> {
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
appBarTitle: "Search Patient", appBarTitle: "Search Patient",
isShowAppBar: false, isShowAppBar: true,
appBar: !widget.isSearch && !widget.isInpatient?HeaderInSearch(
title: "My Out patient",
):HeaderInSearch(
title: "Search for ${widget.searchKey}",
),
baseViewModel: model, baseViewModel: model,
body: Container( body: Container(
color: Colors.grey[200], color: Colors.grey[200],
@ -103,14 +108,6 @@ class _PatientsScreenNewState extends State<PatientsScreenNew> {
Container( Container(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
if(widget.isSearch)
HeaderInSearch(
title: "Search for ${widget.searchKey}",
),
if(!widget.isSearch && !widget.isInpatient)
HeaderInSearch(
title: "My Out patient",
),
if(!widget.isInpatient) if(!widget.isInpatient)
Container( Container(
// color: Colors.red, // color: Colors.red,

Loading…
Cancel
Save