From e8e7a726f5d4361c6f63ab52c0c6caef691fb13a Mon Sep 17 00:00:00 2001 From: devamirsaleemahmad Date: Sun, 15 Oct 2023 16:47:56 +0300 Subject: [PATCH] updates -> 3.13.6 --- lib/analytics/analytic-events.dart | 6 +- lib/analytics/flows/advance_payments.dart | 18 +- lib/analytics/flows/app_nav.dart | 2 +- lib/analytics/flows/appointments.dart | 288 ++++++++-------- lib/analytics/flows/error_tracking.dart | 2 +- lib/analytics/flows/live_care.dart | 18 +- lib/analytics/flows/login_registration.dart | 12 +- lib/analytics/google-analytics.dart | 20 +- lib/config/size_config.dart | 22 +- lib/core/enum/PaymentOptions.dart | 2 - .../GetCMCAllOrdersResponseModel.dart | 90 ++--- .../cmc_get_items_request_model.dart | 28 +- .../cmc_get_items_response_model.dart | 4 +- .../cmc_insert_pres_order_request_model.dart | 102 +++--- .../get_cmc_service_request_model.dart | 30 +- .../get_cmc_service_response_model.dart | 16 +- ...ion_code_for_e_referral_request_model.dart | 20 +- .../create_e_referral_request_model.dart | 119 ++++--- .../get_all_cities_request_model.dart | 16 +- .../get_all_cities_response_model.dart | 6 +- .../get_all_projects_response_model.dart | 26 +- ..._all_relationship_types_request_model.dart | 16 +- ...all_relationship_types_response_model.dart | 8 +- .../get_ereferral_response_model.dart | 91 +++-- .../EReferral/search_criteria_model.dart | 6 +- .../search_e_referral_request_model.dart | 22 +- .../search_e_referral_response_model.dart | 49 ++- ...ion_code_for_e_referral_request_model.dart | 43 ++- .../insert_user_activity_request_model.dart | 32 +- .../H2O/user_detail_model.dart | 48 +-- .../H2O/user_detail_request_model.dart | 56 +-- .../user_progress_for_month_data_model.dart | 6 +- .../user_progress_for_week_data_model.dart | 6 +- .../H2O/user_progress_request_model.dart | 32 +- .../HealthCalculator/ClinicCategory.dart | 24 +- .../HealthCalculator/DiseasesByClinic.dart | 10 +- .../HHC_get_all_services_request_modle.dart | 26 +- .../HHC_get_all_services_response_model.dart | 16 +- .../PatientERHHCInsertServicesList.dart | 10 +- ...get_hhc_all_pres_orders_request_model.dart | 50 +-- ...et_hhc_all_pres_orders_response_model.dart | 52 +-- ...rder_detail_by_order_iD_request_model.dart | 28 +- ...der_detail_by_order_iD_response_model.dart | 20 +- ...nt_er_insert_pres_order_request_model.dart | 80 +++-- .../update_pres_oreder_request_model.dart | 34 +- lib/core/model/Allergy/Allergy.dart | 8 +- .../ActivePrescriptionReport.dart | 102 +++--- .../model/ask_doctor/AskDoctorReqTypes.dart | 16 +- lib/core/model/ask_doctor/DoctorResponse.dart | 28 +- .../blooddonation/blood_groub_details.dart | 32 +- .../model/blooddonation/get_all_cities.dart | 6 +- .../List_BabyInformationModel.dart | 16 +- .../childvaccines/add_newchild_model.dart | 88 ++--- .../childvaccines/create_new_user_model.dart | 109 +++--- .../create_vaccination_table.dart | 8 +- .../childvaccines/delete_baby_model.dart | 38 +-- .../get_vacainations_itemsmodel.dart | 4 +- .../childvaccines/user_information_model.dart | 31 +- .../model/contactus/get_hmg_locations.dart | 22 +- .../contactus/get_patientI_cprojects.dart | 28 +- lib/core/model/doctor/doctor_profile.dart | 134 ++++---- lib/core/model/doctor/doctor_rating.dart | 6 +- .../doctor/patient_doctor_appointment.dart | 320 +++++++++--------- .../reques_patient_doctor_appointmentt.dart | 62 ++-- .../model/doctor/request_doctor_profile.dart | 30 +- .../model/doctor/request_doctor_rating.dart | 32 +- .../model/er/AmbulanceRequestOrdersModel.dart | 124 +++---- lib/core/model/er/ErPatientShareModel.dart | 36 +- lib/core/model/er/PatientAllPresOrders.dart | 58 ++-- lib/core/model/er/PatientER.dart | 94 ++--- lib/core/model/er/PatientER_RC.dart | 100 +++--- lib/core/model/er/PickUpRequestPresOrder.dart | 78 ++--- .../model/er/TriageInformationRequest.dart | 121 +++---- lib/core/model/er/TriageQuestionsModel.dart | 26 +- ..._all_transportation_method_list_model.dart | 22 +- .../model/er/projectavgerwaitingtime.dart | 62 ++-- .../model/eye/AppoimentAllHistoryResult.dart | 188 +++++----- lib/core/model/eye/AppointmentFilter.dart | 4 +- .../family-file/add_family_file_request.dart | 40 +-- .../insert_share_file_request.dart | 34 +- lib/core/model/feedback/COC_items.dart | 32 +- .../feedback/request_insert_coc_item.dart | 63 ++-- lib/core/service/medical/reports_service.dart | 8 +- 83 files changed, 1876 insertions(+), 1946 deletions(-) diff --git a/lib/analytics/analytic-events.dart b/lib/analytics/analytic-events.dart index 7029cad5..8f524173 100644 --- a/lib/analytics/analytic-events.dart +++ b/lib/analytics/analytic-events.dart @@ -1,9 +1,9 @@ import 'package:diplomaticquarterapp/uitl/utils.dart'; class _Event { - String name; - String description; - bool active; + String? name; + String? description; + bool? active; _Event(dynamic map) { if (map != null) { name = map['name']; diff --git a/lib/analytics/flows/advance_payments.dart b/lib/analytics/flows/advance_payments.dart index 22a7bce5..5d946766 100644 --- a/lib/analytics/flows/advance_payments.dart +++ b/lib/analytics/flows/advance_payments.dart @@ -8,14 +8,14 @@ class AdvancePayments{ AdvancePayments(this.logger); // R038 - payment_services({@required String service_type}){ + payment_services({required String service_type}){ logger('payment_services', parameters: { 'service_type' : service_type }); } // R039 - wallet_recharge({@required String service_type}){ + wallet_recharge({required String service_type}){ logger('wallet_recharge', parameters: { 'service_type' : service_type }); @@ -27,7 +27,7 @@ class AdvancePayments{ } // R041 - payment_method({@required String method,type}){ + payment_method({required String method,type}){ logger('payment_method', parameters: { 'payment_method' : method, 'payment_type' : type @@ -35,7 +35,7 @@ class AdvancePayments{ } // R042 - payment_confirm({@required String method,type}){ + payment_confirm({required String method,type}){ logger('payment_confirm', parameters: { 'payment_method' : method, 'payment_type' : type @@ -43,7 +43,7 @@ class AdvancePayments{ } // R043 - payment_otp_confirmation({@required String method,type}){ + payment_otp_confirmation({required String method,type}){ logger('payment_otp_confirmation', parameters: { 'payment_method' : method, 'payment_type' : type @@ -51,7 +51,7 @@ class AdvancePayments{ } // R044 - payment_confirm_card_details({@required String method,type}){ + payment_confirm_card_details({required String method,type}){ logger('payment_confirm_card_details', parameters: { 'payment_method' : method, 'payment_type' : type @@ -59,7 +59,7 @@ class AdvancePayments{ } // R045 - payment_pay({@required String method,type}){ + payment_pay({required String method,type}){ logger('payment_pay', parameters: { 'payment_method' : method, 'payment_type' : type @@ -67,7 +67,7 @@ class AdvancePayments{ } // R046 - payment_success({@required String hospital, payment_method, payment_type, txn_number, txn_amount, txn_currency}){ + payment_success({required String hospital, payment_method, payment_type, txn_number, txn_amount, txn_currency}){ logger('payment_success', parameters: { 'payment_method' : payment_method, 'payment_type' : payment_type, @@ -78,7 +78,7 @@ class AdvancePayments{ }); } - payment_fail({@required String hospital, payment_method, payment_type, txn_amount, txn_currency, error_type}){ + payment_fail({required String hospital, payment_method, payment_type, txn_amount, txn_currency, error_type}){ logger('payment_fail', parameters: { 'payment_method' : payment_method, 'payment_type' : payment_type, diff --git a/lib/analytics/flows/app_nav.dart b/lib/analytics/flows/app_nav.dart index f8a2dbe2..cc1d8f98 100644 --- a/lib/analytics/flows/app_nav.dart +++ b/lib/analytics/flows/app_nav.dart @@ -11,7 +11,7 @@ class AppNav{ }); } - log({int tabIndex, bool isLoggedIn}){ + log({int? tabIndex, bool? isLoggedIn}){ var nav_name = ""; if(tabIndex == 1) nav_name = "medical file"; diff --git a/lib/analytics/flows/appointments.dart b/lib/analytics/flows/appointments.dart index 65fd415d..92142761 100644 --- a/lib/analytics/flows/appointments.dart +++ b/lib/analytics/flows/appointments.dart @@ -10,278 +10,264 @@ import 'package:intl/intl.dart'; import '../google-analytics.dart'; - -class Appointment{ - +class Appointment { final GALogger logger; + Appointment(this.logger); // R015 - book_appointment(){ + book_appointment() { logger('book_appointment'); } // R016.1, R017.2 - book_appointment_by_clinic(){ + book_appointment_by_clinic() { logger('book_appointment_by_clinic'); } // R016.2, R018.2 - book_appointment_by_doctor(){ + book_appointment_by_doctor() { logger('book_appointment_by_doctor'); } // R017.1 - book_appointment_doctor_search({@required String query}){ + book_appointment_doctor_search({required String query}) { // doctor_search_query : value - logger('book_appointment_doctor_search', parameters: { - 'doctor_search_query' : query - }); + logger('book_appointment_doctor_search', parameters: {'doctor_search_query': query}); } // R018.1 - book_appointment_select_clinic({@required String appointment_type, clinic}){ + book_appointment_select_clinic({required String appointment_type, clinic}) { // appointment_type: regular | livecare // clinic_type : $clinic_type - logger('book_appointment_select_clinic', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : clinic - }); + logger('book_appointment_select_clinic', parameters: {'appointment_type': appointment_type, 'clinic_type': clinic}); } // R019.1 - book_appointment_livecare_accept(){ + book_appointment_livecare_accept() { logger('book_appointment_livecare_accept'); } // R019.2 - book_appointment_livecare_decline(){ + book_appointment_livecare_decline() { logger('book_appointment_livecare_decline'); } // R020 - book_appointment_chief_complaints({@required String appointment_type, ListClinicCentralized clinic, HospitalsModel hospital, ListDentalChiefComplain treatment}){ - GAnalytics.TREATMENT_TYPE = treatment.name; + book_appointment_chief_complaints({ + required String appointment_type, + ListClinicCentralized? clinic, + HospitalsModel? hospital, + ListDentalChiefComplain? treatment, + }) { + GAnalytics.TREATMENT_TYPE = treatment!.name; logger('book_appointment_chief_complaints', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : clinic.clinicDescription, - 'hospital_name' : hospital.name, - 'treatment_type' : treatment.name, + 'appointment_type': appointment_type, + 'clinic_type': clinic!.clinicDescription, + 'hospital_name': hospital!.name, + 'treatment_type': treatment.name, }); } // R021 - book_appointment_select_doctor({@required String appointment_type, @required DoctorList doctor}){ + book_appointment_select_doctor({required String appointment_type, required DoctorList doctor}) { // appointment_type, clinic_type, hospital_name, treatment_type, doctor_name, doctor_nationality, doctor_gender logger('book_appointment_select_doctor', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : doctor.clinicName, - 'hospital_name' : doctor.projectName, - 'treatment_type' : GAnalytics.TREATMENT_TYPE ?? '', - 'doctor_name' : doctor.name, - 'doctor_nationality' : doctor.nationalityName, - 'doctor_gender' : doctor.genderDescription, + 'appointment_type': appointment_type, + 'clinic_type': doctor.clinicName, + 'hospital_name': doctor.projectName, + 'treatment_type': GAnalytics.TREATMENT_TYPE ?? '', + 'doctor_name': doctor.name, + 'doctor_nationality': doctor.nationalityName, + 'doctor_gender': doctor.genderDescription, }); } // R022 - book_appointment_schedule({@required String appointment_type, @required DoctorList doctor}){ + book_appointment_schedule({required String appointment_type, required DoctorList doctor}) { // appointment_type, clinic_type, hospital_name, treatment_type, doctor_name, doctor_nationality, doctor_gender logger('book_appointment_schedule', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : doctor.clinicName, - 'hospital_name' : doctor.projectName, - 'treatment_type' : GAnalytics.TREATMENT_TYPE ?? '', - 'doctor_name' : doctor.name, - 'doctor_nationality' : doctor.nationalityName, - 'doctor_gender' : doctor.genderDescription, + 'appointment_type': appointment_type, + 'clinic_type': doctor.clinicName, + 'hospital_name': doctor.projectName, + 'treatment_type': GAnalytics.TREATMENT_TYPE ?? '', + 'doctor_name': doctor.name, + 'doctor_nationality': doctor.nationalityName, + 'doctor_gender': doctor.genderDescription, }); } // R023 - book_appointment_date_selection({@required String appointment_type, @required day, @required DoctorList doctor}){ + book_appointment_date_selection({required String appointment_type, required day, required DoctorList doctor}) { logger('book_appointment_date_selection', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : doctor.clinicName, - 'hospital_name' : doctor.projectName, - 'treatment_type' : GAnalytics.TREATMENT_TYPE ?? '', - 'doctor_name' : doctor.name, - 'doctor_nationality' : doctor.nationalityName, - 'doctor_gender' : doctor.genderDescription, - 'appointment_day' : day + 'appointment_type': appointment_type, + 'clinic_type': doctor.clinicName, + 'hospital_name': doctor.projectName, + 'treatment_type': GAnalytics.TREATMENT_TYPE ?? '', + 'doctor_name': doctor.name, + 'doctor_nationality': doctor.nationalityName, + 'doctor_gender': doctor.genderDescription, + 'appointment_day': day }); } // R024.1 - book_appointment_time_selection({@required String appointment_type, @required DateTime dateTime, @required DoctorList doctor}){ + book_appointment_time_selection({required String appointment_type, required DateTime dateTime, required DoctorList doctor}) { final day = DateUtil.getWeekDay(dateTime.weekday); final hour = DateFormat('HH').format(dateTime); logger('book_appointment_time_selection', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : doctor.clinicName, - 'hospital_name' : doctor.projectName, - 'treatment_type' : GAnalytics.TREATMENT_TYPE ?? '', - 'doctor_name' : doctor.name, - 'doctor_nationality' : doctor.nationalityName, - 'doctor_gender' : doctor.genderDescription, - 'appointment_day' : day, - 'appointment_hour' : hour + 'appointment_type': appointment_type, + 'clinic_type': doctor.clinicName, + 'hospital_name': doctor.projectName, + 'treatment_type': GAnalytics.TREATMENT_TYPE ?? '', + 'doctor_name': doctor.name, + 'doctor_nationality': doctor.nationalityName, + 'doctor_gender': doctor.genderDescription, + 'appointment_day': day, + 'appointment_hour': hour }); } // R024.2 - book_appointment_review({@required String appointment_type, @required DateTime dateTime, @required DoctorList doctor}){ + book_appointment_review({required String appointment_type, required DateTime dateTime, required DoctorList doctor}) { final day = DateUtil.getWeekDay(dateTime.weekday); final hour = DateFormat('HH').format(dateTime); logger('book_appointment_review', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : doctor.clinicName, - 'hospital_name' : doctor.projectName, - 'treatment_type' : GAnalytics.TREATMENT_TYPE ?? '', - 'doctor_name' : doctor.name, - 'doctor_nationality' : doctor.nationalityName, - 'doctor_gender' : doctor.genderDescription, - 'appointment_day' : day, - 'appointment_hour' : hour + 'appointment_type': appointment_type, + 'clinic_type': doctor.clinicName, + 'hospital_name': doctor.projectName, + 'treatment_type': GAnalytics.TREATMENT_TYPE ?? '', + 'doctor_name': doctor.name, + 'doctor_nationality': doctor.nationalityName, + 'doctor_gender': doctor.genderDescription, + 'appointment_day': day, + 'appointment_hour': hour }); } // R025 - book_appointment_click_confirm({@required String appointment_type, @required DateTime dateTime, @required DoctorList doctor}){ + book_appointment_click_confirm({required String appointment_type, required DateTime dateTime, required DoctorList doctor}) { final day = DateUtil.getWeekDay(dateTime.weekday); final hour = DateFormat('HH').format(dateTime); logger('book_appointment_click_confirm', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : doctor.clinicName, - 'hospital_name' : doctor.projectName, - 'treatment_type' : GAnalytics.TREATMENT_TYPE ?? '', - 'doctor_name' : doctor.name, - 'doctor_nationality' : doctor.nationalityName, - 'doctor_gender' : doctor.genderDescription, - 'appointment_day' : day, - 'appointment_hour' : hour // '5-6' + 'appointment_type': appointment_type, + 'clinic_type': doctor.clinicName, + 'hospital_name': doctor.projectName, + 'treatment_type': GAnalytics.TREATMENT_TYPE ?? '', + 'doctor_name': doctor.name, + 'doctor_nationality': doctor.nationalityName, + 'doctor_gender': doctor.genderDescription, + 'appointment_day': day, + 'appointment_hour': hour // '5-6' }); } // R026 - book_appointment_confirmation_success({@required String appointment_type, @required DateTime dateTime, @required DoctorList doctor}){ + book_appointment_confirmation_success({required String appointment_type, required DateTime dateTime, required DoctorList doctor}) { final day = DateUtil.getWeekDay(dateTime.weekday); final hour = DateFormat('HH').format(dateTime); logger('book_appointment_confirmation_success', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : doctor.clinicName, - 'hospital_name' : doctor.projectName, - 'treatment_type' : GAnalytics.TREATMENT_TYPE ?? '', - 'doctor_name' : doctor.name, - 'doctor_nationality' : doctor.nationalityName, - 'doctor_gender' : doctor.genderDescription, - 'appointment_day' : day, - 'appointment_hour' : hour + 'appointment_type': appointment_type, + 'clinic_type': doctor.clinicName, + 'hospital_name': doctor.projectName, + 'treatment_type': GAnalytics.TREATMENT_TYPE ?? '', + 'doctor_name': doctor.name, + 'doctor_nationality': doctor.nationalityName, + 'doctor_gender': doctor.genderDescription, + 'appointment_day': day, + 'appointment_hour': hour }); } // R049.1 // should be for appointment flow - appointment_actions(AppoitmentAllHistoryResultList appointment, String action){ + appointment_actions(AppoitmentAllHistoryResultList appointment, String action) { logger('appointment_actions', parameters: { - 'action_type' : action, - 'flow_type' : GAnalytics.APPOINTMENT_DETAIL_FLOW_TYPE, - 'appointment_type' : appointment.appointmentType, - 'clinic_type_online' : appointment.clinicName, - 'hospital_name' : appointment.projectName, - 'doctor_name' : (appointment.doctorName == null || appointment.doctorName == '') ? appointment.doctorNameObj : appointment.doctorName, - 'payment_type' : 'appointment', + 'action_type': action, + 'flow_type': GAnalytics.APPOINTMENT_DETAIL_FLOW_TYPE, + 'appointment_type': appointment.appointmentType, + 'clinic_type_online': appointment.clinicName, + 'hospital_name': appointment.projectName, + 'doctor_name': (appointment.doctorName == null || appointment.doctorName == '') ? appointment.doctorNameObj : appointment.doctorName, + 'payment_type': 'appointment', }); } // R027 - appointment_reminder(bool value){ - logger('appointment_reminder', parameters: { - 'reminder' : value ? 'yes' : 'no' - }); + appointment_reminder(bool value) { + logger('appointment_reminder', parameters: {'reminder': value ? 'yes' : 'no'}); } // R028 - appointment_reminder_time({@required String reminde_before}){ - logger('appointment_reminder_time', parameters: { - 'reminder_before' : reminde_before - }); + appointment_reminder_time({required String reminde_before}) { + logger('appointment_reminder_time', parameters: {'reminder_before': reminde_before}); } // R053 // Note : - Payment flow beyond this step are same as listed under ‘Advance Payment’ section of this document - pay_now_for_appointment({@required String appointment_type, @required DoctorList doctorDetail, bool payNow = true}){ + pay_now_for_appointment({required String appointment_type, required DoctorList doctorDetail, bool payNow = true}) { logger('pay_now_for_appointment', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : doctorDetail.clinicName, - 'hospital_name' : doctorDetail.projectName, - 'doctor_name' : doctorDetail.name, - 'payment_type' : 'appointment' + 'appointment_type': appointment_type, + 'clinic_type': doctorDetail.clinicName, + 'hospital_name': doctorDetail.projectName, + 'doctor_name': doctorDetail.name, + 'payment_type': 'appointment' }); } // R033 - payment_method({@required String appointment_type, clinic, payment_method, payment_type}){ - logger('payment_method', parameters: { - 'appointment_type' : appointment_type, - 'clinic_type' : clinic, - 'payment_method' : payment_method, - 'payment_type' : payment_type - }); + payment_method({required String appointment_type, clinic, payment_method, payment_type}) { + logger('payment_method', parameters: {'appointment_type': appointment_type, 'clinic_type': clinic, 'payment_method': payment_method, 'payment_type': payment_type}); } - // R036 - payment_success({@required String appointment_type, clinic, hospital, payment_method, payment_type, txn_number, txn_amount, txn_currency}){ + payment_success({required String appointment_type, clinic, hospital, payment_method, payment_type, txn_number, txn_amount, txn_currency}) { logger('payment_success', parameters: { - 'appointment_type' : appointment_type, - 'payment_method' : payment_method, - 'payment_type' : payment_type, - 'hospital_name' : hospital, - 'clinic_type_online' : clinic, - 'transaction_number' : txn_number, - 'transaction_amount' : txn_amount, - 'transaction_currency' : txn_currency, + 'appointment_type': appointment_type, + 'payment_method': payment_method, + 'payment_type': payment_type, + 'hospital_name': hospital, + 'clinic_type_online': clinic, + 'transaction_number': txn_number, + 'transaction_amount': txn_amount, + 'transaction_currency': txn_currency, }); } - payment_fail({@required String appointment_type, clinic, hospital, payment_method, payment_type, txn_amount, txn_currency, error_type}){ + payment_fail({required String appointment_type, clinic, hospital, payment_method, payment_type, txn_amount, txn_currency, error_type}) { logger('payment_fail', parameters: { - 'appointment_type' : appointment_type, - 'payment_method' : payment_method, - 'payment_type' : payment_type, - 'hospital_name' : hospital, - 'clinic_type_online' : clinic, - 'transaction_amount' : txn_amount, - 'transaction_currency' : txn_currency, - 'error_type' : error_type + 'appointment_type': appointment_type, + 'payment_method': payment_method, + 'payment_type': payment_type, + 'hospital_name': hospital, + 'clinic_type_online': clinic, + 'transaction_amount': txn_amount, + 'transaction_currency': txn_currency, + 'error_type': error_type }); } - // Note : - Payment flow beyond this step are same as listed under ‘Advance Payment’ section of this document - appointment_detail_action({@required AppoitmentAllHistoryResultList appointment, @required String action}){ + appointment_detail_action({required AppoitmentAllHistoryResultList appointment, required String action}) { logger('appointment_detail_action', parameters: { - 'action_type' : action, - 'flow_type' : GAnalytics.APPOINTMENT_DETAIL_FLOW_TYPE, + 'action_type': action, + 'flow_type': GAnalytics.APPOINTMENT_DETAIL_FLOW_TYPE, }); } // Note : - Payment flow beyond this step are same as listed under ‘Advance Payment’ section of this document - appointment_details_confirm({@required AppoitmentAllHistoryResultList appointment}){ - logger('appointment_details_confirm', parameters: { - }); + appointment_details_confirm({required AppoitmentAllHistoryResultList appointment}) { + logger('appointment_details_confirm', parameters: {}); } // R053 // Note : - Payment flow beyond this step are same as listed under ‘Advance Payment’ section of this document - appointment_details_cancel({@required AppoitmentAllHistoryResultList appointment, appointment_type}){ + appointment_details_cancel({required AppoitmentAllHistoryResultList appointment, appointment_type}) { logger('cancel_appointment', parameters: { - 'flow_type' : GAnalytics.APPOINTMENT_DETAIL_FLOW_TYPE, - 'appointment_type' : appointment_type, - 'clinic_type_online' : appointment.clinicName, - 'hospital_name' : appointment.projectName, - 'doctor_name' : (appointment.doctorName == null || appointment.doctorName == '') ? appointment.doctorNameObj : appointment.doctorName + 'flow_type': GAnalytics.APPOINTMENT_DETAIL_FLOW_TYPE, + 'appointment_type': appointment_type, + 'clinic_type_online': appointment.clinicName, + 'hospital_name': appointment.projectName, + 'doctor_name': (appointment.doctorName == null || appointment.doctorName == '') ? appointment.doctorNameObj : appointment.doctorName }); } - -} \ No newline at end of file +} diff --git a/lib/analytics/flows/error_tracking.dart b/lib/analytics/flows/error_tracking.dart index d40af03f..17258b39 100644 --- a/lib/analytics/flows/error_tracking.dart +++ b/lib/analytics/flows/error_tracking.dart @@ -5,7 +5,7 @@ class ErrorTracking{ final GALogger logger; ErrorTracking(this.logger); - log(String type, {String error}){ + log(String type, {String? error}){ logger('errors', parameters: { 'error_type' : type ?? 'unknown', 'error' : error ?? 'unknown', diff --git a/lib/analytics/flows/live_care.dart b/lib/analytics/flows/live_care.dart index d85d82d8..ca496e53 100644 --- a/lib/analytics/flows/live_care.dart +++ b/lib/analytics/flows/live_care.dart @@ -18,35 +18,35 @@ class LiveCare{ } // R031.1 - livecare_clinic_schedule({@required String clinic}){ + livecare_clinic_schedule({required String clinic}){ logger('livecare_clinic_schedule', parameters: { 'clinic_type_online' : clinic }); } // R031.2 - livecare_immediate_consultation_clinic({@required String clinic}){ + livecare_immediate_consultation_clinic({required String clinic}){ logger('livecare_immediate_consultation_clinic', parameters: { 'clinic_type_online' : clinic }); } // R031.2 - livecare_schedule_video_call_clinic({@required String clinic}){ + livecare_schedule_video_call_clinic({required String clinic}){ logger('livecare_schedule_video_call_clinic', parameters: { 'clinic_type_online' : clinic }); } // R032 - livecare_immediate_consultation_TnC({@required String clinic}){ + livecare_immediate_consultation_TnC({required String clinic}){ logger('livecare_immediate_consultation_tandc', parameters: { 'clinic_type_online' : clinic }); } // R033 - payment_method({@required String appointment_type, clinic, payment_method, payment_type}){ + payment_method({required String appointment_type, clinic, payment_method, payment_type}){ logger('payment_method', parameters: { 'appointment_type' : appointment_type, 'clinic_type_online' : clinic, @@ -56,7 +56,7 @@ class LiveCare{ } // R034 - payment_confirm({@required String appointment_type, clinic, payment_method, payment_type}){ + payment_confirm({required String appointment_type, clinic, payment_method, payment_type}){ logger('payment_confirm', parameters: { 'appointment_type' : appointment_type, 'clinic_type_online' : clinic, @@ -66,7 +66,7 @@ class LiveCare{ } // R035 - payment_pay({@required String appointment_type, clinic, hospital, payment_method, payment_type}){ + payment_pay({required String appointment_type, clinic, hospital, payment_method, payment_type}){ // logger('payment_pay', parameters: { // 'appointment_type' : appointment_type, // 'clinic_type_online' : clinic, @@ -77,7 +77,7 @@ class LiveCare{ } // R036 - payment_success({@required String appointment_type, clinic, hospital, payment_method, payment_type, txn_number, txn_amount, txn_currency}){ + payment_success({required String appointment_type, clinic, hospital, payment_method, payment_type, txn_number, txn_amount, txn_currency}){ // appointment_type // clinic_type_online // payment_method @@ -89,7 +89,7 @@ class LiveCare{ } // R037 - livecare_immediate_consultation_payment_failed({@required String appointment_type, clinic, payment_method, payment_type, txn_amount, txn_currency, error_message}){ + livecare_immediate_consultation_payment_failed({required String appointment_type, clinic, payment_method, payment_type, txn_amount, txn_currency, error_message}){ logger('livecare_immediate_consult_payment_fail', parameters: { 'payment_method' : payment_method, 'appointment_type' : appointment_type, diff --git a/lib/analytics/flows/login_registration.dart b/lib/analytics/flows/login_registration.dart index 200fe1bb..eb02d253 100644 --- a/lib/analytics/flows/login_registration.dart +++ b/lib/analytics/flows/login_registration.dart @@ -3,8 +3,8 @@ import 'package:flutter/cupertino.dart'; import '../google-analytics.dart'; class LoginRegistration{ - static int loginMethod; - static int verificationMethod; + static int loginMethod = 0; + static int verificationMethod = 0; final GALogger logger; LoginRegistration(this.logger); @@ -22,7 +22,7 @@ class LoginRegistration{ } // R006.1, R007.1, R008.1, R009.1 - registration_cancel({@required String step}){ + registration_cancel({required String step}){ // registration_step : enter details // registration_step : personal info // registration_step : patient info @@ -58,7 +58,7 @@ class LoginRegistration{ logger('registration_confirmation'); } - registration_fail({@required String errorType}){ + registration_fail({required String errorType}){ // verification_method: by logger('registration_fail', parameters: { 'error_type' : errorType @@ -66,7 +66,7 @@ class LoginRegistration{ } // R011.1 - login_start({@required String method}){ + login_start({required String method}){ logger('login_start', parameters: { 'login_method' : method }); @@ -117,7 +117,7 @@ class LoginRegistration{ } // R012.4 - login_unsuccessful({@required String method, error}){ + login_unsuccessful({required String method, error}){ logger('login_unsuccessful', parameters: { 'login_method' : method }); diff --git a/lib/analytics/google-analytics.dart b/lib/analytics/google-analytics.dart index e38b6d1e..0b4b1075 100644 --- a/lib/analytics/google-analytics.dart +++ b/lib/analytics/google-analytics.dart @@ -26,7 +26,7 @@ typedef GALogger = Function(String name, {Map parameters}); var _analytics = FirebaseAnalytics.instance; -_logger(String name, {Map parameters}) async { +_logger(String name, {Map? parameters}) async { // return; if (name != null && name.isNotEmpty) { if (name.contains(' ')) name = name.replaceAll(' ', '_'); @@ -53,9 +53,9 @@ _logger(String name, {Map parameters}) async { } class GAnalytics { - static String TREATMENT_TYPE; - static String APPOINTMENT_DETAIL_FLOW_TYPE; - static String PAYMENT_TYPE; + static String? TREATMENT_TYPE; + static String? APPOINTMENT_DETAIL_FLOW_TYPE; + static String? PAYMENT_TYPE; setUser(AuthenticatedUser user) async { try { @@ -105,14 +105,14 @@ class NavObserver extends RouteObserver> { } } - if (route.settings.name != null && route.settings.name.isNotEmpty && route.settings.name != "null") { - var class_ = routes[route.settings.name](0); + if (route.settings.name != null && route.settings.name!.isNotEmpty && route.settings.name != "null") { + var class_ = routes[route.settings.name]!(0); if (class_ != null) log(class_.toStringShort()); } else if (route is FadePage) { var class_ = route.page; if (class_ != null) log(class_.toStringShort()); } else if (route is MaterialPageRoute) { - var class_ = route.builder(null); + var class_ = route.builder(route.subtreeContext!); if (class_ != null) log(class_.toStringShort()); } else { print(""); @@ -120,7 +120,7 @@ class NavObserver extends RouteObserver> { } @override - void didPush(Route route, Route previousRoute) { + void didPush(Route route, Route? previousRoute) { super.didPush(route, previousRoute); if (route is PageRoute) { _sendScreenView(route); @@ -128,7 +128,7 @@ class NavObserver extends RouteObserver> { } @override - void didReplace({Route newRoute, Route oldRoute}) { + void didReplace({Route? newRoute, Route? oldRoute}) { super.didReplace(newRoute: newRoute, oldRoute: oldRoute); if (newRoute is PageRoute) { _sendScreenView(newRoute); @@ -136,7 +136,7 @@ class NavObserver extends RouteObserver> { } @override - void didPop(Route route, Route previousRoute) { + void didPop(Route route, Route? previousRoute) { super.didPop(route, previousRoute); // if (previousRoute is PageRoute && route is PageRoute) { // _sendScreenView(previousRoute); diff --git a/lib/config/size_config.dart b/lib/config/size_config.dart index e7e1b41b..8a9a92f2 100644 --- a/lib/config/size_config.dart +++ b/lib/config/size_config.dart @@ -6,14 +6,14 @@ class SizeConfig { static double _blockWidth = 0; static double _blockHeight = 0; - static double realScreenWidth; - static double realScreenHeight; - static double screenWidth; - static double screenHeight; - static double textMultiplier; - static double imageSizeMultiplier; - static double heightMultiplier; - static double widthMultiplier; + static double? realScreenWidth; + static double? realScreenHeight; + static double? screenWidth; + static double? screenHeight; + static double? textMultiplier; + static double? imageSizeMultiplier; + static double? heightMultiplier; + static double? widthMultiplier; static bool isPortrait = true; static bool isMobilePortrait = false; @@ -28,7 +28,7 @@ class SizeConfig { } if (orientation == Orientation.portrait) { isPortrait = true; - if (realScreenWidth < 450) { + if (realScreenWidth! < 450) { isMobilePortrait = true; } screenHeight = realScreenHeight; @@ -39,8 +39,8 @@ class SizeConfig { screenHeight = realScreenWidth; screenWidth = realScreenHeight; } - _blockWidth = screenWidth / 100; - _blockHeight = screenHeight / 100; + _blockWidth = screenWidth! / 100; + _blockHeight = screenHeight! / 100; textMultiplier = _blockHeight; imageSizeMultiplier = _blockWidth; diff --git a/lib/core/enum/PaymentOptions.dart b/lib/core/enum/PaymentOptions.dart index bbf43cb2..1e2bab4e 100644 --- a/lib/core/enum/PaymentOptions.dart +++ b/lib/core/enum/PaymentOptions.dart @@ -28,7 +28,5 @@ extension PaymentOptions_ on PaymentOptions{ return "APPLEPAY"; break; } - - return null; } } diff --git a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart index 341d9e52..8364a240 100644 --- a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart +++ b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart @@ -1,49 +1,49 @@ class GetCMCAllOrdersResponseModel { - int iD; - int patientId; - int patientOutSa; - bool isOutPatient; - int projectId; - int nearestProjectId; + int? iD; + int? patientId; + int? patientOutSa; + bool? isOutPatient; + int? projectId; + int? nearestProjectId; dynamic longitude; dynamic latitude; dynamic appointmentNo; dynamic dischargeId; - int statusId; - int serviceId; - int channel; - Orderpayment orderpayment; + int? statusId; + int? serviceId; + int? channel; + Orderpayment? orderpayment; dynamic orderselectedservice; dynamic wforder; dynamic orderapprovalobj; - String created; + String? created; dynamic createdBy; dynamic modified; dynamic modifiedBy; - bool isDeleted; - String statusText; - int paymentStatus; + bool? isDeleted; + String? statusText; + int? paymentStatus; dynamic clientRequestid; dynamic paymentStatusText; - String projectName; - String nearestProjectName; + String? projectName; + String? nearestProjectName; dynamic paymentAmount; - WFOrder wFOrder; - String serviceText; - bool isSentForApproval; - int exaCartOrderId; - bool isTimer; - int timeSeconds; - int totalPendingSeconds; - int timeMinute; - int timeHour; - int timeTotalSeconds; - int timeTotalMinute; - int timeTotalHour; + WFOrder? wFOrder; + String? serviceText; + bool? isSentForApproval; + int? exaCartOrderId; + bool? isTimer; + int? timeSeconds; + int? totalPendingSeconds; + int? timeMinute; + int? timeHour; + int? timeTotalSeconds; + int? timeTotalMinute; + int? timeTotalHour; dynamic approvalStatus; - bool isActive; - int clickButton; - List procedures; + bool? isActive; + int? clickButton; + List? procedures; dynamic pickupLocation; dynamic dropOffLocation; dynamic clinicName; @@ -180,7 +180,7 @@ class GetCMCAllOrdersResponseModel { data['ServiceId'] = this.serviceId; data['Channel'] = this.channel; if (this.orderpayment != null) { - data['orderpayment'] = this.orderpayment.toJson(); + data['orderpayment'] = this.orderpayment!.toJson(); } data['orderselectedservice'] = this.orderselectedservice; @@ -199,7 +199,7 @@ class GetCMCAllOrdersResponseModel { data['NearestProjectName'] = this.nearestProjectName; data['PaymentAmount'] = this.paymentAmount; if (this.wFOrder != null) { - data['WF_order'] = this.wFOrder.toJson(); + data['WF_order'] = this.wFOrder!.toJson(); } data['ServiceText'] = this.serviceText; data['isSentForApproval'] = this.isSentForApproval; @@ -227,17 +227,17 @@ class GetCMCAllOrdersResponseModel { } class Orderpayment { - int iD; - int orderId; + int? iD; + int? orderId; dynamic clientRequestId; dynamic totalAmount; - int paymentStatus; + int? paymentStatus; dynamic order; - String created; + String? created; dynamic createdBy; dynamic modified; dynamic modifiedBy; - bool isDeleted; + bool? isDeleted; Orderpayment( {this.iD, @@ -285,17 +285,17 @@ class Orderpayment { class WFOrder { dynamic wfButtonsDTO; - int iD; - int orderId; - int previousStep; - int nextStep; - int serviceId; + int? iD; + int? orderId; + int? previousStep; + int? nextStep; + int? serviceId; dynamic order; - String created; + String? created; dynamic createdBy; dynamic modified; dynamic modifiedBy; - bool isDeleted; + bool? isDeleted; WFOrder( {this.wfButtonsDTO, diff --git a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_get_items_request_model.dart b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_get_items_request_model.dart index 6880f9f5..98857fff 100644 --- a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_get_items_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_get_items_request_model.dart @@ -1,18 +1,18 @@ class CMCGetItemsRequestModel { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; - int checkupType; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; + int? checkupType; CMCGetItemsRequestModel( {this.versionID, diff --git a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_get_items_response_model.dart b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_get_items_response_model.dart index 6f362baa..2aa8e35f 100644 --- a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_get_items_response_model.dart +++ b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_get_items_response_model.dart @@ -1,6 +1,6 @@ class CMCGetItemsResponseModel { - String itemDescription; - String itemName; + String? itemDescription; + String? itemName; CMCGetItemsResponseModel({this.itemDescription, this.itemName}); diff --git a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart index 9de08856..5eb8877f 100644 --- a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart @@ -1,44 +1,44 @@ class CMCInsertPresOrderRequestModel { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; - double latitude; - double longitude; - int createdBy; - int orderServiceID; - int projectID; - List patientERCMCInsertServicesList; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; + double? latitude; + double? longitude; + int? createdBy; + int? orderServiceID; + int? projectID; + List? patientERCMCInsertServicesList; CMCInsertPresOrderRequestModel( {this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.patientID, - this.tokenID, - this.patientTypeID, - this.patientType, - this.latitude, - this.longitude, - this.createdBy, - this.orderServiceID, - this.projectID, - this.patientERCMCInsertServicesList}); + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.patientID, + this.tokenID, + this.patientTypeID, + this.patientType, + this.latitude, + this.longitude, + this.createdBy, + this.orderServiceID, + this.projectID, + this.patientERCMCInsertServicesList}); CMCInsertPresOrderRequestModel.fromJson(Map json) { versionID = json['VersionID']; @@ -60,11 +60,11 @@ class CMCInsertPresOrderRequestModel { orderServiceID = json['OrderServiceID']; projectID = json['ProjectId']; if (json['PatientER_CMC_InsertServicesList'] != null) { - patientERCMCInsertServicesList = - new List(); + patientERCMCInsertServicesList = []; json['PatientER_CMC_InsertServicesList'].forEach((v) { - patientERCMCInsertServicesList - .add(new PatientERCMCInsertServicesList.fromJson(v)); + patientERCMCInsertServicesList!.add( + new PatientERCMCInsertServicesList.fromJson(v), + ); }); } } @@ -89,30 +89,22 @@ class CMCInsertPresOrderRequestModel { data['OrderServiceID'] = this.orderServiceID; data['ProjectID'] = this.projectID; if (this.patientERCMCInsertServicesList != null) { - data['procedures'] = - this.patientERCMCInsertServicesList.map((v) => v.toJson()).toList(); + data['procedures'] = this.patientERCMCInsertServicesList!.map((v) => v.toJson()).toList(); } return data; } } class PatientERCMCInsertServicesList { - int recordID; - String serviceID; - String selectedServiceName; - String selectedServiceNameAR; + int? recordID; + String? serviceID; + String? selectedServiceName; + String? selectedServiceNameAR; dynamic price; dynamic vAT; dynamic totalPrice; - PatientERCMCInsertServicesList( - {this.recordID, - this.serviceID, - this.selectedServiceName, - this.selectedServiceNameAR, - this.price, - this.vAT, - this.totalPrice}); + PatientERCMCInsertServicesList({this.recordID, this.serviceID, this.selectedServiceName, this.selectedServiceNameAR, this.price, this.vAT, this.totalPrice}); PatientERCMCInsertServicesList.fromJson(Map json) { recordID = json['RecordID']; diff --git a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_request_model.dart b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_request_model.dart index e80b656d..2492a7b7 100644 --- a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_request_model.dart @@ -1,19 +1,19 @@ class GetCMCServicesRequestModel { - int channel; - int deviceTypeID; - int genderID; - String generalid; - String identificationNo; - String iPAdress; - bool isDentalAllowedBackend; - int languageID; - int patientID; - int patientOutSA; - int patientType; - int patientTypeID; - String sessionID; - String tokenID; - double versionID; + int? channel; + int? deviceTypeID; + int? genderID; + String? generalid; + String? identificationNo; + String? iPAdress; + bool? isDentalAllowedBackend; + int? languageID; + int? patientID; + int? patientOutSA; + int? patientType; + int? patientTypeID; + String? sessionID; + String? tokenID; + double? versionID; GetCMCServicesRequestModel( {this.channel, diff --git a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart index 335366cd..38741b14 100644 --- a/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart +++ b/lib/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart @@ -1,15 +1,15 @@ class GetCMCServicesResponseModel { - int iD; - String serviceID; - int orderServiceID; - String text; - String textN; + int? iD; + String? serviceID; + int? orderServiceID; + String? text; + String? textN; dynamic price; dynamic priceVAT; dynamic priceTotal; - bool isEnabled; - int orderId; - int quantity; + bool? isEnabled; + int? orderId; + int? quantity; GetCMCServicesResponseModel( {this.iD, diff --git a/lib/core/model/AlHabibMedicalService/EReferral/check_activation_code_for_e_referral_request_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/check_activation_code_for_e_referral_request_model.dart index 3f26abe7..67acc1aa 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/check_activation_code_for_e_referral_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/check_activation_code_for_e_referral_request_model.dart @@ -1,15 +1,15 @@ class CheckActivationCodeForEReferralResponseModel { - String logInTokenID; - String activationCode; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; + String? logInTokenID; + String? activationCode; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; Null sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; + bool? isDentalAllowedBackend; + int? deviceTypeID; CheckActivationCodeForEReferralResponseModel( {this.logInTokenID, diff --git a/lib/core/model/AlHabibMedicalService/EReferral/create_e_referral_request_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/create_e_referral_request_model.dart index e13de327..b63ba8e8 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/create_e_referral_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/create_e_referral_request_model.dart @@ -1,60 +1,60 @@ class CreateEReferralRequestModel { - bool isInsuredPatient; - String cityCode; - String cityName; - String requesterName; - String requesterContactNo; - int requesterRelationship; - String otherRelationship; - String fullName; - int identificationNo; - String patientMobileNumber; - int preferredBranchCode; - String preferredBranchName; - List medicalReportAttachment; + bool? isInsuredPatient; + String? cityCode; + String? cityName; + String? requesterName; + String? requesterContactNo; + int? requesterRelationship; + String? otherRelationship; + String? fullName; + int? identificationNo; + String? patientMobileNumber; + int? preferredBranchCode; + String? preferredBranchName; + List? medicalReportAttachment; dynamic insuranceCardAttachment; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; CreateEReferralRequestModel( {this.isInsuredPatient, - this.cityCode, - this.cityName, - this.requesterName, - this.requesterContactNo, - this.requesterRelationship, - this.otherRelationship, - this.fullName, - this.identificationNo, - this.patientMobileNumber, - this.preferredBranchCode, - this.preferredBranchName, - this.medicalReportAttachment, - this.insuranceCardAttachment, - this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.patientID, - this.tokenID, - this.patientTypeID, - this.patientType}); + this.cityCode, + this.cityName, + this.requesterName, + this.requesterContactNo, + this.requesterRelationship, + this.otherRelationship, + this.fullName, + this.identificationNo, + this.patientMobileNumber, + this.preferredBranchCode, + this.preferredBranchName, + this.medicalReportAttachment, + this.insuranceCardAttachment, + this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.patientID, + this.tokenID, + this.patientTypeID, + this.patientType}); CreateEReferralRequestModel.fromJson(Map json) { isInsuredPatient = json['IsInsuredPatient']; @@ -70,14 +70,12 @@ class CreateEReferralRequestModel { preferredBranchCode = json['PreferredBranchCode']; preferredBranchName = json['PreferredBranchName']; if (json['MedicalReportAttachment'] != null) { - medicalReportAttachment = new List(); + medicalReportAttachment = []; json['MedicalReportAttachment'].forEach((v) { - medicalReportAttachment.add(new EReferralAttachment.fromJson(v)); + medicalReportAttachment!.add(EReferralAttachment.fromJson(v)); }); } - insuranceCardAttachment = json['InsuranceCardAttachment'] != null - ? new EReferralAttachment.fromJson(json['InsuranceCardAttachment']) - : null; + insuranceCardAttachment = json['InsuranceCardAttachment'] != null ? EReferralAttachment.fromJson(json['InsuranceCardAttachment']) : null; versionID = json['VersionID']; channel = json['Channel']; languageID = json['LanguageID']; @@ -108,8 +106,7 @@ class CreateEReferralRequestModel { data['PreferredBranchCode'] = this.preferredBranchCode; data['PreferredBranchName'] = this.preferredBranchName; if (this.medicalReportAttachment != null) { - data['MedicalReportAttachment'] = - this.medicalReportAttachment.map((v) => v.toJson()).toList(); + data['MedicalReportAttachment'] = this.medicalReportAttachment!.map((v) => v.toJson()).toList(); } if (this.insuranceCardAttachment == null) { data['InsuranceCardAttachment'] = {}; @@ -134,8 +131,8 @@ class CreateEReferralRequestModel { } class EReferralAttachment { - String fileName; - String base64String; + String? fileName; + String? base64String; EReferralAttachment({this.fileName, this.base64String}); diff --git a/lib/core/model/AlHabibMedicalService/EReferral/get_all_cities_request_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/get_all_cities_request_model.dart index dd46a48b..0b897806 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/get_all_cities_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/get_all_cities_request_model.dart @@ -1,13 +1,13 @@ class GetAllCitiesRequestModel { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; Null sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; + bool? isDentalAllowedBackend; + int? deviceTypeID; GetAllCitiesRequestModel( {this.versionID, diff --git a/lib/core/model/AlHabibMedicalService/EReferral/get_all_cities_response_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/get_all_cities_response_model.dart index 224cb84d..efc3d58c 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/get_all_cities_response_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/get_all_cities_response_model.dart @@ -1,7 +1,7 @@ class GetAllCitiesResponseModel { - int iD; - String description; - String descriptionN; + int? iD; + String? description; + String? descriptionN; GetAllCitiesResponseModel({this.iD, this.description, this.descriptionN}); diff --git a/lib/core/model/AlHabibMedicalService/EReferral/get_all_projects_response_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/get_all_projects_response_model.dart index 438f1630..5efe2317 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/get_all_projects_response_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/get_all_projects_response_model.dart @@ -1,20 +1,20 @@ class GetAllProjectsResponseModel { - String desciption; + String? desciption; Null desciptionN; - int iD; - String legalName; - String legalNameN; - String name; + int? iD; + String? legalName; + String? legalNameN; + String? name; Null nameN; - String phoneNumber; - String setupID; - int distanceInKilometers; - bool isActive; - String latitude; - String longitude; - int mainProjectID; + String? phoneNumber; + String? setupID; + int? distanceInKilometers; + bool? isActive; + String? latitude; + String? longitude; + int? mainProjectID; Null projectOutSA; - bool usingInDoctorApp; + bool? usingInDoctorApp; GetAllProjectsResponseModel( {this.desciption, diff --git a/lib/core/model/AlHabibMedicalService/EReferral/get_all_relationship_types_request_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/get_all_relationship_types_request_model.dart index 10eb03de..081c071e 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/get_all_relationship_types_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/get_all_relationship_types_request_model.dart @@ -1,13 +1,13 @@ class GetAllRelationshipTypeRequestModel { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; Null sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; + bool? isDentalAllowedBackend; + int? deviceTypeID; GetAllRelationshipTypeRequestModel( {this.versionID, diff --git a/lib/core/model/AlHabibMedicalService/EReferral/get_all_relationship_types_response_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/get_all_relationship_types_response_model.dart index 997e3f3c..237017d3 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/get_all_relationship_types_response_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/get_all_relationship_types_response_model.dart @@ -1,8 +1,8 @@ class GetAllRelationshipTypeResponseModel { - int iD; - String text; - String textAr; - String textEn; + int? iD; + String? text; + String? textAr; + String? textEn; GetAllRelationshipTypeResponseModel( {this.iD, this.text, this.textAr, this.textEn}); diff --git a/lib/core/model/AlHabibMedicalService/EReferral/get_ereferral_response_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/get_ereferral_response_model.dart index e873261d..e80e7d90 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/get_ereferral_response_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/get_ereferral_response_model.dart @@ -2,54 +2,53 @@ class GetEReferralResponseModel { dynamic acceptedBrachCode; dynamic acceptedBranchName; dynamic acceptedBranchNameAr; - Channel channel; + Channel? channel; dynamic identityCardAttachment; - String identityNumber; + String? identityNumber; dynamic insuranceCardAttachment; - bool isInsuredPatient; - String otherRelationship; - String patientContactNo; - int patientId; - String patientName; - int preferredBranchCode; - String preferredBranchName; - String referralDate; - int referralNumber; - Channel relationshipType; - String requesterContactNo; - String requesterName; - String status; - String statusAr; + bool? isInsuredPatient; + String? otherRelationship; + String? patientContactNo; + int? patientId; + String? patientName; + int? preferredBranchCode; + String? preferredBranchName; + String? referralDate; + int? referralNumber; + Channel? relationshipType; + String? requesterContactNo; + String? requesterName; + String? status; + String? statusAr; GetEReferralResponseModel( {this.acceptedBrachCode, - this.acceptedBranchName, - this.acceptedBranchNameAr, - this.channel, - this.identityCardAttachment, - this.identityNumber, - this.insuranceCardAttachment, - this.isInsuredPatient, - this.otherRelationship, - this.patientContactNo, - this.patientId, - this.patientName, - this.preferredBranchCode, - this.preferredBranchName, - this.referralDate, - this.referralNumber, - this.relationshipType, - this.requesterContactNo, - this.requesterName, - this.status, - this.statusAr}); + this.acceptedBranchName, + this.acceptedBranchNameAr, + this.channel, + this.identityCardAttachment, + this.identityNumber, + this.insuranceCardAttachment, + this.isInsuredPatient, + this.otherRelationship, + this.patientContactNo, + this.patientId, + this.patientName, + this.preferredBranchCode, + this.preferredBranchName, + this.referralDate, + this.referralNumber, + this.relationshipType, + this.requesterContactNo, + this.requesterName, + this.status, + this.statusAr}); GetEReferralResponseModel.fromJson(Map json) { acceptedBrachCode = json['AcceptedBrachCode']; acceptedBranchName = json['AcceptedBranchName']; acceptedBranchNameAr = json['AcceptedBranchNameAr']; - channel = - json['Channel'] != null ? new Channel.fromJson(json['Channel']) : null; + channel = json['Channel'] != null ? new Channel.fromJson(json['Channel']) : null; identityCardAttachment = json['IdentityCardAttachment']; identityNumber = json['IdentityNumber']; insuranceCardAttachment = json['InsuranceCardAttachment']; @@ -62,9 +61,7 @@ class GetEReferralResponseModel { preferredBranchName = json['PreferredBranchName']; referralDate = json['ReferralDate']; referralNumber = json['ReferralNumber']; - relationshipType = json['RelationshipType'] != null - ? new Channel.fromJson(json['RelationshipType']) - : null; + relationshipType = json['RelationshipType'] != null ? new Channel.fromJson(json['RelationshipType']) : null; requesterContactNo = json['RequesterContactNo']; requesterName = json['RequesterName']; status = json['Status']; @@ -77,7 +74,7 @@ class GetEReferralResponseModel { data['AcceptedBranchName'] = this.acceptedBranchName; data['AcceptedBranchNameAr'] = this.acceptedBranchNameAr; if (this.channel != null) { - data['Channel'] = this.channel.toJson(); + data['Channel'] = this.channel!.toJson(); } data['IdentityCardAttachment'] = this.identityCardAttachment; data['IdentityNumber'] = this.identityNumber; @@ -92,7 +89,7 @@ class GetEReferralResponseModel { data['ReferralDate'] = this.referralDate; data['ReferralNumber'] = this.referralNumber; if (this.relationshipType != null) { - data['RelationshipType'] = this.relationshipType.toJson(); + data['RelationshipType'] = this.relationshipType!.toJson(); } data['RequesterContactNo'] = this.requesterContactNo; data['RequesterName'] = this.requesterName; @@ -103,10 +100,10 @@ class GetEReferralResponseModel { } class Channel { - int iD; - String text; - String textAr; - String textEn; + int? iD; + String? text; + String? textAr; + String? textEn; Channel({this.iD, this.text, this.textAr, this.textEn}); diff --git a/lib/core/model/AlHabibMedicalService/EReferral/search_criteria_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/search_criteria_model.dart index 3ddbe331..db73b395 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/search_criteria_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/search_criteria_model.dart @@ -1,7 +1,7 @@ class SearchCriteriaModel { - String name; - String nameAr; - int value; + String? name; + String? nameAr; + int? value; SearchCriteriaModel({this.name, this.nameAr, this.value}); diff --git a/lib/core/model/AlHabibMedicalService/EReferral/search_e_referral_request_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/search_e_referral_request_model.dart index b06ce8e7..d4995b4e 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/search_e_referral_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/search_e_referral_request_model.dart @@ -1,16 +1,16 @@ class SearchEReferralRequestModel { - String patientMobileNumber; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; + String? patientMobileNumber; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; Null sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int referralNumber; - String identificationNo; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? referralNumber; + String? identificationNo; SearchEReferralRequestModel( {this.patientMobileNumber, diff --git a/lib/core/model/AlHabibMedicalService/EReferral/search_e_referral_response_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/search_e_referral_response_model.dart index 21399d44..6a1b4e8d 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/search_e_referral_response_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/search_e_referral_response_model.dart @@ -4,23 +4,23 @@ class SearchEReferralResponseModel { dynamic acceptedBranchNameAr; dynamic channel; dynamic identityCardAttachment; - String identityNumber; + String? identityNumber; dynamic insuranceCardAttachment; - bool isInsuredPatient; - List medicalReportAttachment; - String otherRelationship; - String patientContactNo; - int patientId; - String patientName; - int preferredBranchCode; - String preferredBranchName; - String referralDate; - int referralNumber; - RelationshipType relationshipType; - String requesterContactNo; - String requesterName; - String status; - String statusAr; + bool? isInsuredPatient; + List? medicalReportAttachment; + String? otherRelationship; + String? patientContactNo; + int? patientId; + String? patientName; + int? preferredBranchCode; + String? preferredBranchName; + String? referralDate; + int? referralNumber; + RelationshipType? relationshipType; + String? requesterContactNo; + String? requesterName; + String? status; + String? statusAr; SearchEReferralResponseModel( {this.acceptedBrachCode, @@ -63,9 +63,7 @@ class SearchEReferralResponseModel { preferredBranchName = json['PreferredBranchName']; referralDate = json['ReferralDate']; referralNumber = json['ReferralNumber']; - relationshipType = json['RelationshipType'] != null - ? new RelationshipType.fromJson(json['RelationshipType']) - : null; + relationshipType = json['RelationshipType'] != null ? new RelationshipType.fromJson(json['RelationshipType']) : null; requesterContactNo = json['RequesterContactNo']; requesterName = json['RequesterName']; status = json['Status']; @@ -83,8 +81,7 @@ class SearchEReferralResponseModel { data['InsuranceCardAttachment'] = this.insuranceCardAttachment; data['IsInsuredPatient'] = this.isInsuredPatient; if (this.medicalReportAttachment != null) { - data['MedicalReportAttachment'] = - this.medicalReportAttachment.map((v) => v.toJson()).toList(); + data['MedicalReportAttachment'] = this.medicalReportAttachment!.map((v) => v.toJson()).toList(); } data['OtherRelationship'] = this.otherRelationship; data['PatientContactNo'] = this.patientContactNo; @@ -95,7 +92,7 @@ class SearchEReferralResponseModel { data['ReferralDate'] = this.referralDate; data['ReferralNumber'] = this.referralNumber; if (this.relationshipType != dynamic) { - data['RelationshipType'] = this.relationshipType.toJson(); + data['RelationshipType'] = this.relationshipType!.toJson(); } data['RequesterContactNo'] = this.requesterContactNo; data['RequesterName'] = this.requesterName; @@ -106,10 +103,10 @@ class SearchEReferralResponseModel { } class RelationshipType { - int iD; - String text; - String textAr; - String textEn; + int? iD; + String? text; + String? textAr; + String? textEn; RelationshipType({this.iD, this.text, this.textAr, this.textEn}); diff --git a/lib/core/model/AlHabibMedicalService/EReferral/send_activation_code_for_e_referral_request_model.dart b/lib/core/model/AlHabibMedicalService/EReferral/send_activation_code_for_e_referral_request_model.dart index 622ef143..1a8588f8 100644 --- a/lib/core/model/AlHabibMedicalService/EReferral/send_activation_code_for_e_referral_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/EReferral/send_activation_code_for_e_referral_request_model.dart @@ -1,31 +1,30 @@ class SendActivationCodeForEReferralRequestModel { - int patientMobileNumber; - String zipCode; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; + int? patientMobileNumber; + String? zipCode; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; Null sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; + bool? isDentalAllowedBackend; + int? deviceTypeID; SendActivationCodeForEReferralRequestModel( {this.patientMobileNumber, - this.zipCode, - this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID}); + this.zipCode, + this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID}); - SendActivationCodeForEReferralRequestModel.fromJson( - Map json) { + SendActivationCodeForEReferralRequestModel.fromJson(Map json) { patientMobileNumber = json['PatientMobileNumber']; zipCode = json['ZipCode']; versionID = json['VersionID']; diff --git a/lib/core/model/AlHabibMedicalService/H2O/insert_user_activity_request_model.dart b/lib/core/model/AlHabibMedicalService/H2O/insert_user_activity_request_model.dart index 2d27729b..f2dc41d1 100644 --- a/lib/core/model/AlHabibMedicalService/H2O/insert_user_activity_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/H2O/insert_user_activity_request_model.dart @@ -1,20 +1,20 @@ class InsertUserActivityRequestModel { - String identificationNo; - String mobileNumber; - int quantityIntake; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; + String? identificationNo; + String? mobileNumber; + int? quantityIntake; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; InsertUserActivityRequestModel( {this.identificationNo, diff --git a/lib/core/model/AlHabibMedicalService/H2O/user_detail_model.dart b/lib/core/model/AlHabibMedicalService/H2O/user_detail_model.dart index 2f4ec9f0..dd76ccf2 100644 --- a/lib/core/model/AlHabibMedicalService/H2O/user_detail_model.dart +++ b/lib/core/model/AlHabibMedicalService/H2O/user_detail_model.dart @@ -1,27 +1,27 @@ class UserDetailModel { - int userID; - int patientID; - int patientType; - bool patientOutSA; - String firstName; - String middleName; - String lastName; - String firstNameN; - String middleNameN; - String lastNameN; - String identificationNo; - String mobile; - String emailID; - String zipCode; - String dOB; - String gender; - int activityID; - String createdDate; - double height; - double weight; - bool isHeightInCM; - bool isWeightInKG; - bool isNotificationON; + int? userID; + int? patientID; + int? patientType; + bool? patientOutSA; + String? firstName; + String? middleName; + String? lastName; + String? firstNameN; + String? middleNameN; + String? lastNameN; + String? identificationNo; + String? mobile; + String? emailID; + String? zipCode; + String? dOB; + String? gender; + int? activityID; + String? createdDate; + double? height; + double? weight; + bool? isHeightInCM; + bool? isWeightInKG; + bool? isNotificationON; UserDetailModel( {this.userID, @@ -49,7 +49,7 @@ class UserDetailModel { this.isNotificationON}); UserDetailModel.fromJson(Map json) { - if(json==null) return; + if (json == null) return; userID = json['UserID']; patientID = json['PatientID']; patientType = json['PatientType']; diff --git a/lib/core/model/AlHabibMedicalService/H2O/user_detail_request_model.dart b/lib/core/model/AlHabibMedicalService/H2O/user_detail_request_model.dart index 9d23d383..44ef6471 100644 --- a/lib/core/model/AlHabibMedicalService/H2O/user_detail_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/H2O/user_detail_request_model.dart @@ -1,32 +1,32 @@ class UserDetailRequestModel { - String activityID; - int channel; - int deviceTypeID; - String dOB; - String email; - String firstName; - String gender; - String generalid; - double height; - String identificationNo; - String iPAdress; - bool isDentalAllowedBackend; - bool isHeightInCM; - bool isNotificationOn; - bool isWeightInKG; - int languageID; - String lastName; - String middleName; - String mobileNumber; - int patientID; - int patientOutSA; - int patientType; - int patientTypeID; - String sessionID; - String tokenID; - double versionID; - double weight; - String zipCode; + String? activityID; + int? channel; + int? deviceTypeID; + String? dOB; + String? email; + String? firstName; + String? gender; + String? generalid; + double? height; + String? identificationNo; + String? iPAdress; + bool? isDentalAllowedBackend; + bool? isHeightInCM; + bool? isNotificationOn; + bool? isWeightInKG; + int? languageID; + String? lastName; + String? middleName; + String? mobileNumber; + int? patientID; + int? patientOutSA; + int? patientType; + int? patientTypeID; + String? sessionID; + String? tokenID; + double? versionID; + double? weight; + String? zipCode; UserDetailRequestModel( {this.activityID, diff --git a/lib/core/model/AlHabibMedicalService/H2O/user_progress_for_month_data_model.dart b/lib/core/model/AlHabibMedicalService/H2O/user_progress_for_month_data_model.dart index a7f7805e..fc961dd9 100644 --- a/lib/core/model/AlHabibMedicalService/H2O/user_progress_for_month_data_model.dart +++ b/lib/core/model/AlHabibMedicalService/H2O/user_progress_for_month_data_model.dart @@ -1,7 +1,7 @@ class UserProgressForMonthDataModel { - int monthNumber; - String monthName; - int percentageConsumed; + int? monthNumber; + String? monthName; + int? percentageConsumed; UserProgressForMonthDataModel( {this.monthNumber, this.monthName, this.percentageConsumed}); diff --git a/lib/core/model/AlHabibMedicalService/H2O/user_progress_for_week_data_model.dart b/lib/core/model/AlHabibMedicalService/H2O/user_progress_for_week_data_model.dart index 2641a678..84655dc8 100644 --- a/lib/core/model/AlHabibMedicalService/H2O/user_progress_for_week_data_model.dart +++ b/lib/core/model/AlHabibMedicalService/H2O/user_progress_for_week_data_model.dart @@ -1,8 +1,8 @@ class UserProgressForWeekDataModel { - int dayNumber; + int? dayNumber; dynamic dayDate; - String dayName; - int percentageConsumed; + String? dayName; + int? percentageConsumed; UserProgressForWeekDataModel( {this.dayNumber, this.dayDate, this.dayName, this.percentageConsumed}); diff --git a/lib/core/model/AlHabibMedicalService/H2O/user_progress_request_model.dart b/lib/core/model/AlHabibMedicalService/H2O/user_progress_request_model.dart index d06e053b..b004162a 100644 --- a/lib/core/model/AlHabibMedicalService/H2O/user_progress_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/H2O/user_progress_request_model.dart @@ -1,20 +1,20 @@ class UserProgressRequestModel { - int progress; - String mobileNumber; - String identificationNo; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; + int? progress; + String? mobileNumber; + String? identificationNo; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; UserProgressRequestModel( {this.progress, diff --git a/lib/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart b/lib/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart index ff1f0eb0..49771f44 100644 --- a/lib/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart +++ b/lib/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart @@ -1,18 +1,18 @@ class ClinicCategory { - int clinicID; - int categoryID; - String categoryName; - String categoryNameN; - String icon; - String bodyImageEN; - String fullImageEN; - String bodyImageAR; - String fullmageAR; - bool isActive; - bool isCategoryGroup; + int? clinicID; + int? categoryID; + String? categoryName; + String? categoryNameN; + String? icon; + String? bodyImageEN; + String? fullImageEN; + String? bodyImageAR; + String? fullmageAR; + bool? isActive; + bool? isCategoryGroup; Null sortOrderAR; Null sortOrderEN; - String clinicName; + String? clinicName; ClinicCategory( {this.clinicID, diff --git a/lib/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart b/lib/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart index e92fa8da..9f5204dc 100644 --- a/lib/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart +++ b/lib/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart @@ -1,11 +1,11 @@ class DiseasesByClinic { - int diseasesID; - String diseasesEN; - String diseasesAR; - int diseasesCategoryID; + int? diseasesID; + String? diseasesEN; + String? diseasesAR; + int? diseasesCategoryID; Null diseasesCategoryEN; Null diseasesCategoryAR; - String diseases; + String? diseases; Null diseasesCategory; DiseasesByClinic( diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_request_modle.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_request_modle.dart index 7b24c149..bf56a750 100644 --- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_request_modle.dart +++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_request_modle.dart @@ -1,17 +1,17 @@ class HHCGetAllServicesRequestModel { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; HHCGetAllServicesRequestModel( {this.versionID, diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart index bc5c4b97..19148546 100644 --- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart +++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart @@ -1,15 +1,15 @@ class HHCGetAllServicesResponseModel { - int iD; - String serviceID; - int orderServiceID; - String text; - String textN; + int? iD; + String? serviceID; + int? orderServiceID; + String? text; + String? textN; dynamic price; dynamic priceVAT; dynamic priceTotal; - bool isEnabled; - int orderId; - int quantity; + bool? isEnabled; + int? orderId; + int? quantity; HHCGetAllServicesResponseModel( {this.iD, diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/PatientERHHCInsertServicesList.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/PatientERHHCInsertServicesList.dart index 0fe85c6a..95b7ba83 100644 --- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/PatientERHHCInsertServicesList.dart +++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/PatientERHHCInsertServicesList.dart @@ -1,11 +1,9 @@ - class PatientERHHCInsertServicesList { - int recordID; - int serviceID; - String serviceName; + int? recordID; + int? serviceID; + String? serviceName; - PatientERHHCInsertServicesList( - {this.recordID, this.serviceID, this.serviceName}); + PatientERHHCInsertServicesList({this.recordID, this.serviceID, this.serviceName}); PatientERHHCInsertServicesList.fromJson(Map json) { recordID = json['RecordID']; diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_request_model.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_request_model.dart index ed55b3a9..00b907e0 100644 --- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_request_model.dart @@ -1,32 +1,32 @@ class GetHHCAllPresOrdersRequestModel { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; GetHHCAllPresOrdersRequestModel( {this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.patientID, - this.tokenID, - this.patientTypeID, - this.patientType}); + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.patientID, + this.tokenID, + this.patientTypeID, + this.patientType}); GetHHCAllPresOrdersRequestModel.fromJson(Map json) { versionID = json['VersionID']; diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_response_model.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_response_model.dart index 5dedac1c..1333c218 100644 --- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_response_model.dart +++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_response_model.dart @@ -1,34 +1,34 @@ class GetHHCAllPresOrdersResponseModel { - int iD; - String patientID; - bool patientOutSA; - bool isOutPatient; - int projectID; - int nearestProjectID; - double longitude; - double latitude; - String appointmentNo; - String dischargeID; - int lineItemNo; - int status; - String description; - String descriptionN; - String createdOn; - int serviceID; - int createdBy; - String editedOn; - int editedBy; - int channel; + int? iD; + String? patientID; + bool? patientOutSA; + bool? isOutPatient; + int? projectID; + int? nearestProjectID; + double? longitude; + double? latitude; + String? appointmentNo; + String? dischargeID; + int? lineItemNo; + int? status; + String? description; + String? descriptionN; + String? createdOn; + int? serviceID; + int? createdBy; + String? editedOn; + int? editedBy; + int? channel; dynamic clientRequestID; - bool returnedToQueue; + bool? returnedToQueue; dynamic pickupDateTime; dynamic pickupLocationName; dynamic dropoffLocationName; - int realRRTHaveTransactions; - String nearestProjectDescription; - String nearestProjectDescriptionN; - String projectDescription; - String projectDescriptionN; + int? realRRTHaveTransactions; + String? nearestProjectDescription; + String? nearestProjectDescriptionN; + String? projectDescription; + String? projectDescriptionN; GetHHCAllPresOrdersResponseModel( {this.iD, diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_request_model.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_request_model.dart index 04b69b98..62af618e 100644 --- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_request_model.dart @@ -1,18 +1,18 @@ class GetOrderDetailByOrderIDRequestModel { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; - int presOrderID; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; + int? presOrderID; GetOrderDetailByOrderIDRequestModel( {this.versionID, diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_response_model.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_response_model.dart index 6fc31ce8..d26af589 100644 --- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_response_model.dart +++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_response_model.dart @@ -1,14 +1,14 @@ class GetOrderDetailByOrderIDResponseModel { - int iD; - int presOrderID; - int hHCServiceID; - int createdBy; - String createdOn; - int editedBy; - String editedOn; - bool isActive; - String description; - String descriptionN; + int? iD; + int? presOrderID; + int? hHCServiceID; + int? createdBy; + String? createdOn; + int? editedBy; + String? editedOn; + bool? isActive; + String? description; + String? descriptionN; GetOrderDetailByOrderIDResponseModel( {this.iD, diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/patient_er_insert_pres_order_request_model.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/patient_er_insert_pres_order_request_model.dart index bc57a88f..e8da3ed6 100644 --- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/patient_er_insert_pres_order_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/patient_er_insert_pres_order_request_model.dart @@ -1,45 +1,44 @@ import 'PatientERHHCInsertServicesList.dart'; class PatientERInsertPresOrderRequestModel { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; - double latitude; - double longitude; - int createdBy; - int orderServiceID; - List patientERHHCInsertServicesList = List(); + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; + double? latitude; + double? longitude; + int? createdBy; + int? orderServiceID; + List? patientERHHCInsertServicesList = []; PatientERInsertPresOrderRequestModel( {this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.patientID, - this.tokenID, - this.patientTypeID, - this.patientType, - this.latitude, - this.longitude, - this.createdBy, - this.orderServiceID, - this.patientERHHCInsertServicesList - }); + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.patientID, + this.tokenID, + this.patientTypeID, + this.patientType, + this.latitude, + this.longitude, + this.createdBy, + this.orderServiceID, + this.patientERHHCInsertServicesList}); PatientERInsertPresOrderRequestModel.fromJson(Map json) { versionID = json['VersionID']; @@ -60,11 +59,9 @@ class PatientERInsertPresOrderRequestModel { createdBy = json['CreatedBy']; orderServiceID = json['OrderServiceID']; if (json['PatientER_HHC_InsertServicesList'] != null) { - patientERHHCInsertServicesList = - new List(); + patientERHHCInsertServicesList = []; json['PatientER_HHC_InsertServicesList'].forEach((v) { - patientERHHCInsertServicesList - .add(new PatientERHHCInsertServicesList.fromJson(v)); + patientERHHCInsertServicesList!.add(new PatientERHHCInsertServicesList.fromJson(v)); }); } } @@ -90,8 +87,7 @@ class PatientERInsertPresOrderRequestModel { // data['CreatedBy'] = this.createdBy; data['OrderServiceID'] = this.orderServiceID; if (this.patientERHHCInsertServicesList != null) { - data['procedures'] = - this.patientERHHCInsertServicesList.map((v) => v.toJson()).toList(); + data['procedures'] = this.patientERHHCInsertServicesList!.map((v) => v.toJson()).toList(); } return data; } diff --git a/lib/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart b/lib/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart index 68be644d..b32d51a5 100644 --- a/lib/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart +++ b/lib/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart @@ -1,21 +1,21 @@ class UpdatePresOrderRequestModel { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; - int presOrderID; - int presOrderStatus; - int editedBy; - String rejectionReason; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; + int? presOrderID; + int? presOrderStatus; + int? editedBy; + String? rejectionReason; UpdatePresOrderRequestModel( {this.versionID, diff --git a/lib/core/model/Allergy/Allergy.dart b/lib/core/model/Allergy/Allergy.dart index be71c7fe..de9fe5d6 100644 --- a/lib/core/model/Allergy/Allergy.dart +++ b/lib/core/model/Allergy/Allergy.dart @@ -1,8 +1,8 @@ class Allergy { - int patientID; - int allergyDiseaseType; - int allergyDiseaseID; - String description; + int? patientID; + int? allergyDiseaseType; + int? allergyDiseaseID; + String? description; dynamic descriptionN; dynamic remarks; dynamic avgDoctorRatingList; diff --git a/lib/core/model/active_medications/ActivePrescriptionReport.dart b/lib/core/model/active_medications/ActivePrescriptionReport.dart index 06aeea26..50e3d45a 100644 --- a/lib/core/model/active_medications/ActivePrescriptionReport.dart +++ b/lib/core/model/active_medications/ActivePrescriptionReport.dart @@ -2,73 +2,75 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class ActivePrescriptionReport { dynamic address; - int appointmentNo; + int? appointmentNo; dynamic clinic; dynamic companyName; - int days; + int? days; dynamic doctorName; - int doseDailyQuantity; - String frequency; - int frequencyNumber; + int? doseDailyQuantity; + String? frequency; + int? frequencyNumber; + // List image; // String imageExtension; // dynamic imageSRCUrl; - String imageString; + String? imageString; + // dynamic imageThumbUrl; dynamic isCovered; - String itemDescription; - int itemID; - DateTime orderDate; - int patientID; + String? itemDescription; + int? itemID; + DateTime? orderDate; + int? patientID; dynamic patientName; dynamic phoneOffice1; dynamic prescriptionQR; - int prescriptionTimes; + int? prescriptionTimes; dynamic productImage; - String productImageBase64; - String productImageString; - int projectID; + String? productImageBase64; + String? productImageString; + int? projectID; dynamic projectName; dynamic remarks; - String route; - String sKU; - int scaleOffset; - DateTime startDate; + String? route; + String? sKU; + int? scaleOffset; + DateTime? startDate; ActivePrescriptionReport( {this.address, - this.appointmentNo, - this.clinic, - this.companyName, - this.days, - this.doctorName, - this.doseDailyQuantity, - this.frequency, - this.frequencyNumber, - // this.image, - // this.imageExtension, - // this.imageSRCUrl, - this.imageString, - // this.imageThumbUrl, - this.isCovered, - this.itemDescription, - this.itemID, - this.orderDate, - this.patientID, - this.patientName, - this.phoneOffice1, - this.prescriptionQR, - this.prescriptionTimes, - this.productImage, - this.productImageBase64, - this.productImageString, - this.projectID, - this.projectName, - this.remarks, - this.route, - this.sKU, - this.scaleOffset, - this.startDate}); + this.appointmentNo, + this.clinic, + this.companyName, + this.days, + this.doctorName, + this.doseDailyQuantity, + this.frequency, + this.frequencyNumber, + // this.image, + // this.imageExtension, + // this.imageSRCUrl, + this.imageString, + // this.imageThumbUrl, + this.isCovered, + this.itemDescription, + this.itemID, + this.orderDate, + this.patientID, + this.patientName, + this.phoneOffice1, + this.prescriptionQR, + this.prescriptionTimes, + this.productImage, + this.productImageBase64, + this.productImageString, + this.projectID, + this.projectName, + this.remarks, + this.route, + this.sKU, + this.scaleOffset, + this.startDate}); ActivePrescriptionReport.fromJson(Map json) { address = json['Address']; diff --git a/lib/core/model/ask_doctor/AskDoctorReqTypes.dart b/lib/core/model/ask_doctor/AskDoctorReqTypes.dart index b306f97b..e7e9b4ee 100644 --- a/lib/core/model/ask_doctor/AskDoctorReqTypes.dart +++ b/lib/core/model/ask_doctor/AskDoctorReqTypes.dart @@ -1,9 +1,9 @@ class AskDoctorReqTypes { dynamic setupID; - int parameterGroup; - int parameterType; - int parameterCode; - String description; + int? parameterGroup; + int? parameterType; + int? parameterCode; + String? description; dynamic descriptionN; dynamic alias; dynamic aliasN; @@ -12,10 +12,10 @@ class AskDoctorReqTypes { dynamic isColorCodingRequired; dynamic backColor; dynamic foreColor; - bool isBuiltIn; - bool isActive; - int createdBy; - String createdOn; + bool? isBuiltIn; + bool? isActive; + int? createdBy; + String? createdOn; dynamic editedBy; dynamic editedOn; dynamic rowVer; diff --git a/lib/core/model/ask_doctor/DoctorResponse.dart b/lib/core/model/ask_doctor/DoctorResponse.dart index 0dcd41b0..6b26a63f 100644 --- a/lib/core/model/ask_doctor/DoctorResponse.dart +++ b/lib/core/model/ask_doctor/DoctorResponse.dart @@ -1,19 +1,19 @@ class DoctorResponse { - int projectID; - int transactionNo; - int patientID; - int doctorID; - int requestType; - String requestTypeDescription; + int? projectID; + int? transactionNo; + int? patientID; + int? doctorID; + int? requestType; + String? requestTypeDescription; dynamic requestTypeDescriptionN; - int status; - String remarks; - String createdOn; + int? status; + String? remarks; + String? createdOn; dynamic readStatus; - String doctorName; - bool isDoctorRespond; - bool isPatientRead; - List transactions; + String? doctorName; + bool? isDoctorRespond; + bool? isPatientRead; + List? transactions; DoctorResponse( {this.projectID, @@ -69,7 +69,7 @@ class DoctorResponse { data['IsDoctorRespond'] = this.isDoctorRespond; data['IsPatientRead'] = this.isPatientRead; if (this.transactions != null) { - data['Transactions'] = this.transactions.map((v) => v.toJson()).toList(); + data['Transactions'] = this.transactions!.map((v) => v.toJson()).toList(); } return data; } diff --git a/lib/core/model/blooddonation/blood_groub_details.dart b/lib/core/model/blooddonation/blood_groub_details.dart index 34dcafe0..77c2d944 100644 --- a/lib/core/model/blooddonation/blood_groub_details.dart +++ b/lib/core/model/blooddonation/blood_groub_details.dart @@ -1,21 +1,21 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class List_BloodGroupDetailsModel { - int iD; - int patientID; - int patientType; - bool patientOutSA; - int zipCode; - String cellNumber; - String cityCode; - String city; - int gender; - String bloodGroup; - String nationalID; - bool isActive; - int createdBy; - DateTime createdOn; - int editedBy; - DateTime editedOn; + int? iD; + int? patientID; + int? patientType; + bool? patientOutSA; + int? zipCode; + String? cellNumber; + String? cityCode; + String? city; + int? gender; + String? bloodGroup; + String? nationalID; + bool? isActive; + int? createdBy; + DateTime? createdOn; + int? editedBy; + DateTime? editedOn; List_BloodGroupDetailsModel( {this.iD, diff --git a/lib/core/model/blooddonation/get_all_cities.dart b/lib/core/model/blooddonation/get_all_cities.dart index 3d685bb6..cf7e6318 100644 --- a/lib/core/model/blooddonation/get_all_cities.dart +++ b/lib/core/model/blooddonation/get_all_cities.dart @@ -1,7 +1,7 @@ class CitiesModel { - int iD; - String description; - String descriptionN; + int? iD; + String? description; + String? descriptionN; CitiesModel({this.iD, this.description, this.descriptionN}); diff --git a/lib/core/model/childvaccines/List_BabyInformationModel.dart b/lib/core/model/childvaccines/List_BabyInformationModel.dart index 0711b8a2..cce3e248 100644 --- a/lib/core/model/childvaccines/List_BabyInformationModel.dart +++ b/lib/core/model/childvaccines/List_BabyInformationModel.dart @@ -1,13 +1,13 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class List_BabyInformationModel { - int alertBy; - int babyID; - String babyName; - DateTime dOB; - int gender; - String genderDescription; - int patientID; - int userID; + int? alertBy; + int? babyID; + String? babyName; + DateTime? dOB; + int? gender; + String? genderDescription; + int? patientID; + int? userID; List_BabyInformationModel( {this.alertBy, diff --git a/lib/core/model/childvaccines/add_newchild_model.dart b/lib/core/model/childvaccines/add_newchild_model.dart index 9bbfe6ad..1f6afa32 100644 --- a/lib/core/model/childvaccines/add_newchild_model.dart +++ b/lib/core/model/childvaccines/add_newchild_model.dart @@ -1,50 +1,50 @@ class CreateNewBaby { - String babyName; - String gender; - String strDOB; - int editedBy; - int createdBy; - bool tempValue; - int userID; - bool isLogin; - int alertBy; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; + String? babyName; + String? gender; + String? strDOB; + int? editedBy; + int? createdBy; + bool? tempValue; + int? userID; + bool? isLogin; + int? alertBy; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; CreateNewBaby( {this.babyName, - this.gender, - this.strDOB, - this.editedBy, - this.createdBy, - this.tempValue, - this.userID, - this.isLogin, - this.alertBy, - this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.patientID, - this.tokenID, - this.patientTypeID, - this.patientType}); + this.gender, + this.strDOB, + this.editedBy, + this.createdBy, + this.tempValue, + this.userID, + this.isLogin, + this.alertBy, + this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.patientID, + this.tokenID, + this.patientTypeID, + this.patientType}); CreateNewBaby.fromJson(Map json) { babyName = json['BabyName']; @@ -97,4 +97,4 @@ class CreateNewBaby { data['PatientType'] = this.patientType; return data; } -} \ No newline at end of file +} diff --git a/lib/core/model/childvaccines/create_new_user_model.dart b/lib/core/model/childvaccines/create_new_user_model.dart index 980567e2..eb148648 100644 --- a/lib/core/model/childvaccines/create_new_user_model.dart +++ b/lib/core/model/childvaccines/create_new_user_model.dart @@ -1,32 +1,32 @@ class CreateNewUser_New { Null date; - int languageID; - int serviceName; + int? languageID; + int? serviceName; Null time; Null androidLink; Null authenticationTokenID; Null data; - bool dataw; - int dietType; + bool? dataw; + int? dietType; Null errorCode; Null errorEndUserMessage; Null errorEndUserMessageN; Null errorMessage; - int errorType; - int foodCategory; + int? errorType; + int? foodCategory; Null iOSLink; - bool isAuthenticated; - int mealOrderStatus; - int mealType; - int messageStatus; - int numberOfResultRecords; + bool? isAuthenticated; + int? mealOrderStatus; + int? mealType; + int? messageStatus; + int? numberOfResultRecords; Null patientBlodType; Null successMsg; Null successMsgN; Null htmlResult; - bool isHMGPatient; - bool isRegister; - bool isSendSMS; + bool? isHMGPatient; + bool? isRegister; + bool? isSendSMS; Null listBabyInformationModel; Null listBabyNeedReminderModel; Null listCreateVaccinationTableModel; @@ -35,48 +35,48 @@ class CreateNewUser_New { Null listUserInformationModelNew; Null listVaccinationTableModel; Null tokinID; - int userID; + int? userID; Null verificationCode; CreateNewUser_New( {this.date, - this.languageID, - this.serviceName, - this.time, - this.androidLink, - this.authenticationTokenID, - this.data, - this.dataw, - this.dietType, - this.errorCode, - this.errorEndUserMessage, - this.errorEndUserMessageN, - this.errorMessage, - this.errorType, - this.foodCategory, - this.iOSLink, - this.isAuthenticated, - this.mealOrderStatus, - this.mealType, - this.messageStatus, - this.numberOfResultRecords, - this.patientBlodType, - this.successMsg, - this.successMsgN, - this.htmlResult, - this.isHMGPatient, - this.isRegister, - this.isSendSMS, - this.listBabyInformationModel, - this.listBabyNeedReminderModel, - this.listCreateVaccinationTableModel, - this.listHisPatientModel, - this.listUserInformationModel, - this.listUserInformationModelNew, - this.listVaccinationTableModel, - this.tokinID, - this.userID, - this.verificationCode}); + this.languageID, + this.serviceName, + this.time, + this.androidLink, + this.authenticationTokenID, + this.data, + this.dataw, + this.dietType, + this.errorCode, + this.errorEndUserMessage, + this.errorEndUserMessageN, + this.errorMessage, + this.errorType, + this.foodCategory, + this.iOSLink, + this.isAuthenticated, + this.mealOrderStatus, + this.mealType, + this.messageStatus, + this.numberOfResultRecords, + this.patientBlodType, + this.successMsg, + this.successMsgN, + this.htmlResult, + this.isHMGPatient, + this.isRegister, + this.isSendSMS, + this.listBabyInformationModel, + this.listBabyNeedReminderModel, + this.listCreateVaccinationTableModel, + this.listHisPatientModel, + this.listUserInformationModel, + this.listUserInformationModelNew, + this.listVaccinationTableModel, + this.tokinID, + this.userID, + this.verificationCode}); CreateNewUser_New.fromJson(Map json) { date = json['Date']; @@ -151,8 +151,7 @@ class CreateNewUser_New { data['IsSendSMS'] = this.isSendSMS; data['List_BabyInformationModel'] = this.listBabyInformationModel; data['List_BabyNeedReminderModel'] = this.listBabyNeedReminderModel; - data['List_CreateVaccinationTableModel'] = - this.listCreateVaccinationTableModel; + data['List_CreateVaccinationTableModel'] = this.listCreateVaccinationTableModel; data['List_His_PatientModel'] = this.listHisPatientModel; data['List_UserInformationModel'] = this.listUserInformationModel; data['List_UserInformationModel_New'] = this.listUserInformationModelNew; @@ -162,4 +161,4 @@ class CreateNewUser_New { data['VerificationCode'] = this.verificationCode; return data; } -} \ No newline at end of file +} diff --git a/lib/core/model/childvaccines/create_vaccination_table.dart b/lib/core/model/childvaccines/create_vaccination_table.dart index d39f2a64..32b2ffff 100644 --- a/lib/core/model/childvaccines/create_vaccination_table.dart +++ b/lib/core/model/childvaccines/create_vaccination_table.dart @@ -1,8 +1,8 @@ class CreateVaccinationTable { - String givenAt; - String status; - String vaccinesDescription; - String visit; + String? givenAt; + String? status; + String? vaccinesDescription; + String? visit; CreateVaccinationTable( {this.givenAt, this.status, this.vaccinesDescription, this.visit}); diff --git a/lib/core/model/childvaccines/delete_baby_model.dart b/lib/core/model/childvaccines/delete_baby_model.dart index 9274b1e8..7015fd8d 100644 --- a/lib/core/model/childvaccines/delete_baby_model.dart +++ b/lib/core/model/childvaccines/delete_baby_model.dart @@ -1,20 +1,20 @@ class DeleteBaby { - bool isLogin; - int babyID; - int editedBy; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; + bool? isLogin; + int? babyID; + int? editedBy; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; DeleteBaby( {this.isLogin, @@ -34,7 +34,7 @@ class DeleteBaby { this.patientTypeID, this.patientType}); - DeleteBaby.fromJson(Map json) { + DeleteBaby.fromJson(Map json) { isLogin = json['IsLogin']; babyID = json['BabyID']; editedBy = json['EditedBy']; @@ -53,8 +53,8 @@ class DeleteBaby { patientType = json['PatientType']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['IsLogin'] = this.isLogin; data['BabyID'] = this.babyID; data['EditedBy'] = this.editedBy; diff --git a/lib/core/model/childvaccines/get_vacainations_itemsmodel.dart b/lib/core/model/childvaccines/get_vacainations_itemsmodel.dart index 14891852..5ac35904 100644 --- a/lib/core/model/childvaccines/get_vacainations_itemsmodel.dart +++ b/lib/core/model/childvaccines/get_vacainations_itemsmodel.dart @@ -1,6 +1,6 @@ class GET_VACCINATIONS_ITEMSMODEL { - String dESCRIPTION; - String iTEMCODE; + String? dESCRIPTION; + String? iTEMCODE; GET_VACCINATIONS_ITEMSMODEL({this.dESCRIPTION, this.iTEMCODE}); diff --git a/lib/core/model/childvaccines/user_information_model.dart b/lib/core/model/childvaccines/user_information_model.dart index 9e1687d3..9e3ba427 100644 --- a/lib/core/model/childvaccines/user_information_model.dart +++ b/lib/core/model/childvaccines/user_information_model.dart @@ -1,24 +1,15 @@ class List_UserInformationModel { - int userID; - String mobileNumber; - String nationalID; - String emailAddress; - int patientID; - int patientType; - bool patientOutSA; - int createdBy; - int editedBy; + int? userID; + String? mobileNumber; + String? nationalID; + String? emailAddress; + int? patientID; + int? patientType; + bool? patientOutSA; + int? createdBy; + int? editedBy; - List_UserInformationModel( - {this.userID, - this.mobileNumber, - this.nationalID, - this.emailAddress, - this.patientID, - this.patientType, - this.patientOutSA, - this.createdBy, - this.editedBy}); + List_UserInformationModel({this.userID, this.mobileNumber, this.nationalID, this.emailAddress, this.patientID, this.patientType, this.patientOutSA, this.createdBy, this.editedBy}); List_UserInformationModel.fromJson(Map json) { userID = json['UserID']; @@ -45,4 +36,4 @@ class List_UserInformationModel { data['EditedBy'] = this.editedBy; return data; } -} \ No newline at end of file +} diff --git a/lib/core/model/contactus/get_hmg_locations.dart b/lib/core/model/contactus/get_hmg_locations.dart index 89d26951..fb2bdfe5 100644 --- a/lib/core/model/contactus/get_hmg_locations.dart +++ b/lib/core/model/contactus/get_hmg_locations.dart @@ -1,20 +1,20 @@ class GetHMGLocationsModel { dynamic cityID; - String cityName; + String? cityName; dynamic cityNameN; dynamic distanceInKilometers; - bool isActive; - String latitude; - int locationID; - String locationName; + bool? isActive; + String? latitude; + int? locationID; + String? locationName; dynamic locationNameN; dynamic locationType; - String longitude; - int pharmacyLocationID; - String phoneNumber; - int projectID; - String projectImageURL; - int setupID; + String? longitude; + int? pharmacyLocationID; + String? phoneNumber; + int? projectID; + String? projectImageURL; + int? setupID; dynamic sortOrder; GetHMGLocationsModel( diff --git a/lib/core/model/contactus/get_patientI_cprojects.dart b/lib/core/model/contactus/get_patientI_cprojects.dart index 556affd2..72a1968c 100644 --- a/lib/core/model/contactus/get_patientI_cprojects.dart +++ b/lib/core/model/contactus/get_patientI_cprojects.dart @@ -1,30 +1,20 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class GetPatientICProjectsModel { - int id; - String projectName; - String projectNameN; - String value; + int? id; + String? projectName; + String? projectNameN; + String? value; dynamic languageId; - DateTime createdOn; - String createdBy; + DateTime? createdOn; + String? createdBy; dynamic editedOn; dynamic editedBy; - bool isActive; + bool? isActive; dynamic distanceInKilometers; GetPatientICProjectsModel( - {this.id, - this.projectName, - this.projectNameN, - this.value, - this.languageId, - this.createdOn, - this.createdBy, - this.editedOn, - this.editedBy, - this.distanceInKilometers, - this.isActive}); + {this.id, this.projectName, this.projectNameN, this.value, this.languageId, this.createdOn, this.createdBy, this.editedOn, this.editedBy, this.distanceInKilometers, this.isActive}); GetPatientICProjectsModel.fromJson(Map json) { id = json['id']; @@ -55,4 +45,4 @@ class GetPatientICProjectsModel { data['DistanceInKilometers'] = this.distanceInKilometers; return data; } -} \ No newline at end of file +} diff --git a/lib/core/model/doctor/doctor_profile.dart b/lib/core/model/doctor/doctor_profile.dart index 9e222e5a..b86db2b7 100644 --- a/lib/core/model/doctor/doctor_profile.dart +++ b/lib/core/model/doctor/doctor_profile.dart @@ -1,88 +1,88 @@ class DoctorProfile { - int doctorID; - String doctorName; + int? doctorID; + String? doctorName; Null doctorNameN; - int clinicID; - String clinicDescription; + int? clinicID; + String? clinicDescription; Null clinicDescriptionN; Null licenseExpiry; - int employmentType; + int? employmentType; Null setupID; - int projectID; - String projectName; - String nationalityID; - String nationalityName; + int? projectID; + String? projectName; + String? nationalityID; + String? nationalityName; Null nationalityNameN; - int gender; - String genderDescription; + int? gender; + String? genderDescription; Null genderDescriptionN; Null doctorTitle; Null projectNameN; - bool isAllowWaitList; - String titleDescription; + bool? isAllowWaitList; + String? titleDescription; Null titleDescriptionN; Null isRegistered; Null isDoctorDummy; - bool isActive; + bool? isActive; Null isDoctorAppointmentDisplayed; - bool doctorClinicActive; + bool? doctorClinicActive; Null isbookingAllowed; - String doctorCases; + String? doctorCases; Null doctorPicture; - String doctorProfileInfo; - List specialty; - int actualDoctorRate; - String doctorImageURL; - int doctorRate; - String doctorTitleForProfile; - bool isAppointmentAllowed; - String nationalityFlagURL; - int noOfPatientsRate; - String qR; - int serviceID; + String? doctorProfileInfo; + List? specialty; + int? actualDoctorRate; + String? doctorImageURL; + int? doctorRate; + String? doctorTitleForProfile; + bool? isAppointmentAllowed; + String? nationalityFlagURL; + int? noOfPatientsRate; + String? qR; + int? serviceID; DoctorProfile( {this.doctorID, - this.doctorName, - this.doctorNameN, - this.clinicID, - this.clinicDescription, - this.clinicDescriptionN, - this.licenseExpiry, - this.employmentType, - this.setupID, - this.projectID, - this.projectName, - this.nationalityID, - this.nationalityName, - this.nationalityNameN, - this.gender, - this.genderDescription, - this.genderDescriptionN, - this.doctorTitle, - this.projectNameN, - this.isAllowWaitList, - this.titleDescription, - this.titleDescriptionN, - this.isRegistered, - this.isDoctorDummy, - this.isActive, - this.isDoctorAppointmentDisplayed, - this.doctorClinicActive, - this.isbookingAllowed, - this.doctorCases, - this.doctorPicture, - this.doctorProfileInfo, - this.specialty, - this.actualDoctorRate, - this.doctorImageURL, - this.doctorRate, - this.doctorTitleForProfile, - this.isAppointmentAllowed, - this.nationalityFlagURL, - this.noOfPatientsRate, - this.qR, - this.serviceID}); + this.doctorName, + this.doctorNameN, + this.clinicID, + this.clinicDescription, + this.clinicDescriptionN, + this.licenseExpiry, + this.employmentType, + this.setupID, + this.projectID, + this.projectName, + this.nationalityID, + this.nationalityName, + this.nationalityNameN, + this.gender, + this.genderDescription, + this.genderDescriptionN, + this.doctorTitle, + this.projectNameN, + this.isAllowWaitList, + this.titleDescription, + this.titleDescriptionN, + this.isRegistered, + this.isDoctorDummy, + this.isActive, + this.isDoctorAppointmentDisplayed, + this.doctorClinicActive, + this.isbookingAllowed, + this.doctorCases, + this.doctorPicture, + this.doctorProfileInfo, + this.specialty, + this.actualDoctorRate, + this.doctorImageURL, + this.doctorRate, + this.doctorTitleForProfile, + this.isAppointmentAllowed, + this.nationalityFlagURL, + this.noOfPatientsRate, + this.qR, + this.serviceID}); DoctorProfile.fromJson(Map json) { doctorID = json['DoctorID']; diff --git a/lib/core/model/doctor/doctor_rating.dart b/lib/core/model/doctor/doctor_rating.dart index f02e052b..3c879fd7 100644 --- a/lib/core/model/doctor/doctor_rating.dart +++ b/lib/core/model/doctor/doctor_rating.dart @@ -1,9 +1,9 @@ class DoctorRating { Null projectID; Null clinicID; - int doctorID; - int patientNumber; - int doctorRate; + int? doctorID; + int? patientNumber; + int? doctorRate; DoctorRating( {this.projectID, diff --git a/lib/core/model/doctor/patient_doctor_appointment.dart b/lib/core/model/doctor/patient_doctor_appointment.dart index 265561cd..36013c7e 100644 --- a/lib/core/model/doctor/patient_doctor_appointment.dart +++ b/lib/core/model/doctor/patient_doctor_appointment.dart @@ -1,158 +1,158 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class PatientDoctorAppointment { - String setupID; - int projectID; - int appointmentNo; - DateTime appointmentDate; - String appointmentDateN; - bool appointmentType; - DateTime bookDate; - bool patientType; - int patientID; - int clinicID; - int doctorID; - DateTime endDate; - String startTime; - String endTime; - bool status; - bool visitType; - String visitFor; - String patientStatusType; - String actualVisitStartTime; - String actualVisitEndTime; - bool isReminderActivated; - String reminderDisplayInterval; - String reminderDisplayIntervalUnit; - String mainAppointmentNo; - String notes; - int companyID; - String dHCCPatApptRef; - String bookedBy; - DateTime bookedOn; - String confirmedBy; - DateTime confirmedOn; - String arrivalChangedBy; - DateTime arrivedOn; - String rescheduledBy; - String rescheduledOn; - String mRStatus; - String mRSentBy; - String mRSentOn; - String mRReceiptBy; - String mRReceiptOn; - String isDocumentScanned; - String documentScanDateTime; - String documentScannedUser; - String editedBy; - String editedOn; - String isRecordedByNurse; - String isCheckedByDoctor; - String isVisitClosed; - String isRecurring; - String isPersonallyConfirmed; - String confirmationBy; - String relationId; - int appointmentDays; - int isActive; - int actualDoctorRate; - String clinicName; - String doctorCases; - String doctorImageURL; - String doctorInfo; - String doctorName; - int doctorRate; - String doctorTitle; - int gender; - String genderDescription; - bool isActiveDoctorProfile; - bool isAppointmentAllowed; - bool isDoctorAllowVedioCall; - String nationalityFlagURL; - String nationalityID; - String nationalityName; - int noOfPatientsRate; - String projectName; - String qR; - List speciality; + String? setupID; + int? projectID; + int? appointmentNo; + DateTime? appointmentDate; + String? appointmentDateN; + bool? appointmentType; + DateTime? bookDate; + bool? patientType; + int? patientID; + int? clinicID; + int? doctorID; + DateTime? endDate; + String? startTime; + String? endTime; + bool? status; + bool? visitType; + String? visitFor; + String? patientStatusType; + String? actualVisitStartTime; + String? actualVisitEndTime; + bool? isReminderActivated; + String? reminderDisplayInterval; + String? reminderDisplayIntervalUnit; + String? mainAppointmentNo; + String? notes; + int? companyID; + String? dHCCPatApptRef; + String? bookedBy; + DateTime? bookedOn; + String? confirmedBy; + DateTime? confirmedOn; + String? arrivalChangedBy; + DateTime? arrivedOn; + String? rescheduledBy; + String? rescheduledOn; + String? mRStatus; + String? mRSentBy; + String? mRSentOn; + String? mRReceiptBy; + String? mRReceiptOn; + String? isDocumentScanned; + String? documentScanDateTime; + String? documentScannedUser; + String? editedBy; + String? editedOn; + String? isRecordedByNurse; + String? isCheckedByDoctor; + String? isVisitClosed; + String? isRecurring; + String? isPersonallyConfirmed; + String? confirmationBy; + String? relationId; + int? appointmentDays; + int? isActive; + int? actualDoctorRate; + String? clinicName; + String? doctorCases; + String? doctorImageURL; + String? doctorInfo; + String? doctorName; + int? doctorRate; + String? doctorTitle; + int? gender; + String? genderDescription; + bool? isActiveDoctorProfile; + bool? isAppointmentAllowed; + bool? isDoctorAllowVedioCall; + String? nationalityFlagURL; + String? nationalityID; + String? nationalityName; + int? noOfPatientsRate; + String? projectName; + String? qR; + List? speciality; PatientDoctorAppointment( {this.setupID, - this.projectID, - this.appointmentNo, - this.appointmentDate, - this.appointmentDateN, - this.appointmentType, - this.bookDate, - this.patientType, - this.patientID, - this.clinicID, - this.doctorID, - this.endDate, - this.startTime, - this.endTime, - this.status, - this.visitType, - this.visitFor, - this.patientStatusType, - this.actualVisitStartTime, - this.actualVisitEndTime, - this.isReminderActivated, - this.reminderDisplayInterval, - this.reminderDisplayIntervalUnit, - this.mainAppointmentNo, - this.notes, - this.companyID, - this.dHCCPatApptRef, - this.bookedBy, - this.bookedOn, - this.confirmedBy, - this.confirmedOn, - this.arrivalChangedBy, - this.arrivedOn, - this.rescheduledBy, - this.rescheduledOn, - this.mRStatus, - this.mRSentBy, - this.mRSentOn, - this.mRReceiptBy, - this.mRReceiptOn, - this.isDocumentScanned, - this.documentScanDateTime, - this.documentScannedUser, - this.editedBy, - this.editedOn, - this.isRecordedByNurse, - this.isCheckedByDoctor, - this.isVisitClosed, - this.isRecurring, - this.isPersonallyConfirmed, - this.confirmationBy, - this.relationId, - this.appointmentDays, - this.isActive, - this.actualDoctorRate, - this.clinicName, - this.doctorCases, - this.doctorImageURL, - this.doctorInfo, - this.doctorName, - this.doctorRate, - this.doctorTitle, - this.gender, - this.genderDescription, - this.isActiveDoctorProfile, - this.isAppointmentAllowed, - this.isDoctorAllowVedioCall, - this.nationalityFlagURL, - this.nationalityID, - this.nationalityName, - this.noOfPatientsRate, - this.projectName, - this.qR, - this.speciality}); + this.projectID, + this.appointmentNo, + this.appointmentDate, + this.appointmentDateN, + this.appointmentType, + this.bookDate, + this.patientType, + this.patientID, + this.clinicID, + this.doctorID, + this.endDate, + this.startTime, + this.endTime, + this.status, + this.visitType, + this.visitFor, + this.patientStatusType, + this.actualVisitStartTime, + this.actualVisitEndTime, + this.isReminderActivated, + this.reminderDisplayInterval, + this.reminderDisplayIntervalUnit, + this.mainAppointmentNo, + this.notes, + this.companyID, + this.dHCCPatApptRef, + this.bookedBy, + this.bookedOn, + this.confirmedBy, + this.confirmedOn, + this.arrivalChangedBy, + this.arrivedOn, + this.rescheduledBy, + this.rescheduledOn, + this.mRStatus, + this.mRSentBy, + this.mRSentOn, + this.mRReceiptBy, + this.mRReceiptOn, + this.isDocumentScanned, + this.documentScanDateTime, + this.documentScannedUser, + this.editedBy, + this.editedOn, + this.isRecordedByNurse, + this.isCheckedByDoctor, + this.isVisitClosed, + this.isRecurring, + this.isPersonallyConfirmed, + this.confirmationBy, + this.relationId, + this.appointmentDays, + this.isActive, + this.actualDoctorRate, + this.clinicName, + this.doctorCases, + this.doctorImageURL, + this.doctorInfo, + this.doctorName, + this.doctorRate, + this.doctorTitle, + this.gender, + this.genderDescription, + this.isActiveDoctorProfile, + this.isAppointmentAllowed, + this.isDoctorAllowVedioCall, + this.nationalityFlagURL, + this.nationalityID, + this.nationalityName, + this.noOfPatientsRate, + this.projectName, + this.qR, + this.speciality}); - PatientDoctorAppointment.fromJson(Map json) { + PatientDoctorAppointment.fromJson(Map json) { try { setupID = json['SetupID']; projectID = json['ProjectID']; @@ -182,11 +182,11 @@ class PatientDoctorAppointment { companyID = json['CompanyID']; dHCCPatApptRef = json['DHCCPatApptRef']; bookedBy = json['BookedBy']; - // bookedOn = DateUtil.convertStringToDate(json['BookedOn']); + // bookedOn = DateUtil.convertStringToDate(json['BookedOn']); confirmedBy = json['ConfirmedBy']; - // confirmedOn = DateUtil.convertStringToDate(json['ConfirmedOn']); + // confirmedOn = DateUtil.convertStringToDate(json['ConfirmedOn']); arrivalChangedBy = json['ArrivalChangedBy']; - // arrivedOn = DateUtil.convertStringToDate(json['ArrivedOn']); + // arrivedOn = DateUtil.convertStringToDate(json['ArrivedOn']); rescheduledBy = json['RescheduledBy']; rescheduledOn = json['RescheduledOn']; mRStatus = json['MRStatus']; @@ -227,14 +227,14 @@ class PatientDoctorAppointment { noOfPatientsRate = json['NoOfPatientsRate']; projectName = json['ProjectName']; qR = json['QR']; - // speciality = json['Speciality'].cast(); + // speciality = json['Speciality'].cast(); } catch (e) { print(e); } } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['SetupID'] = this.setupID; data['ProjectID'] = this.projectID; data['AppointmentNo'] = this.appointmentNo; @@ -313,13 +313,11 @@ class PatientDoctorAppointment { } } -class PatientDoctorAppointmentList{ +class PatientDoctorAppointmentList { + String? filterName = ""; + List patientDoctorAppointmentList = []; - String filterName =""; - List patientDoctorAppointmentList = List(); - - PatientDoctorAppointmentList({this.filterName,PatientDoctorAppointment patientDoctorAppointment}){ - patientDoctorAppointmentList.add(patientDoctorAppointment); + PatientDoctorAppointmentList({this.filterName, PatientDoctorAppointment? patientDoctorAppointment}) { + patientDoctorAppointmentList.add(patientDoctorAppointment!); } - } diff --git a/lib/core/model/doctor/reques_patient_doctor_appointmentt.dart b/lib/core/model/doctor/reques_patient_doctor_appointmentt.dart index 8ed90132..883b11dc 100644 --- a/lib/core/model/doctor/reques_patient_doctor_appointmentt.dart +++ b/lib/core/model/doctor/reques_patient_doctor_appointmentt.dart @@ -1,38 +1,38 @@ class RequestPatientDoctorAppointment { - int top; - double versionID; - int beforeDays; - int exludType; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; + int? top; + double? versionID; + int? beforeDays; + int? exludType; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; RequestPatientDoctorAppointment( {this.top, - this.versionID, - this.beforeDays, - this.exludType, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.patientID, - this.tokenID, - this.patientTypeID, - this.patientType}); + this.versionID, + this.beforeDays, + this.exludType, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.patientID, + this.tokenID, + this.patientTypeID, + this.patientType}); RequestPatientDoctorAppointment.fromJson(Map json) { top = json['Top']; diff --git a/lib/core/model/doctor/request_doctor_profile.dart b/lib/core/model/doctor/request_doctor_profile.dart index 80766b3f..cae86c2f 100644 --- a/lib/core/model/doctor/request_doctor_profile.dart +++ b/lib/core/model/doctor/request_doctor_profile.dart @@ -1,19 +1,19 @@ class RequestDoctorProfile { - int doctorID; - bool license; - bool isRegistered; - int projectID; - int clinicID; - int patientID; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; + int? doctorID; + bool? license; + bool? isRegistered; + int? projectID; + int? clinicID; + int? patientID; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; RequestDoctorProfile( {this.doctorID, diff --git a/lib/core/model/doctor/request_doctor_rating.dart b/lib/core/model/doctor/request_doctor_rating.dart index fcc9386b..ca9e82d4 100644 --- a/lib/core/model/doctor/request_doctor_rating.dart +++ b/lib/core/model/doctor/request_doctor_rating.dart @@ -1,26 +1,16 @@ class RequestDoctorRating { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int doctorID; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? doctorID; - RequestDoctorRating( - {this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.doctorID}); + RequestDoctorRating({this.versionID, this.channel, this.languageID, this.iPAdress, this.generalid, this.patientOutSA, this.sessionID, this.isDentalAllowedBackend, this.deviceTypeID, this.doctorID}); RequestDoctorRating.fromJson(Map json) { versionID = json['VersionID']; diff --git a/lib/core/model/er/AmbulanceRequestOrdersModel.dart b/lib/core/model/er/AmbulanceRequestOrdersModel.dart index c08b3574..4eed76f6 100644 --- a/lib/core/model/er/AmbulanceRequestOrdersModel.dart +++ b/lib/core/model/er/AmbulanceRequestOrdersModel.dart @@ -1,56 +1,56 @@ class AmbulanceRequestOrdersModel { - String statusText; - num paymentStatus; + String? statusText; + num? paymentStatus; dynamic clientRequestid; dynamic paymentStatusText; dynamic projectName; - String nearestProjectName; - num paymentAmount; - WFOrder wFOrder; - String serviceText; - bool isSentForApproval; - num exaCartOrderId; - String exaCartGUID; - bool isTimer; - num timeSeconds; - num totalPendingSeconds; - num timeMinute; - num timeHour; - num timeTotalSeconds; - num timeTotalMinute; - num timeTotalHour; + String? nearestProjectName; + num? paymentAmount; + WFOrder? wFOrder; + String? serviceText; + bool? isSentForApproval; + num? exaCartOrderId; + String? exaCartGUID; + bool? isTimer; + num? timeSeconds; + num? totalPendingSeconds; + num? timeMinute; + num? timeHour; + num? timeTotalSeconds; + num? timeTotalMinute; + num? timeTotalHour; dynamic approvalStatus; - bool isActive; - num clickButton; + bool? isActive; + num? clickButton; dynamic orderHistory; - String pickupLocation; - String dropOffLocation; - String clinicName; - String doctorName; - String branch; - String time; - String notes; - num iD; - num patientId; - num patientOutSa; - bool isOutPatient; - num projectId; - num nearestProjectId; + String? pickupLocation; + String? dropOffLocation; + String? clinicName; + String? doctorName; + String? branch; + String? time; + String? notes; + num? iD; + num? patientId; + num? patientOutSa; + bool? isOutPatient; + num? projectId; + num? nearestProjectId; dynamic longitude; dynamic latitude; dynamic appointmentNo; dynamic dischargeId; - num statusId; - num serviceId; - num channel; - Orderpayment orderpayment; + num? statusId; + num? serviceId; + num? channel; + Orderpayment? orderpayment; dynamic wforder; dynamic orderapprovalobj; - String created; + String? created; dynamic createdBy; dynamic modified; dynamic modifiedBy; - bool isDeleted; + bool? isDeleted; AmbulanceRequestOrdersModel( {this.statusText, @@ -106,7 +106,7 @@ class AmbulanceRequestOrdersModel { this.modifiedBy, this.isDeleted}); - AmbulanceRequestOrdersModel.fromJson(Map json) { + AmbulanceRequestOrdersModel.fromJson(Map json) { statusText = json['StatusText']; paymentStatus = json['PaymentStatus']; clientRequestid = json['ClientRequestid']; @@ -165,8 +165,8 @@ class AmbulanceRequestOrdersModel { isDeleted = json['IsDeleted']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['StatusText'] = this.statusText; data['PaymentStatus'] = this.paymentStatus; data['ClientRequestid'] = this.clientRequestid; @@ -175,7 +175,7 @@ class AmbulanceRequestOrdersModel { data['NearestProjectName'] = this.nearestProjectName; data['PaymentAmount'] = this.paymentAmount; if (this.wFOrder != null) { - data['WF_order'] = this.wFOrder.toJson(); + data['WF_order'] = this.wFOrder!.toJson(); } data['ServiceText'] = this.serviceText; data['isSentForApproval'] = this.isSentForApproval; @@ -214,7 +214,7 @@ class AmbulanceRequestOrdersModel { data['ServiceId'] = this.serviceId; data['Channel'] = this.channel; if (this.orderpayment != null) { - data['orderpayment'] = this.orderpayment.toJson(); + data['orderpayment'] = this.orderpayment!.toJson(); } data['wforder'] = this.wforder; data['orderapprovalobj'] = this.orderapprovalobj; @@ -229,17 +229,17 @@ class AmbulanceRequestOrdersModel { class WFOrder { dynamic wfButtonsDTO; - num iD; - num orderId; - num previousStep; - num nextStep; - num serviceId; + num? iD; + num? orderId; + num? previousStep; + num? nextStep; + num? serviceId; dynamic order; - String created; + String? created; dynamic createdBy; dynamic modified; dynamic modifiedBy; - bool isDeleted; + bool? isDeleted; WFOrder( {this.wfButtonsDTO, @@ -255,7 +255,7 @@ class WFOrder { this.modifiedBy, this.isDeleted}); - WFOrder.fromJson(Map json) { + WFOrder.fromJson(Map json) { wfButtonsDTO = json['wf_ButtonsDTO']; iD = json['ID']; orderId = json['OrderId']; @@ -270,8 +270,8 @@ class WFOrder { isDeleted = json['IsDeleted']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['wf_ButtonsDTO'] = this.wfButtonsDTO; data['ID'] = this.iD; data['OrderId'] = this.orderId; @@ -289,17 +289,17 @@ class WFOrder { } class Orderpayment { - num iD; - num orderId; + num? iD; + num? orderId; dynamic clientRequestId; - num totalAmount; - num paymentStatus; + num? totalAmount; + num? paymentStatus; dynamic order; - String created; + String? created; dynamic createdBy; dynamic modified; dynamic modifiedBy; - bool isDeleted; + bool? isDeleted; Orderpayment( {this.iD, @@ -314,7 +314,7 @@ class Orderpayment { this.modifiedBy, this.isDeleted}); - Orderpayment.fromJson(Map json) { + Orderpayment.fromJson(Map json) { iD = json['ID']; orderId = json['OrderId']; clientRequestId = json['ClientRequestId']; @@ -328,8 +328,8 @@ class Orderpayment { isDeleted = json['IsDeleted']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['ID'] = this.iD; data['OrderId'] = this.orderId; data['ClientRequestId'] = this.clientRequestId; diff --git a/lib/core/model/er/ErPatientShareModel.dart b/lib/core/model/er/ErPatientShareModel.dart index 09e54de9..d3b42c4a 100644 --- a/lib/core/model/er/ErPatientShareModel.dart +++ b/lib/core/model/er/ErPatientShareModel.dart @@ -1,23 +1,23 @@ class ErPatientShareModel { - int cashPrice; - int cashPriceTax; - int cashPriceWithTax; - int companyId; - String companyName; - int companyShareWithTax; + int? cashPrice; + int? cashPriceTax; + int? cashPriceWithTax; + int? companyId; + String? companyName; + int? companyShareWithTax; dynamic errCode; - int groupID; + int? groupID; dynamic insurancePolicyNo; - String message; + String? message; dynamic patientCardID; - num patientShare; - num patientShareWithTax; - num patientTaxAmount; - int policyId; - String policyName; - String procedureName; + num? patientShare; + num? patientShareWithTax; + num? patientTaxAmount; + int? policyId; + String? policyName; + String? procedureName; dynamic setupID; - int statusCode; + int? statusCode; dynamic subPolicyNo; ErPatientShareModel( @@ -42,7 +42,7 @@ class ErPatientShareModel { this.statusCode, this.subPolicyNo}); - ErPatientShareModel.fromJson(Map json) { + ErPatientShareModel.fromJson(Map json) { cashPrice = json['CashPrice']; cashPriceTax = json['CashPriceTax']; cashPriceWithTax = json['CashPriceWithTax']; @@ -65,8 +65,8 @@ class ErPatientShareModel { subPolicyNo = json['SubPolicyNo']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['CashPrice'] = this.cashPrice; data['CashPriceTax'] = this.cashPriceTax; data['CashPriceWithTax'] = this.cashPriceWithTax; diff --git a/lib/core/model/er/PatientAllPresOrders.dart b/lib/core/model/er/PatientAllPresOrders.dart index 90ce074a..9ff8223e 100644 --- a/lib/core/model/er/PatientAllPresOrders.dart +++ b/lib/core/model/er/PatientAllPresOrders.dart @@ -1,34 +1,34 @@ class PatientAllPresOrders { - int iD; - String patientID; - bool patientOutSA; - bool isOutPatient; - int projectID; - int nearestProjectID; - double longitude; - double latitude; - String appointmentNo; - String dischargeID; - int lineItemNo; - int status; - String description; - String descriptionN; - String createdOn; - int serviceID; - int createdBy; - String editedOn; - int editedBy; - int channel; + int? iD; + String? patientID; + bool? patientOutSA; + bool? isOutPatient; + int? projectID; + int? nearestProjectID; + double? longitude; + double? latitude; + String? appointmentNo; + String? dischargeID; + int? lineItemNo; + int? status; + String? description; + String? descriptionN; + String? createdOn; + int? serviceID; + int? createdBy; + String? editedOn; + int? editedBy; + int? channel; dynamic clientRequestID; - bool returnedToQueue; + bool? returnedToQueue; dynamic pickupDateTime; dynamic pickupLocationName; dynamic dropoffLocationName; - int realRRTHaveTransactions; - String nearestProjectDescription; - String nearestProjectDescriptionN; - String projectDescription; - String projectDescriptionN; + int? realRRTHaveTransactions; + String? nearestProjectDescription; + String? nearestProjectDescriptionN; + String? projectDescription; + String? projectDescriptionN; PatientAllPresOrders( {this.iD, @@ -62,7 +62,7 @@ class PatientAllPresOrders { this.projectDescription, this.projectDescriptionN}); - PatientAllPresOrders.fromJson(Map json) { + PatientAllPresOrders.fromJson(Map json) { iD = json['ID']; patientID = json['PatientID']; patientOutSA = json['PatientOutSA']; @@ -95,8 +95,8 @@ class PatientAllPresOrders { projectDescriptionN = json['ProjectDescriptionN']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['ID'] = this.iD; data['PatientID'] = this.patientID; data['PatientOutSA'] = this.patientOutSA; diff --git a/lib/core/model/er/PatientER.dart b/lib/core/model/er/PatientER.dart index 288b8dc2..b6a5f6eb 100644 --- a/lib/core/model/er/PatientER.dart +++ b/lib/core/model/er/PatientER.dart @@ -3,55 +3,55 @@ import 'package:diplomaticquarterapp/core/enum/Ambulate.dart'; import 'get_all_transportation_method_list_model.dart'; class PatientER { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; dynamic patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; - int orderServiceID; - String patientIdentificationID; - int direction; - bool haveAppointment; - int tripType; - int pickupUrgency; - int pickupSpot; - String pickupDateTime; - int transportationMethodId; - int selectedAmbulate; - String requesterNote; - int requesterFileNo; - String requesterMobileNo; - bool requesterIsOutSA; - int isOutPatient; - String pickupLocationName; - String dropoffLocationName; - int projectID; - int createdBy; - int lineItemNo; - double cost; - double vAT; - double totalPrice; - String pickupLocationLattitude; - String pickupLocationLongitude; - String dropoffLocationLattitude; - String dropoffLocationLongitude; - String latitude; - String longitude; - String appointmentNo; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; + int? orderServiceID; + String? patientIdentificationID; + int? direction; + bool? haveAppointment; + int? tripType; + int? pickupUrgency; + int? pickupSpot; + String? pickupDateTime; + int? transportationMethodId; + int? selectedAmbulate; + String? requesterNote; + int? requesterFileNo; + String? requesterMobileNo; + bool? requesterIsOutSA; + int? isOutPatient; + String? pickupLocationName; + String? dropoffLocationName; + int? projectID; + int? createdBy; + int? lineItemNo; + double? cost; + double? vAT; + double? totalPrice; + String? pickupLocationLattitude; + String? pickupLocationLongitude; + String? dropoffLocationLattitude; + String? dropoffLocationLongitude; + String? latitude; + String? longitude; + String? appointmentNo; dynamic appointmentClinicName; dynamic appointmentDoctorName; dynamic appointmentBranch; dynamic appointmentTime; - PatientERTransportationMethod patientERTransportationMethod; - Ambulate ambulate; + PatientERTransportationMethod? patientERTransportationMethod; + Ambulate? ambulate; PatientER( {this.versionID, this.channel, @@ -103,7 +103,7 @@ class PatientER { this.patientERTransportationMethod, this.ambulate}); - PatientER.fromJson(Map json) { + PatientER.fromJson(Map json) { versionID = json['VersionID']; channel = json['Channel']; languageID = json['LanguageID']; @@ -153,8 +153,8 @@ class PatientER { appointmentTime = json['AppointmentTime']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['VersionID'] = this.versionID; data['Channel'] = this.channel; data['LanguageID'] = this.languageID; diff --git a/lib/core/model/er/PatientER_RC.dart b/lib/core/model/er/PatientER_RC.dart index 6abec2d6..f0f17cef 100644 --- a/lib/core/model/er/PatientER_RC.dart +++ b/lib/core/model/er/PatientER_RC.dart @@ -1,26 +1,26 @@ import 'package:diplomaticquarterapp/core/model/er/get_all_transportation_method_list_model.dart'; class PatientER_RC { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - bool patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; - int orderServiceID; - String patientIdentificationID; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + bool? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; + int? orderServiceID; + String? patientIdentificationID; dynamic patientOutSa; - int projectID; - int lineItemNo; - TransportationDetails transportationDetails; - PatientERTransportationMethod patientERTransportationMethod; + int? projectID; + int? lineItemNo; + TransportationDetails? transportationDetails; + PatientERTransportationMethod? patientERTransportationMethod; PatientER_RC( {this.versionID, @@ -43,7 +43,7 @@ class PatientER_RC { this.lineItemNo, this.transportationDetails}); - PatientER_RC.fromJson(Map json) { + PatientER_RC.fromJson(Map json) { versionID = json['VersionID']; channel = json['Channel']; languageID = json['LanguageID']; @@ -67,8 +67,8 @@ class PatientER_RC { : null; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['VersionID'] = this.versionID; data['Channel'] = this.channel; data['LanguageID'] = this.languageID; @@ -88,37 +88,37 @@ class PatientER_RC { data['projectID'] = this.projectID; data['lineItemNo'] = this.lineItemNo; if (this.transportationDetails != null) { - data['transportationDetails'] = this.transportationDetails.toJson(); + data['transportationDetails'] = this.transportationDetails!.toJson(); } return data; } } class TransportationDetails { - int direction; - int haveAppointment; - int tripType; - int pickupUrgency; - int pickupSpot; - String pickupDateTime; - String transportationType; - int ambulate; - String ambulateTitle; - String notes; - int requesterFileNo; - String requesterMobileNo; - bool requesterIsOutSA; - String pickupLocationName; - String dropoffLocationName; - String pickupLatitude; - String pickupLongitude; - String dropoffLatitude; - String dropoffLongitude; - String appointmentNo; - String appointmentClinicName; - String appointmentDoctorName; - String appointmentBranch; - String appointmentTime; + int? direction; + int? haveAppointment; + int? tripType; + int? pickupUrgency; + int? pickupSpot; + String? pickupDateTime; + String? transportationType; + int? ambulate; + String? ambulateTitle; + String? notes; + int? requesterFileNo; + String? requesterMobileNo; + bool? requesterIsOutSA; + String? pickupLocationName; + String? dropoffLocationName; + String? pickupLatitude; + String? pickupLongitude; + String? dropoffLatitude; + String? dropoffLongitude; + String? appointmentNo; + String? appointmentClinicName; + String? appointmentDoctorName; + String? appointmentBranch; + String? appointmentTime; TransportationDetails( {this.direction, @@ -146,7 +146,7 @@ class TransportationDetails { this.appointmentBranch, this.appointmentTime}); - TransportationDetails.fromJson(Map json) { + TransportationDetails.fromJson(Map json) { direction = json['direction']; haveAppointment = json['haveAppointment']; tripType = json['tripType']; @@ -173,8 +173,8 @@ class TransportationDetails { appointmentTime = json['appointmentTime']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['direction'] = this.direction; data['haveAppointment'] = this.haveAppointment; data['tripType'] = this.tripType; diff --git a/lib/core/model/er/PickUpRequestPresOrder.dart b/lib/core/model/er/PickUpRequestPresOrder.dart index c4f359f5..83536047 100644 --- a/lib/core/model/er/PickUpRequestPresOrder.dart +++ b/lib/core/model/er/PickUpRequestPresOrder.dart @@ -1,52 +1,52 @@ class PickUpRequestPresOrder { - int id; - int presOrderID; - String createDate; - String lastEditDate; - int createdBy; - int lastEditBy; - bool isActive; - String requestNo; - int requesterId; - int direction; - bool haveAppointment; + int? id; + int? presOrderID; + String? createDate; + String? lastEditDate; + int? createdBy; + int? lastEditBy; + bool? isActive; + String? requestNo; + int? requesterId; + int? direction; + bool? haveAppointment; dynamic appointmentId; - int tripType; - int pickupUrgency; - String pickupDateTime; + int? tripType; + int? pickupUrgency; + String? pickupDateTime; dynamic pickupLocationId; - int pickupSpot; + int? pickupSpot; dynamic dropoffLocationId; - int transportationMethodId; + int? transportationMethodId; dynamic cost; dynamic vAT; - double totalPrice; - int amountCollected; - int selectedAmbulate; - String requesterNote; - int status; - int paymentStatus; + double? totalPrice; + int? amountCollected; + int? selectedAmbulate; + String? requesterNote; + int? status; + int? paymentStatus; dynamic rejectReason; - int visibility; + int? visibility; dynamic durationId; dynamic imageId; - String requesterFileNo; - String requesterMobileNo; - bool requesterIsOutSA; - String pickupLocationLongitude; - String pickupLocationLattitude; - String dropoffLocationLongitude; - String dropoffLocationLattitude; + String? requesterFileNo; + String? requesterMobileNo; + bool? requesterIsOutSA; + String? pickupLocationLongitude; + String? pickupLocationLattitude; + String? dropoffLocationLongitude; + String? dropoffLocationLattitude; dynamic appointmentClinicName; dynamic appointmentDoctorName; dynamic appointmentBranch; dynamic appointmentTime; - String pickupLocationName; - String dropoffLocationName; - String title; - String titleAR; - String ambulateDescription; - String ambulateDescriptionN; + String? pickupLocationName; + String? dropoffLocationName; + String? title; + String? titleAR; + String? ambulateDescription; + String? ambulateDescriptionN; PickUpRequestPresOrder( {this.id, @@ -98,7 +98,7 @@ class PickUpRequestPresOrder { this.ambulateDescription, this.ambulateDescriptionN}); - PickUpRequestPresOrder.fromJson(Map json) { + PickUpRequestPresOrder.fromJson(Map json) { id = json['Id']; presOrderID = json['PresOrderID']; createDate = json['CreateDate']; @@ -149,8 +149,8 @@ class PickUpRequestPresOrder { ambulateDescriptionN = json['AmbulateDescriptionN']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['Id'] = this.id; data['PresOrderID'] = this.presOrderID; data['CreateDate'] = this.createDate; diff --git a/lib/core/model/er/TriageInformationRequest.dart b/lib/core/model/er/TriageInformationRequest.dart index a9717d3d..e6b883f8 100644 --- a/lib/core/model/er/TriageInformationRequest.dart +++ b/lib/core/model/er/TriageInformationRequest.dart @@ -1,36 +1,38 @@ import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; class TriageInformationRequest { - double versionID; - int channel; - int languageID; - String iPAdress; - String sessionID; - int patientID; - String tokenID; - String generalid; - int patientOutSA; - int patientTypeID; - int patientType; - int projectID; - ERTriageInformation eRTriageInformation; - HospitalsModel selectedHospital; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? sessionID; + int? patientID; + String? tokenID; + String? generalid; + int? patientOutSA; + int? patientTypeID; + int? patientType; + int? projectID; + ERTriageInformation? eRTriageInformation; + HospitalsModel? selectedHospital; + TriageInformationRequest( {this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.sessionID, - this.patientID, - this.tokenID, - this.generalid, - this.patientOutSA, - this.patientTypeID, - this.patientType, - this.projectID, - this.eRTriageInformation,this.selectedHospital}); + this.channel, + this.languageID, + this.iPAdress, + this.sessionID, + this.patientID, + this.tokenID, + this.generalid, + this.patientOutSA, + this.patientTypeID, + this.patientType, + this.projectID, + this.eRTriageInformation, + this.selectedHospital}); - TriageInformationRequest.fromJson(Map json) { + TriageInformationRequest.fromJson(Map json) { versionID = json['VersionID']; channel = json['Channel']; languageID = json['LanguageID']; @@ -43,13 +45,11 @@ class TriageInformationRequest { patientTypeID = json['PatientTypeID']; patientType = json['PatientType']; projectID = json['ProjectID']; - eRTriageInformation = json['ERTriageInformation'] != null - ? new ERTriageInformation.fromJson(json['ERTriageInformation']) - : null; + eRTriageInformation = json['ERTriageInformation'] != null ? new ERTriageInformation.fromJson(json['ERTriageInformation']) : null; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['VersionID'] = this.versionID; data['Channel'] = this.channel; data['LanguageID'] = this.languageID; @@ -63,71 +63,60 @@ class TriageInformationRequest { data['PatientType'] = this.patientType; data['ProjectID'] = this.projectID; if (this.eRTriageInformation != null) { - data['ERTriageInformation'] = this.eRTriageInformation.toJson(); + data['ERTriageInformation'] = this.eRTriageInformation!.toJson(); } return data; } } class ERTriageInformation { - String notes; - String chiefComplaint; - int patientId; - int projectId; - int riskScore; - List checklist; + String? notes; + String? chiefComplaint; + int? patientId; + int? projectId; + int? riskScore; + List? checklist; - ERTriageInformation( - {this.notes, - this.chiefComplaint, - this.patientId, - this.projectId, - this.riskScore, - this.checklist}); + ERTriageInformation({this.notes, this.chiefComplaint, this.patientId, this.projectId, this.riskScore, this.checklist}); - ERTriageInformation.fromJson(Map json) { + ERTriageInformation.fromJson(Map json) { notes = json['Notes']; chiefComplaint = json['ChiefComplaint']; patientId = json['PatientId']; projectId = json['ProjectId']; riskScore = json['RiskScore']; if (json['checklist'] != null) { - checklist = new List(); + checklist = []; json['checklist'].forEach((v) { - checklist.add(new Checklist.fromJson(v)); + checklist!.add(new Checklist.fromJson(v)); }); } } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['Notes'] = this.notes; data['ChiefComplaint'] = this.chiefComplaint; data['PatientId'] = this.patientId; data['ProjectId'] = this.projectId; data['RiskScore'] = this.riskScore; if (this.checklist != null) { - data['checklist'] = this.checklist.map((v) => v.toJson()).toList(); + data['checklist'] = this.checklist!.map((v) => v.toJson()).toList(); } return data; } } class Checklist { - int isSelected; - int parameterCode; - int parameterGroup; - int parameterType; - int score; + int? isSelected; + int? parameterCode; + int? parameterGroup; + int? parameterType; + int? score; - Checklist( - {this.isSelected, - this.parameterCode, - this.parameterGroup, - this.parameterType, - this.score}); + Checklist({this.isSelected, this.parameterCode, this.parameterGroup, this.parameterType, this.score}); - Checklist.fromJson(Map json) { + Checklist.fromJson(Map json) { isSelected = json['IsSelected']; parameterCode = json['ParameterCode']; parameterGroup = json['ParameterGroup']; @@ -135,8 +124,8 @@ class Checklist { score = json['Score']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['IsSelected'] = this.isSelected; data['ParameterCode'] = this.parameterCode; data['ParameterGroup'] = this.parameterGroup; diff --git a/lib/core/model/er/TriageQuestionsModel.dart b/lib/core/model/er/TriageQuestionsModel.dart index 8960973e..94a35988 100644 --- a/lib/core/model/er/TriageQuestionsModel.dart +++ b/lib/core/model/er/TriageQuestionsModel.dart @@ -1,14 +1,14 @@ class TriageQuestionsModel { - String adultPoints; - String headerSequence; - int parameterCode; - int parameterGroup; - int parameterType; - String pediaPoints; - String question; - String questionN; - String scoreGroup; - String titles; + String? adultPoints; + String? headerSequence; + int? parameterCode; + int? parameterGroup; + int? parameterType; + String? pediaPoints; + String? question; + String? questionN; + String? scoreGroup; + String? titles; TriageQuestionsModel( {this.adultPoints, @@ -22,7 +22,7 @@ class TriageQuestionsModel { this.scoreGroup, this.titles}); - TriageQuestionsModel.fromJson(Map json) { + TriageQuestionsModel.fromJson(Map json) { adultPoints = json['AdultPoints']; headerSequence = json['HeaderSequence']; parameterCode = json['ParameterCode']; @@ -35,8 +35,8 @@ class TriageQuestionsModel { titles = json['Titles']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['AdultPoints'] = this.adultPoints; data['HeaderSequence'] = this.headerSequence; data['ParameterCode'] = this.parameterCode; diff --git a/lib/core/model/er/get_all_transportation_method_list_model.dart b/lib/core/model/er/get_all_transportation_method_list_model.dart index 530b4f25..35086c2f 100644 --- a/lib/core/model/er/get_all_transportation_method_list_model.dart +++ b/lib/core/model/er/get_all_transportation_method_list_model.dart @@ -1,15 +1,15 @@ class PatientERTransportationMethod { - int iD; - String serviceID; - int orderServiceID; - String text; - String textN; + int? iD; + String? serviceID; + int? orderServiceID; + String? text; + String? textN; dynamic price; dynamic priceVAT; dynamic priceTotal; - bool isEnabled; - int orderId; - int quantity; + bool? isEnabled; + int? orderId; + int? quantity; PatientERTransportationMethod( {this.iD, @@ -24,7 +24,7 @@ class PatientERTransportationMethod { this.orderId, this.quantity}); - PatientERTransportationMethod.fromJson(Map json) { + PatientERTransportationMethod.fromJson(Map json) { iD = json['ID']; serviceID = json['ServiceID']; orderServiceID = json['OrderServiceID']; @@ -38,8 +38,8 @@ class PatientERTransportationMethod { quantity = json['Quantity']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['ID'] = this.iD; data['ServiceID'] = this.serviceID; data['OrderServiceID'] = this.orderServiceID; diff --git a/lib/core/model/er/projectavgerwaitingtime.dart b/lib/core/model/er/projectavgerwaitingtime.dart index 9b21ec66..3da5c357 100644 --- a/lib/core/model/er/projectavgerwaitingtime.dart +++ b/lib/core/model/er/projectavgerwaitingtime.dart @@ -1,14 +1,14 @@ class ProjectAvgERWaitingTime { - int iD; - int projectID; - int avgTimeInMinutes; - String avgTimeInHHMM; + int? iD; + int? projectID; + int? avgTimeInMinutes; + String? avgTimeInHHMM; dynamic distanceInKilometers; - String latitude; - String longitude; - String phoneNumber; - String projectImageURL; - String projectName; + String? latitude; + String? longitude; + String? phonenumber; + String? projectImageURL; + String? projectName; ProjectAvgERWaitingTime( {this.iD, @@ -18,11 +18,11 @@ class ProjectAvgERWaitingTime { this.distanceInKilometers, this.latitude, this.longitude, - this.phoneNumber, + this.phonenumber, this.projectImageURL, this.projectName}); - ProjectAvgERWaitingTime.fromJson(Map json) { + ProjectAvgERWaitingTime.fromJson(Map json) { iD = json['ID']; projectID = json['ProjectID']; avgTimeInMinutes = json['AvgTimeInMinutes']; @@ -30,13 +30,13 @@ class ProjectAvgERWaitingTime { distanceInKilometers = json['DistanceInKilometers']; latitude = json['Latitude']; longitude = json['Longitude']; - phoneNumber = json['PhoneNumber']; + phonenumber = json['Phonenum?ber']; projectImageURL = json['ProjectImageURL']; projectName = json['ProjectName']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['ID'] = this.iD; data['ProjectID'] = this.projectID; data['AvgTimeInMinutes'] = this.avgTimeInMinutes; @@ -44,23 +44,23 @@ class ProjectAvgERWaitingTime { data['DistanceInKilometers'] = this.distanceInKilometers; data['Latitude'] = this.latitude; data['Longitude'] = this.longitude; - data['PhoneNumber'] = this.phoneNumber; + data['Phonenum?ber'] = this.phonenumber; data['ProjectImageURL'] = this.projectImageURL; data['ProjectName'] = this.projectName; return data; } } //class ProjectAvgERWaitingTime { -// int iD; -// int projectID; -// int avgTimeInMinutes; -// String avgTimeInHHMM; -// String distanceInKilometers; -// String latitude; -// String longitude; -// String phoneNumber; -// String projectImageURL; -// String projectName; +// int? iD; +// int? projectID; +// int? avgTimeInMinutes; +// String? avgTimeInHHMM; +// String? distanceInKilometers; +// String? latitude; +// String? longitude; +// String? phonenum?ber; +// String? projectImageURL; +// String? projectName; // // ProjectAvgERWaitingTime( // {this.iD, @@ -70,11 +70,11 @@ class ProjectAvgERWaitingTime { // this.distanceInKilometers, // this.latitude, // this.longitude, -// this.phoneNumber, +// this.phonenum?ber, // this.projectImageURL, // this.projectName}); // -// ProjectAvgERWaitingTime.fromJson(Map json) { +// ProjectAvgERWaitingTime.fromJson(Map json) { // iD = json['ID']; // projectID = json['ProjectID']; // avgTimeInMinutes = json['AvgTimeInMinutes']; @@ -82,13 +82,13 @@ class ProjectAvgERWaitingTime { // distanceInKilometers = json['DistanceInKilometers']; // latitude = json['Latitude']; // longitude = json['Longitude']; -// phoneNumber = json['PhoneNumber']; +// phonenum?ber = json['Phonenum?ber']; // projectImageURL = json['ProjectImageURL']; // projectName = json['ProjectName']; // } // -// Map toJson() { -// final Map data = new Map(); +// Map toJson() { +// final Map data = new Map(); // data['ID'] = this.iD; // data['ProjectID'] = this.projectID; // data['AvgTimeInMinutes'] = this.avgTimeInMinutes; @@ -96,7 +96,7 @@ class ProjectAvgERWaitingTime { // data['DistanceInKilometers'] = this.distanceInKilometers; // data['Latitude'] = this.latitude; // data['Longitude'] = this.longitude; -// data['PhoneNumber'] = this.phoneNumber; +// data['Phonenum?ber'] = this.phonenum?ber; // data['ProjectImageURL'] = this.projectImageURL; // data['ProjectName'] = this.projectName; // return data; diff --git a/lib/core/model/eye/AppoimentAllHistoryResult.dart b/lib/core/model/eye/AppoimentAllHistoryResult.dart index b431943d..a4a3b18c 100644 --- a/lib/core/model/eye/AppoimentAllHistoryResult.dart +++ b/lib/core/model/eye/AppoimentAllHistoryResult.dart @@ -1,72 +1,72 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; class AppoimentAllHistoryResultList { - String setupID; - int projectID; - int appointmentNo; - String appointmentDate; + String? setupID; + int? projectID; + int? appointmentNo; + String? appointmentDate; Null appointmentDateN; - int appointmentType; - DateTime bookDate; + int? appointmentType; + DateTime? bookDate; dynamic patientType; - int patientID; + int? patientID; dynamic clinicID; - int doctorID; - String endDate; - String startTime; - String endTime; + int? doctorID; + String? endDate; + String? startTime; + String? endTime; dynamic status; dynamic visitType; - int visitFor; - int patientStatusType; - int companyID; - int bookedBy; - String bookedOn; - int confirmedBy; - String confirmedOn; - int arrivalChangedBy; - String arrivedOn; + int? visitFor; + int? patientStatusType; + int? companyID; + int? bookedBy; + String? bookedOn; + int? confirmedBy; + String? confirmedOn; + int? arrivalChangedBy; + String? arrivedOn; Null editedBy; Null editedOn; Null doctorName; Null doctorNameN; - String statusDesc; + String? statusDesc; Null statusDescN; - bool vitalStatus; + bool? vitalStatus; Null vitalSignAppointmentNo; - int episodeID; - int actualDoctorRate; - String clinicName; - bool complainExists; - String doctorImageURL; - String doctorNameObj; - int doctorRate; - List doctorSpeciality; - String doctorTitle; - int gender; - String genderDescription; - bool iSAllowOnlineCheckedIN; - bool isActiveDoctor; - bool isActiveDoctorProfile; - bool isDoctorAllowVedioCall; - bool isExecludeDoctor; - int isFollowup; - bool isLiveCareAppointment; - bool isMedicalReportRequested; - bool isOnlineCheckedIN; - String latitude; - List listHISGetContactLensPerscription; - List listHISGetGlassPerscription; - String longitude; - int nextAction; - int noOfPatientsRate; - int originalClinicID; - int originalProjectID; - String projectName; - String qR; - int remaniningHoursTocanPay; - bool sMSButtonVisable; - bool isInOutPatient; + int? episodeID; + int? actualDoctorRate; + String? clinicName; + bool? complainExists; + String? doctorImageURL; + String? doctorNameObj; + int? doctorRate; + List? doctorSpeciality; + String? doctorTitle; + int? gender; + String? genderDescription; + bool? iSAllowOnlineCheckedIN; + bool? isActiveDoctor; + bool? isActiveDoctorProfile; + bool? isDoctorAllowVedioCall; + bool? isExecludeDoctor; + int? isFollowup; + bool? isLiveCareAppointment; + bool? isMedicalReportRequested; + bool? isOnlineCheckedIN; + String? latitude; + List? listHISGetContactLensPerscription; + List? listHISGetGlassPerscription; + String? longitude; + int? nextAction; + int? noOfPatientsRate; + int? originalClinicID; + int? originalProjectID; + String? projectName; + String? qR; + int? remaniningHoursTocanPay; + bool? sMSButtonVisable; + bool? isInOutPatient; AppoimentAllHistoryResultList({ this.setupID, @@ -137,7 +137,7 @@ class AppoimentAllHistoryResultList { this.isInOutPatient, }); - AppoimentAllHistoryResultList.fromJson(Map json) { + AppoimentAllHistoryResultList.fromJson(Map json) { setupID = json['SetupID']; projectID = json['ProjectID']; appointmentNo = json['AppointmentNo']; @@ -178,7 +178,7 @@ class AppoimentAllHistoryResultList { doctorImageURL = json['DoctorImageURL']; doctorNameObj = json['DoctorNameObj']; doctorRate = json['DoctorRate']; - if (doctorSpeciality != null) doctorSpeciality = json['DoctorSpeciality'].cast(); + if (doctorSpeciality != null) doctorSpeciality = json['DoctorSpeciality'].cast(); doctorTitle = json['DoctorTitle']; gender = json['Gender']; genderDescription = json['GenderDescription']; @@ -193,15 +193,15 @@ class AppoimentAllHistoryResultList { isOnlineCheckedIN = json['IsOnlineCheckedIN']; latitude = json['Latitude']; if (json['List_HIS_GetContactLensPerscription'] != null) { - listHISGetContactLensPerscription = new List(); + listHISGetContactLensPerscription = []; json['List_HIS_GetContactLensPerscription'].forEach((v) { - listHISGetContactLensPerscription.add(new ListHISGetContactLensPerscription.fromJson(v)); + listHISGetContactLensPerscription!.add(new ListHISGetContactLensPerscription.fromJson(v)); }); } if (json['List_HIS_GetGlassPerscription'] != null) { - listHISGetGlassPerscription = new List(); + listHISGetGlassPerscription = []; json['List_HIS_GetGlassPerscription'].forEach((v) { - listHISGetGlassPerscription.add(new ListHISGetGlassPerscription.fromJson(v)); + listHISGetGlassPerscription!.add(new ListHISGetGlassPerscription.fromJson(v)); }); } longitude = json['Longitude']; @@ -220,8 +220,8 @@ class AppoimentAllHistoryResultList { isInOutPatient = json['IsInOutPatient']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['SetupID'] = this.setupID; data['ProjectID'] = this.projectID; data['AppointmentNo'] = this.appointmentNo; @@ -277,10 +277,20 @@ class AppoimentAllHistoryResultList { data['IsOnlineCheckedIN'] = this.isOnlineCheckedIN; data['Latitude'] = this.latitude; if (this.listHISGetContactLensPerscription != null) { - data['List_HIS_GetContactLensPerscription'] = this.listHISGetContactLensPerscription.map((v) => v.toJson()).toList(); + data['List_HIS_GetContactLensPerscription'] = this + .listHISGetContactLensPerscription! + .map( + (v) => v.toJson(), + ) + .toList(); } if (this.listHISGetGlassPerscription != null) { - data['List_HIS_GetGlassPerscription'] = this.listHISGetGlassPerscription.map((v) => v.toJson()).toList(); + data['List_HIS_GetGlassPerscription'] = this + .listHISGetGlassPerscription! + .map( + (v) => v.toJson(), + ) + .toList(); } data['Longitude'] = this.longitude; data['NextAction'] = this.nextAction; @@ -300,13 +310,13 @@ class AppoimentAllHistoryResultList { } class ListHISGetContactLensPerscription { - String setupId; - int projectId; - int patientType; - int patientId; - int encounterType; - int encounterNo; - int oDOS; + String? setupId; + int? projectId; + int? patientType; + int? patientId; + int? encounterType; + int? encounterNo; + int? oDOS; dynamic brand; dynamic baseCurve; dynamic power; @@ -314,10 +324,10 @@ class ListHISGetContactLensPerscription { dynamic oZ; dynamic cT; dynamic blend; - String remarks; - int status; - bool isActive; - String createdOn; + String? remarks; + int? status; + bool? isActive; + String? createdOn; ListHISGetContactLensPerscription( {this.setupId, @@ -339,7 +349,7 @@ class ListHISGetContactLensPerscription { this.isActive, this.createdOn}); - ListHISGetContactLensPerscription.fromJson(Map json) { + ListHISGetContactLensPerscription.fromJson(Map json) { setupId = json['SetupId']; projectId = json['ProjectId']; patientType = json['PatientType']; @@ -360,8 +370,8 @@ class ListHISGetContactLensPerscription { createdOn = json['CreatedOn']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['SetupId'] = this.setupId; data['ProjectId'] = this.projectId; data['PatientType'] = this.patientType; @@ -386,28 +396,28 @@ class ListHISGetContactLensPerscription { class ListHISGetGlassPerscription { dynamic projectID; - String setupID; + String? setupID; dynamic patientId; dynamic encounterType; dynamic encounterNo; - String visionType; - double rightEyeSpherical; + String? visionType; + double? rightEyeSpherical; dynamic rightEyeCylinder; dynamic rightEyeAxis; dynamic rightEyePrism; dynamic rightEyeVA; - String rightEyeRemarks; + String? rightEyeRemarks; dynamic leftEyeSpherical; dynamic leftEyeCylinder; dynamic leftEyeAxis; dynamic leftEyePrism; dynamic leftEyeVA; - String leftEyeRemarks; + String? leftEyeRemarks; dynamic pD; dynamic bVD; dynamic status; - bool isActive; - String createdOn; + bool? isActive; + String? createdOn; ListHISGetGlassPerscription( {this.projectID, @@ -434,7 +444,7 @@ class ListHISGetGlassPerscription { this.isActive, this.createdOn}); - ListHISGetGlassPerscription.fromJson(Map json) { + ListHISGetGlassPerscription.fromJson(Map json) { projectID = json['ProjectID']; setupID = json['SetupID']; patientId = json['PatientId']; @@ -460,8 +470,8 @@ class ListHISGetGlassPerscription { createdOn = json['CreatedOn']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['ProjectID'] = this.projectID; data['SetupID'] = this.setupID; data['PatientId'] = this.patientId; diff --git a/lib/core/model/eye/AppointmentFilter.dart b/lib/core/model/eye/AppointmentFilter.dart index 1f4b0ae5..58146a92 100644 --- a/lib/core/model/eye/AppointmentFilter.dart +++ b/lib/core/model/eye/AppointmentFilter.dart @@ -1,8 +1,8 @@ import 'AppoimentAllHistoryResult.dart'; class AppointmentFilter { - List appointmentAllHistoryResultList = List(); - String filterName; + ListappointmentAllHistoryResultList = []; + String? filterName; AppointmentFilter( AppoimentAllHistoryResultList allHistoryResultList, String filterName) { diff --git a/lib/core/model/family-file/add_family_file_request.dart b/lib/core/model/family-file/add_family_file_request.dart index cfec8e39..f03fa80a 100644 --- a/lib/core/model/family-file/add_family_file_request.dart +++ b/lib/core/model/family-file/add_family_file_request.dart @@ -1,24 +1,24 @@ class AddFamilyFileReq { - int searchType; - int sharedPatientID; - String sharedPatientIdentificationID; - String sharedPatientMobileNumber; - String zipCode; - bool isRegister; - int patientStatus; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; + int? searchType; + int? sharedPatientID; + String? sharedPatientIdentificationID; + String? sharedPatientMobileNumber; + String? zipCode; + bool? isRegister; + int? patientStatus; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; AddFamilyFileReq( {this.searchType, diff --git a/lib/core/model/family-file/insert_share_file_request.dart b/lib/core/model/family-file/insert_share_file_request.dart index 02fa9a0b..b153a366 100644 --- a/lib/core/model/family-file/insert_share_file_request.dart +++ b/lib/core/model/family-file/insert_share_file_request.dart @@ -1,21 +1,21 @@ class InsertSharePatientFileReq { - int responseID; - String shareFamilyPatientName; - int status; - int regionID; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; + int? responseID; + String? shareFamilyPatientName; + int? status; + int? regionID; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientID; + String? tokenID; + int? patientTypeID; + int? patientType; InsertSharePatientFileReq( {this.responseID, diff --git a/lib/core/model/feedback/COC_items.dart b/lib/core/model/feedback/COC_items.dart index 4139fc59..afbe4cf2 100644 --- a/lib/core/model/feedback/COC_items.dart +++ b/lib/core/model/feedback/COC_items.dart @@ -1,32 +1,32 @@ class COCItem { Null appointment; - String appointmentClinicName; - String appointmentDate; - String appointmentProjectName; - String cOCID; - String cOCTitle; - String channel; + String? appointmentClinicName; + String? appointmentDate; + String? appointmentProjectName; + String? cOCID; + String? cOCTitle; + String? channel; dynamic clinic; - String clinicID; - String date; + String? clinicID; + String? date; dynamic detail; dynamic doctor; - String doctorID; - String formType; - int formTypeID; + String? doctorID; + String? formType; + int? formTypeID; dynamic identificationNo; - int itemID; + int? itemID; dynamic mobileNo; dynamic naturename; dynamic patientID; dynamic patientName; dynamic project; dynamic projectID; - String solution; - String status; - String statusAr; + String? solution; + String? status; + String? statusAr; dynamic statusEn; - int statusId; + int? statusId; COCItem({ this.appointment, diff --git a/lib/core/model/feedback/request_insert_coc_item.dart b/lib/core/model/feedback/request_insert_coc_item.dart index 4bb397e6..e285999c 100644 --- a/lib/core/model/feedback/request_insert_coc_item.dart +++ b/lib/core/model/feedback/request_insert_coc_item.dart @@ -1,35 +1,36 @@ class RequestInsertCOCItem { - bool isUserLoggedIn; - String mobileNo; - int identificationNo; - int patientID; - int patientOutSA; - int patientTypeID; - String tokenID; - String patientName; - int projectID; - String fileName; - String attachment; - String uILanguage; - String browserInfo; - String cOCTypeName; - String formTypeID; - String details; - String deviceInfo; - String deviceType; - String title; - String resolution; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientType; - double appVersion; - bool forDemo; + bool? isUserLoggedIn; + String? mobileNo; + int? identificationNo; + int? patientID; + int? patientOutSA; + int? patientTypeID; + String? tokenID; + String? patientName; + int? projectID; + String? fileName; + String? attachment; + String? uILanguage; + String? browserInfo; + String? cOCTypeName; + String? formTypeID; + String? details; + String? deviceInfo; + String? deviceType; + String? title; + String? resolution; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + int? patientType; + double? appVersion; + bool? forDemo; + RequestInsertCOCItem( {this.isUserLoggedIn, this.mobileNo, diff --git a/lib/core/service/medical/reports_service.dart b/lib/core/service/medical/reports_service.dart index d80c80e4..c533c168 100644 --- a/lib/core/service/medical/reports_service.dart +++ b/lib/core/service/medical/reports_service.dart @@ -6,11 +6,11 @@ import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/pages/feedback/appointment_history.dart'; class ReportsService extends BaseService { - List reportsList = List(); - List inpatientReportsList = List(); - List appointHistoryList = List(); + List reportsList = []; + List inpatientReportsList =[]; + List appointHistoryList =[]; - List admissionsMedicalReport = List(); + List admissionsMedicalReport = []; String userAgreementContent = ""; RequestReports _requestReports = RequestReports(isReport: true, encounterType: 1, requestType: 1, patientOutSA: 0, projectID: 0);