Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!231
merge-requests/232/merge
Mohammad Aljammal 5 years ago
commit d20604aaaf

@ -184,7 +184,7 @@ class AddRescheduleLeavScreen extends StatelessWidget {
AppText(getDoctor( AppText(getDoctor(
model model
.coveringDoctors, .coveringDoctors,
item.doctorId)) item.coveringDoctorId))
]) ])
: SizedBox(), : SizedBox(),
AppText( AppText(
@ -298,7 +298,7 @@ class AddRescheduleLeavScreen extends StatelessWidget {
getDoctor(model, doctorId) { getDoctor(model, doctorId) {
var obj; var obj;
obj = model.where((i) => i['doctorID'] == doctorId).toList(); obj = model.where((i) => i['doctorID'].toString() == doctorId).toList();
print(obj); print(obj);
return obj.length > 0 ? obj[0]['doctorName'] : ""; return obj.length > 0 ? obj[0]['doctorName'] : "";

@ -759,7 +759,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
"requisitionNo": 0, "requisitionNo": 0,
"requisitionType": offTime, "requisitionType": offTime,
"clinicId": this.profile['ClinicID'], "clinicId": this.profile['ClinicID'],
"doctorId": this.profile['ClinicID'], "doctorId": this.profile['DoctorID'],
"dateTimeFrom": df.format(fromDate), "dateTimeFrom": df.format(fromDate),
"dateTimeTo": df.format(toDate), "dateTimeTo": df.format(toDate),
"date": df.format(DateTime.now()), "date": df.format(DateTime.now()),
@ -784,6 +784,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
model.addReschedule(request).then((response) { model.addReschedule(request).then((response) {
DrAppToastMsg.showSuccesToast(TranslationBase.of(context).leaveCreated); DrAppToastMsg.showSuccesToast(TranslationBase.of(context).leaveCreated);
Navigator.pop(context); Navigator.pop(context);
model.getRescheduleLeave();
}); });
} }
@ -794,7 +795,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
"requisitionNo": 0, "requisitionNo": 0,
"requisitionType": offTime, "requisitionType": offTime,
"clinicId": this.profile['ClinicID'], "clinicId": this.profile['ClinicID'],
"doctorId": this.profile['ClinicID'], "doctorId": this.profile['DoctorID'],
"dateTimeFrom": df.format(fromDate), "dateTimeFrom": df.format(fromDate),
"dateTimeTo": df.format(toDate), "dateTimeTo": df.format(toDate),
"date": df.format(DateTime.now()), "date": df.format(DateTime.now()),

Loading…
Cancel
Save