From 31d6ca559387c9253d6d099ecd236a448b2ee888 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Mon, 4 Jan 2021 13:20:33 +0300 Subject: [PATCH 1/2] Doctor ID updated --- lib/screens/reschedule-leaves/reschedule_leave.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/screens/reschedule-leaves/reschedule_leave.dart b/lib/screens/reschedule-leaves/reschedule_leave.dart index 3fdbfbe3..e5d83515 100644 --- a/lib/screens/reschedule-leaves/reschedule_leave.dart +++ b/lib/screens/reschedule-leaves/reschedule_leave.dart @@ -759,7 +759,7 @@ class _RescheduleLeaveScreen extends State { "requisitionNo": 0, "requisitionType": offTime, "clinicId": this.profile['ClinicID'], - "doctorId": this.profile['ClinicID'], + "doctorId": this.profile['DoctorID'], "dateTimeFrom": df.format(fromDate), "dateTimeTo": df.format(toDate), "date": df.format(DateTime.now()), @@ -794,7 +794,7 @@ class _RescheduleLeaveScreen extends State { "requisitionNo": 0, "requisitionType": offTime, "clinicId": this.profile['ClinicID'], - "doctorId": this.profile['ClinicID'], + "doctorId": this.profile['DoctorID'], "dateTimeFrom": df.format(fromDate), "dateTimeTo": df.format(toDate), "date": df.format(DateTime.now()), From d67b531865fdd6540195c5ce6d0a0c4eb13e7a67 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Mon, 4 Jan 2021 13:39:53 +0300 Subject: [PATCH 2/2] bug fix --- lib/screens/reschedule-leaves/add-rescheduleleave.dart | 4 ++-- lib/screens/reschedule-leaves/reschedule_leave.dart | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/screens/reschedule-leaves/add-rescheduleleave.dart b/lib/screens/reschedule-leaves/add-rescheduleleave.dart index 1b5957b9..2067029f 100644 --- a/lib/screens/reschedule-leaves/add-rescheduleleave.dart +++ b/lib/screens/reschedule-leaves/add-rescheduleleave.dart @@ -184,7 +184,7 @@ class AddRescheduleLeavScreen extends StatelessWidget { AppText(getDoctor( model .coveringDoctors, - item.doctorId)) + item.coveringDoctorId)) ]) : SizedBox(), AppText( @@ -298,7 +298,7 @@ class AddRescheduleLeavScreen extends StatelessWidget { getDoctor(model, doctorId) { var obj; - obj = model.where((i) => i['doctorID'] == doctorId).toList(); + obj = model.where((i) => i['doctorID'].toString() == doctorId).toList(); print(obj); return obj.length > 0 ? obj[0]['doctorName'] : ""; diff --git a/lib/screens/reschedule-leaves/reschedule_leave.dart b/lib/screens/reschedule-leaves/reschedule_leave.dart index e5d83515..362e27d9 100644 --- a/lib/screens/reschedule-leaves/reschedule_leave.dart +++ b/lib/screens/reschedule-leaves/reschedule_leave.dart @@ -784,6 +784,7 @@ class _RescheduleLeaveScreen extends State { model.addReschedule(request).then((response) { DrAppToastMsg.showSuccesToast(TranslationBase.of(context).leaveCreated); Navigator.pop(context); + model.getRescheduleLeave(); }); }