Merge branch 'search_out_patient' into 'development'

Search out patient See merge request Cloud_Solution/doctor_app_flutter!600
5 years ago · 17512e372f
parent ac4df7b9d8 b6e698d4e4
commit 17512e372f
2 changed files with 13 additions and 10 deletions
--- a/lib/screens/home/home_screen.dart
+++ b/lib/screens/home/home_screen.dart
@ -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,
--- a/lib/screens/patients/patient_search/patients_screen_new.dart
+++ b/lib/screens/patients/patient_search/patients_screen_new.dart
@ -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,