Merge branch 'search_out_patient' into 'development'

Search out patient

See merge request Cloud_Solution/doctor_app_flutter!600
merge-requests/601/merge
Mohammad Aljammal 5 years ago
commit 17512e372f

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

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

Loading…
Cancel
Save