Merge branch 'Amjad_search' into 'master'

modify search patient

See merge request Cloud_Solution/doctor_app_flutter!58
merge-requests/59/merge
amjad nabil amireh 6 years ago
commit a520e159e2

@ -66,23 +66,17 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
print(doctorProfile.doctorName);
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);
@ -194,7 +188,18 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
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);
@ -206,7 +211,19 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
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);
@ -218,7 +235,16 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
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);
@ -235,8 +261,13 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
// },
inputFormatter: ONLY_NUMBERS,
onSaved: (value) {
_patientSearchFormValues.PatientMobileNumber =
value;
value == null
? _patientSearchFormValues
.setPatientMobileNumber = "0"
: _patientSearchFormValues
.setPatientMobileNumber = value;
// _patientSearchFormValues.PatientMobileNumber =
// value;
},
),
SizedBox(
@ -248,7 +279,12 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
//
inputFormatter: ONLY_NUMBERS,
onSaved: (value) {
_patientSearchFormValues.PatientID = 89000;
// _patientSearchFormValues.PatientID = 89000;
value == null
? _patientSearchFormValues.setPatientID = 0
: _patientSearchFormValues.setPatientID =
int.parse(value);
}),
SizedBox(
height: 10,

@ -236,18 +236,25 @@ class _PatientsScreenState extends State<PatientsScreen> {
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 {

Loading…
Cancel
Save