diff --git a/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart b/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart index 1d2e3c10..3141e475 100644 --- a/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart +++ b/lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart @@ -52,14 +52,14 @@ class _AddPatientSickLeaveScreenState extends State { TextEditingController _clinicController = new TextEditingController(); TextEditingController _doctorController = new TextEditingController(); TextEditingController _remarkController = new TextEditingController(); + DateTime currentDate; AddSickLeaveRequest addSickLeave = AddSickLeaveRequest(); bool isFormSubmitted = false; - FocusNode focusNode; void _presentDatePicker() { showDatePicker( context: context, - initialDate: DateTime.now(), + initialDate: currentDate??DateTime.now(), firstDate: DateTime(DateTime.now().year-1), lastDate: DateTime(DateTime.now().year+1), ).then((pickedDate) { @@ -69,6 +69,7 @@ class _AddPatientSickLeaveScreenState extends State { setState(() { final df = new DateFormat('yyyy-MM-dd'); addSickLeave.startDate = df.format(pickedDate); + currentDate = pickedDate; _toDateController.text = AppDateUtils.getDayMonthYearDateFormatted(pickedDate,isMonthShort: true ); }); }); @@ -76,7 +77,6 @@ class _AddPatientSickLeaveScreenState extends State { @override void initState() { - focusNode = new FocusNode(); super.initState(); } diff --git a/lib/screens/patient-sick-leave/patient_sick_leave_screen.dart b/lib/screens/patient-sick-leave/patient_sick_leave_screen.dart index 964c3a13..fa6228f1 100644 --- a/lib/screens/patient-sick-leave/patient_sick_leave_screen.dart +++ b/lib/screens/patient-sick-leave/patient_sick_leave_screen.dart @@ -121,6 +121,7 @@ class PatientSickLeaveScreen extends StatelessWidget { child: InkWell( child: Column( children: [ + if(item.doctorName != null) Row( crossAxisAlignment: CrossAxisAlignment.start,