From f9346c3fef53c18155f540e16b583a87dbc06727 Mon Sep 17 00:00:00 2001 From: Amjad Amireh Date: Tue, 12 May 2020 16:38:38 +0300 Subject: [PATCH] modify search patiant --- .../patients/patient_search_screen.dart | 80 ++++++++++++++----- lib/screens/patients/patients_screen.dart | 13 ++- 2 files changed, 68 insertions(+), 25 deletions(-) diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index 4704b564..f4e27c02 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -63,23 +63,17 @@ class _PatientSearchScreenState extends State { if (_formKey.currentState.validate()) { //*****If all data are correct then save data to out variables**** - if (_patientSearchFormValues.getFirstName == null || - _patientSearchFormValues.getMiddleName == null || - _patientSearchFormValues.getLastName == null || - _patientSearchFormValues.getPatientMobileNumber == null) { - _patientSearchFormValues.setFirstName = "0"; - _patientSearchFormValues.setLastName = "0"; - _patientSearchFormValues.setMiddleName = "0"; - _patientSearchFormValues.setPatientMobileNumber = "0"; - _patientSearchFormValues.setPatientID = 0; - _patientSearchFormValues.From = "0"; - _patientSearchFormValues.To = "0"; - - //_formKey.currentState.save(); - } else { + + _patientSearchFormValues.setFrom = "0"; + _patientSearchFormValues.setTo = "0"; + print("***************Check validate1*************"); + + print(_patientSearchFormValues.getFirstName.trim().length); + print("***************Check validate2*************"); _formKey.currentState.save(); - } - // _formKey.currentState.save(); + _patientSearchFormValues.setFrom = "0"; + _patientSearchFormValues.setTo = "0"; + //*********************************** */ sharedPref.setString(TOKEN, '@dm!n'); sharedPref.setString(SLECTED_PATIENT_TYPE, _selectedType); @@ -191,7 +185,18 @@ class _PatientSearchScreenState extends State { hintText: 'First Name', onSaved: (value) { // _patientSearchFormValues.FirstName = value; - _patientSearchFormValues.setFirstName = value; + value == null + ? _patientSearchFormValues.setFirstName = + "0" + : _patientSearchFormValues.setFirstName = + value; + print("**********Value********"); + print(value.toString().trim().isEmpty); + print("**********Value********"); + if (value.toString().trim().isEmpty) { + + _patientSearchFormValues.setFirstName = "0"; + } }, // validator: (value) { // return TextValidator().validateName(value); @@ -203,7 +208,19 @@ class _PatientSearchScreenState extends State { AppTextFormField( hintText: 'Middle Name', onSaved: (value) { - _patientSearchFormValues.MiddleName = value; + //_patientSearchFormValues.MiddleName = value; + + value == null + ? _patientSearchFormValues.setMiddleName = + "0" + : _patientSearchFormValues.setMiddleName = + value; + + // value.toString().trim().isEmpty + // ? _patientSearchFormValues.setMiddleName = + // "0" + // : _patientSearchFormValues.setMiddleName = + // value; }, // validator: (value) { // return TextValidator().validateName(value); @@ -215,7 +232,16 @@ class _PatientSearchScreenState extends State { AppTextFormField( hintText: 'Last Name', onSaved: (value) { - _patientSearchFormValues.LastName = value; + // _patientSearchFormValues.LastName = value; + value == null + ? _patientSearchFormValues.setLastName = "0" + : _patientSearchFormValues.setLastName = + value; + + // value.toString().trim().isEmpty + // ? _patientSearchFormValues.setLastName = "0" + // : _patientSearchFormValues.setLastName = + // value; }, // validator: (value) { // return TextValidator().validateName(value); @@ -232,8 +258,13 @@ class _PatientSearchScreenState extends State { // }, inputFormatter: ONLY_NUMBERS, onSaved: (value) { - _patientSearchFormValues.PatientMobileNumber = - value; + value == null + ? _patientSearchFormValues + .setPatientMobileNumber = "0" + : _patientSearchFormValues + .setPatientMobileNumber = value; + // _patientSearchFormValues.PatientMobileNumber = + // value; }, ), SizedBox( @@ -245,7 +276,12 @@ class _PatientSearchScreenState extends State { // inputFormatter: ONLY_NUMBERS, onSaved: (value) { - _patientSearchFormValues.PatientID = 89000; + // _patientSearchFormValues.PatientID = 89000; + + value == null + ? _patientSearchFormValues.setPatientID = 0 + : _patientSearchFormValues.setPatientID = + int.parse(value); }), SizedBox( height: 10, diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 676f9589..c8d70165 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -236,18 +236,25 @@ class _PatientsScreenState extends State { String date; DateTime checkedTime = DateTime.parse(dateString); DateTime currentTime = DateTime.now(); - + // print("currentTime.day="+currentTime.day.toString()); + // print("checkedTime.day="+checkedTime.day.toString()); + // print("currentTime.month="+currentTime.month.toString()); + // print("checkedTime.month="+checkedTime.month.toString()); + // print("currentTime.year="+currentTime.year.toString()); + // print("checkedTime.year="+checkedTime.year.toString()); if ((currentTime.year == checkedTime.year) && (currentTime.month == checkedTime.month) && (currentTime.day == checkedTime.day)) { - return "TODAY"; + + return "Today"; } else if ((currentTime.year == checkedTime.year) && (currentTime.month == checkedTime.month)) { if ((currentTime.day - checkedTime.day) == 1) { return "YESTERDAY"; } else if ((currentTime.day - checkedTime.day) == -1) { - return "TOMORROW"; + return "Tomorrow"; } + if ((currentTime.day - checkedTime.day) <= -2) { return "Next Week"; } else {