From 00b7aaf32ad7dbf459bfdbb414a8267092a164c8 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 8 Sep 2021 11:23:59 +0300 Subject: [PATCH] fix sick leave --- .../sick_leave/sick_leave_patient_model.dart | 56 +++++++++---------- lib/screens/sick-leave/add-sickleave.dart | 11 ++-- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/lib/core/model/sick_leave/sick_leave_patient_model.dart b/lib/core/model/sick_leave/sick_leave_patient_model.dart index 43dbdb05..1e79833c 100644 --- a/lib/core/model/sick_leave/sick_leave_patient_model.dart +++ b/lib/core/model/sick_leave/sick_leave_patient_model.dart @@ -1,41 +1,41 @@ import 'package:doctor_app_flutter/widgets/shared/StarRating.dart'; class SickLeavePatientModel { - String setupID; - int projectID; - int patientID; - int patientType; - int clinicID; - int doctorID; - int requestNo; - String requestDate; - int sickLeaveDays; - int appointmentNo; - int admissionNo; - int actualDoctorRate; - String appointmentDate; - String clinicName; - String doctorImageURL; - String doctorName; - int doctorRate; - String doctorTitle; - int gender; - String genderDescription; + dynamic setupID; + dynamic projectID; + dynamic patientID; + dynamic patientType; + dynamic clinicID; + dynamic doctorID; + dynamic requestNo; + dynamic requestDate; + dynamic sickLeaveDays; + dynamic appointmentNo; + dynamic admissionNo; + dynamic actualDoctorRate; + dynamic appointmentDate; + dynamic clinicName; + dynamic doctorImageURL; + dynamic doctorName; + dynamic doctorRate; + dynamic doctorTitle; + dynamic gender; + dynamic genderDescription; bool isActiveDoctorProfile; bool isDoctorAllowVedioCall; bool isExecludeDoctor; bool isInOutPatient; - String isInOutPatientDescription; - String isInOutPatientDescriptionN; + dynamic isInOutPatientDescription; + dynamic isInOutPatientDescriptionN; bool isLiveCareAppointment; - int noOfPatientsRate; + dynamic noOfPatientsRate; dynamic patientName; - String projectName; - String qR; + dynamic projectName; + dynamic qR; // List speciality; - String strRequestDate; - String startDate; - String endDate; + dynamic strRequestDate; + dynamic startDate; + dynamic endDate; dynamic isExtendedLeave; dynamic noOfDays; dynamic patientMRN; diff --git a/lib/screens/sick-leave/add-sickleave.dart b/lib/screens/sick-leave/add-sickleave.dart index d7dffd8d..db8dd3c2 100644 --- a/lib/screens/sick-leave/add-sickleave.dart +++ b/lib/screens/sick-leave/add-sickleave.dart @@ -181,7 +181,7 @@ class AddSickLeavScreen extends StatelessWidget { children: [ AppText(TranslationBase.of(context).daysSickleave + ": "), AppText( - item.sickLeaveDays ?? item.noOfDays.toString(), + item.sickLeaveDays.toString() ?? item.noOfDays.toString(), fontWeight: FontWeight.bold, ), ], @@ -211,10 +211,11 @@ class AddSickLeavScreen extends StatelessWidget { child: AppText( AppDateUtils.getDayMonthYearDateFormatted( item.startDate.contains("/Date(") - ? AppDateUtils.convertStringToDate(item.endDate) - .add(Duration(days: item.noOfDays)) - : DateTime.parse(item.startDate) - .add(Duration(days: item.noOfDays))), + ? AppDateUtils.convertStringToDate(item.endDate ?? "") + .add(Duration( + days: item.noOfDays ?? item.sickLeaveDays)) + : DateTime.parse(item.startDate ?? "") + .add(Duration(days: item.noOfDays ?? ""))), fontWeight: FontWeight.bold, ), )