diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index c5ef0ced..6e0914f8 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:http/http.dart' as http; diff --git a/lib/models/category_models.dart b/lib/models/category_models.dart deleted file mode 100644 index bb251ad1..00000000 --- a/lib/models/category_models.dart +++ /dev/null @@ -1,14 +0,0 @@ -import 'package:flutter/cupertino.dart'; - -class Category { - final String id; - final String title; - final String image; - final String link; - - const Category( - {@required this.id, - @required this.title, - @required this.image, - @required this.link}); -} \ No newline at end of file diff --git a/lib/models/clinic_model.dart b/lib/models/doctor/clinic_model.dart similarity index 100% rename from lib/models/clinic_model.dart rename to lib/models/doctor/clinic_model.dart diff --git a/lib/models/doctor_profile_model.dart b/lib/models/doctor/doctor_profile_model.dart similarity index 100% rename from lib/models/doctor_profile_model.dart rename to lib/models/doctor/doctor_profile_model.dart diff --git a/lib/models/list_doctor_working_hours_table_model.dart b/lib/models/doctor/list_doctor_working_hours_table_model.dart similarity index 100% rename from lib/models/list_doctor_working_hours_table_model.dart rename to lib/models/doctor/list_doctor_working_hours_table_model.dart diff --git a/lib/models/list_gt_my_pationents_question_model.dart b/lib/models/doctor/list_gt_my_patients_question_model.dart similarity index 100% rename from lib/models/list_gt_my_pationents_question_model.dart rename to lib/models/doctor/list_gt_my_patients_question_model.dart diff --git a/lib/models/profile_req_Model.dart b/lib/models/doctor/profile_req_Model.dart similarity index 100% rename from lib/models/profile_req_Model.dart rename to lib/models/doctor/profile_req_Model.dart diff --git a/lib/models/request_add_referred_doctor_remarks.dart b/lib/models/doctor/request_add_referred_doctor_remarks.dart similarity index 100% rename from lib/models/request_add_referred_doctor_remarks.dart rename to lib/models/doctor/request_add_referred_doctor_remarks.dart diff --git a/lib/models/request_doctor_reply.dart b/lib/models/doctor/request_doctor_reply.dart similarity index 100% rename from lib/models/request_doctor_reply.dart rename to lib/models/doctor/request_doctor_reply.dart diff --git a/lib/models/request_schedule.dart b/lib/models/doctor/request_schedule.dart similarity index 100% rename from lib/models/request_schedule.dart rename to lib/models/doctor/request_schedule.dart diff --git a/lib/models/user_model.dart b/lib/models/doctor/user_model.dart similarity index 100% rename from lib/models/user_model.dart rename to lib/models/doctor/user_model.dart diff --git a/lib/models/verify_referral_doctor_remarks.dart b/lib/models/doctor/verify_referral_doctor_remarks.dart similarity index 100% rename from lib/models/verify_referral_doctor_remarks.dart rename to lib/models/doctor/verify_referral_doctor_remarks.dart diff --git a/lib/models/patient/lab_orders_req_model.dart b/lib/models/patient/lab_orders/lab_orders_req_model.dart similarity index 100% rename from lib/models/patient/lab_orders_req_model.dart rename to lib/models/patient/lab_orders/lab_orders_req_model.dart diff --git a/lib/models/patient/lab_orders_res_model.dart b/lib/models/patient/lab_orders/lab_orders_res_model.dart similarity index 100% rename from lib/models/patient/lab_orders_res_model.dart rename to lib/models/patient/lab_orders/lab_orders_res_model.dart diff --git a/lib/models/patient/lab_result.dart b/lib/models/patient/lab_result/lab_result.dart similarity index 100% rename from lib/models/patient/lab_result.dart rename to lib/models/patient/lab_result/lab_result.dart diff --git a/lib/models/patient/lab_result_req_model.dart b/lib/models/patient/lab_result/lab_result_req_model.dart similarity index 100% rename from lib/models/patient/lab_result_req_model.dart rename to lib/models/patient/lab_result/lab_result_req_model.dart diff --git a/lib/models/my_referral_patient_model.dart b/lib/models/patient/my_referral/my_referral_patient_model.dart similarity index 100% rename from lib/models/my_referral_patient_model.dart rename to lib/models/patient/my_referral/my_referral_patient_model.dart diff --git a/lib/models/my_referred_patient_model.dart b/lib/models/patient/my_referral/my_referred_patient_model.dart similarity index 100% rename from lib/models/my_referred_patient_model.dart rename to lib/models/patient/my_referral/my_referred_patient_model.dart diff --git a/lib/models/prescription_report.dart b/lib/models/patient/prescription/prescription_report.dart similarity index 100% rename from lib/models/prescription_report.dart rename to lib/models/patient/prescription/prescription_report.dart diff --git a/lib/models/patient/prescription_report_for_in_patient.dart b/lib/models/patient/prescription/prescription_report_for_in_patient.dart similarity index 100% rename from lib/models/patient/prescription_report_for_in_patient.dart rename to lib/models/patient/prescription/prescription_report_for_in_patient.dart diff --git a/lib/models/patient/prescription_req_model.dart b/lib/models/patient/prescription/prescription_req_model.dart similarity index 100% rename from lib/models/patient/prescription_req_model.dart rename to lib/models/patient/prescription/prescription_req_model.dart diff --git a/lib/models/patient/prescription_res_model.dart b/lib/models/patient/prescription/prescription_res_model.dart similarity index 100% rename from lib/models/patient/prescription_res_model.dart rename to lib/models/patient/prescription/prescription_res_model.dart diff --git a/lib/models/request_prescription_report.dart b/lib/models/patient/prescription/request_prescription_report.dart similarity index 100% rename from lib/models/request_prescription_report.dart rename to lib/models/patient/prescription/request_prescription_report.dart diff --git a/lib/models/patient/radiology_req_model.dart b/lib/models/patient/radiology/radiology_req_model.dart similarity index 100% rename from lib/models/patient/radiology_req_model.dart rename to lib/models/patient/radiology/radiology_req_model.dart diff --git a/lib/models/patient/radiology_res_model.dart b/lib/models/patient/radiology/radiology_res_model.dart similarity index 100% rename from lib/models/patient/radiology_res_model.dart rename to lib/models/patient/radiology/radiology_res_model.dart diff --git a/lib/models/request_my_referral_patient_model.dart b/lib/models/patient/request_my_referral_patient_model.dart similarity index 100% rename from lib/models/request_my_referral_patient_model.dart rename to lib/models/patient/request_my_referral_patient_model.dart diff --git a/lib/models/patient/vital_sign_req_model.dart b/lib/models/patient/vital_sign/vital_sign_req_model.dart similarity index 100% rename from lib/models/patient/vital_sign_req_model.dart rename to lib/models/patient/vital_sign/vital_sign_req_model.dart diff --git a/lib/models/patient/vital_sign_res_model.dart b/lib/models/patient/vital_sign/vital_sign_res_model.dart similarity index 100% rename from lib/models/patient/vital_sign_res_model.dart rename to lib/models/patient/vital_sign/vital_sign_res_model.dart diff --git a/lib/models/pharmacies_List_request_model.dart b/lib/models/pharmacies/pharmacies_List_request_model.dart similarity index 100% rename from lib/models/pharmacies_List_request_model.dart rename to lib/models/pharmacies/pharmacies_List_request_model.dart diff --git a/lib/models/pharmacies_items_request_model.dart b/lib/models/pharmacies/pharmacies_items_request_model.dart similarity index 100% rename from lib/models/pharmacies_items_request_model.dart rename to lib/models/pharmacies/pharmacies_items_request_model.dart diff --git a/lib/providers/auth_provider.dart b/lib/providers/auth_provider.dart index f718eaf9..11f1667f 100644 --- a/lib/providers/auth_provider.dart +++ b/lib/providers/auth_provider.dart @@ -1,10 +1,10 @@ import 'package:doctor_app_flutter/client/base_app_client.dart'; -import 'package:doctor_app_flutter/models/clinic_model.dart'; +import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:flutter/cupertino.dart'; -import '../models/user_model.dart'; +import '../models/doctor/user_model.dart'; const LOGIN_URL = 'Sentry.svc/REST/MemberLogIN_New'; const INSERT_DEVICE_IMEI = 'Sentry.svc/REST/DoctorApplication_INSERTDeviceIMEI'; diff --git a/lib/providers/doctor_reply_provider.dart b/lib/providers/doctor_reply_provider.dart index 493cb472..bc5e401c 100644 --- a/lib/providers/doctor_reply_provider.dart +++ b/lib/providers/doctor_reply_provider.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/client/base_app_client.dart'; -import 'package:doctor_app_flutter/models/request_doctor_reply.dart'; -import 'package:doctor_app_flutter/models/list_gt_my_pationents_question_model.dart'; +import 'package:doctor_app_flutter/models/doctor/request_doctor_reply.dart'; +import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import 'package:flutter/cupertino.dart'; class DoctorReplyProvider with ChangeNotifier { diff --git a/lib/providers/medicine_provider.dart b/lib/providers/medicine_provider.dart index a0d8f4ed..661a5e81 100644 --- a/lib/providers/medicine_provider.dart +++ b/lib/providers/medicine_provider.dart @@ -3,8 +3,8 @@ import 'dart:convert'; import 'package:doctor_app_flutter/client/app_client.dart'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'package:doctor_app_flutter/models/pharmacies_List_request_model.dart'; -import 'package:doctor_app_flutter/models/pharmacies_items_request_model.dart'; +import 'package:doctor_app_flutter/models/pharmacies/pharmacies_List_request_model.dart'; +import 'package:doctor_app_flutter/models/pharmacies/pharmacies_items_request_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/providers/patients_provider.dart b/lib/providers/patients_provider.dart index 2d1f4fe1..c525668b 100644 --- a/lib/providers/patients_provider.dart +++ b/lib/providers/patients_provider.dart @@ -3,29 +3,29 @@ import 'dart:convert'; import 'package:doctor_app_flutter/client/app_client.dart'; import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/patient/get_clinic_by_project_id_request.dart'; import 'package:doctor_app_flutter/models/patient/get_doctor_by_clinic_id_request.dart'; import 'package:doctor_app_flutter/models/patient/get_list_stp_referral_frequency_request.dart'; -import 'package:doctor_app_flutter/models/patient/lab_orders_res_model.dart'; -import 'package:doctor_app_flutter/models/patient/lab_result.dart'; -import 'package:doctor_app_flutter/models/patient/lab_result_req_model.dart'; +import 'package:doctor_app_flutter/models/patient/lab_orders/lab_orders_res_model.dart'; +import 'package:doctor_app_flutter/models/patient/lab_result/lab_result.dart'; +import 'package:doctor_app_flutter/models/patient/lab_result/lab_result_req_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; -import 'package:doctor_app_flutter/models/patient/prescription_report_for_in_patient.dart'; -import 'package:doctor_app_flutter/models/patient/prescription_res_model.dart'; -import 'package:doctor_app_flutter/models/patient/radiology_res_model.dart'; +import 'package:doctor_app_flutter/models/patient/prescription/prescription_report_for_in_patient.dart'; +import 'package:doctor_app_flutter/models/patient/prescription/prescription_res_model.dart'; +import 'package:doctor_app_flutter/models/patient/radiology/radiology_res_model.dart'; import 'package:doctor_app_flutter/models/patient/refer_to_doctor_request.dart'; -import 'package:doctor_app_flutter/models/prescription_report.dart'; +import 'package:doctor_app_flutter/models/patient/prescription/prescription_report.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:flutter/cupertino.dart'; import '../config/config.dart'; -import '../models/patient/lab_orders_res_model.dart'; +import '../models/patient/lab_orders/lab_orders_res_model.dart'; import '../models/patient/patiant_info_model.dart'; import '../models/patient/patient_model.dart'; -import '../models/patient/prescription_res_model.dart'; -import '../models/patient/radiology_res_model.dart'; -import '../models/patient/vital_sign_res_model.dart'; +import '../models/patient/prescription/prescription_res_model.dart'; +import '../models/patient/radiology/radiology_res_model.dart'; +import '../models/patient/vital_sign/vital_sign_res_model.dart'; import '../util/helpers.dart'; Helpers helpers = Helpers(); diff --git a/lib/providers/referral_patient_provider.dart b/lib/providers/referral_patient_provider.dart index 84e27e98..d7270e65 100644 --- a/lib/providers/referral_patient_provider.dart +++ b/lib/providers/referral_patient_provider.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/client/base_app_client.dart'; -import 'package:doctor_app_flutter/models/my_referral_patient_model.dart'; -import 'package:doctor_app_flutter/models/request_add_referred_doctor_remarks.dart'; -import 'package:doctor_app_flutter/models/request_my_referral_patient_model.dart'; +import 'package:doctor_app_flutter/models/patient/my_referral/my_referral_patient_model.dart'; +import 'package:doctor_app_flutter/models/doctor/request_add_referred_doctor_remarks.dart'; +import 'package:doctor_app_flutter/models/patient/request_my_referral_patient_model.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/providers/referred_patient_provider.dart b/lib/providers/referred_patient_provider.dart index 9234da69..4d7780b2 100644 --- a/lib/providers/referred_patient_provider.dart +++ b/lib/providers/referred_patient_provider.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/client/base_app_client.dart'; -import 'package:doctor_app_flutter/models/my_referred_patient_model.dart'; -import 'package:doctor_app_flutter/models/request_my_referral_patient_model.dart'; -import 'package:doctor_app_flutter/models/verify_referral_doctor_remarks.dart'; +import 'package:doctor_app_flutter/models/patient/my_referral/my_referred_patient_model.dart'; +import 'package:doctor_app_flutter/models/patient/request_my_referral_patient_model.dart'; +import 'package:doctor_app_flutter/models/doctor/verify_referral_doctor_remarks.dart'; import 'package:flutter/cupertino.dart'; import '../util/helpers.dart'; diff --git a/lib/providers/schedule_provider.dart b/lib/providers/schedule_provider.dart index 057219a1..0bd98af7 100644 --- a/lib/providers/schedule_provider.dart +++ b/lib/providers/schedule_provider.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:flutter/cupertino.dart'; -import '../models/list_doctor_working_hours_table_model.dart'; -import '../models/request_schedule.dart'; +import '../models/doctor/list_doctor_working_hours_table_model.dart'; +import '../models/doctor/request_schedule.dart'; class ScheduleProvider with ChangeNotifier { List listDoctorWorkingHoursTable = []; diff --git a/lib/screens/QR_reader_screen.dart b/lib/screens/QR_reader_screen.dart index d89000ef..927ce478 100644 --- a/lib/screens/QR_reader_screen.dart +++ b/lib/screens/QR_reader_screen.dart @@ -1,7 +1,7 @@ import 'package:barcode_scan/platform_wrapper.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart'; diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index ac07b71f..b4448d23 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -1,9 +1,9 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; -import 'package:doctor_app_flutter/models/clinic_model.dart'; -import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; -import 'package:doctor_app_flutter/models/profile_req_Model.dart'; +import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; +import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart'; import 'package:doctor_app_flutter/providers/auth_provider.dart'; import 'package:doctor_app_flutter/providers/doctor_reply_provider.dart'; import 'package:doctor_app_flutter/providers/hospital_provider.dart'; diff --git a/lib/screens/patients/out_patient_prescription_details_screen.dart b/lib/screens/patients/out_patient_prescription_details_screen.dart index a8f97290..e87704b7 100644 --- a/lib/screens/patients/out_patient_prescription_details_screen.dart +++ b/lib/screens/patients/out_patient_prescription_details_screen.dart @@ -1,5 +1,5 @@ -import 'package:doctor_app_flutter/models/patient/prescription_res_model.dart'; -import 'package:doctor_app_flutter/models/request_prescription_report.dart'; +import 'package:doctor_app_flutter/models/patient/prescription/prescription_res_model.dart'; +import 'package:doctor_app_flutter/models/patient/prescription/request_prescription_report.dart'; import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/screens/patients/profile/prescriptions/out_patient_prescription_details_item.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index 7b151ebf..eec2c9a1 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -18,7 +18,7 @@ import 'package:flutter/rendering.dart'; import '../../lookups/patient_lookup.dart'; import '../../widgets/patients/dynamic_elements.dart'; import '../../config/config.dart'; -import '../../models/doctor_profile_model.dart'; +import '../../models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/patients/profile/lab_result/lab_orders_screen.dart b/lib/screens/patients/profile/lab_result/lab_orders_screen.dart index ce50504c..1fa71dc0 100644 --- a/lib/screens/patients/profile/lab_result/lab_orders_screen.dart +++ b/lib/screens/patients/profile/lab_result/lab_orders_screen.dart @@ -8,7 +8,7 @@ import 'package:provider/provider.dart'; import '../../../../config/shared_pref_kay.dart'; import '../../../../config/size_config.dart'; -import '../../../../models/patient/lab_orders_req_model.dart'; +import '../../../../models/patient/lab_orders/lab_orders_req_model.dart'; import '../../../../models/patient/patiant_info_model.dart'; import '../../../../providers/patients_provider.dart'; import '../../../../util/dr_app_shared_pref.dart'; diff --git a/lib/screens/patients/profile/lab_result/lab_result_secreen.dart b/lib/screens/patients/profile/lab_result/lab_result_secreen.dart index 54c9e30a..70f4b8a3 100644 --- a/lib/screens/patients/profile/lab_result/lab_result_secreen.dart +++ b/lib/screens/patients/profile/lab_result/lab_result_secreen.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/models/patient/lab_orders_res_model.dart'; +import 'package:doctor_app_flutter/models/patient/lab_orders/lab_orders_res_model.dart'; import 'package:doctor_app_flutter/providers/patients_provider.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/widgets/doctor/lab_result_widget.dart'; diff --git a/lib/screens/patients/profile/prescriptions/in_patient_prescription_details_screen.dart b/lib/screens/patients/profile/prescriptions/in_patient_prescription_details_screen.dart index f4a8a395..18251d79 100644 --- a/lib/screens/patients/profile/prescriptions/in_patient_prescription_details_screen.dart +++ b/lib/screens/patients/profile/prescriptions/in_patient_prescription_details_screen.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/models/patient/prescription_report_for_in_patient.dart'; +import 'package:doctor_app_flutter/models/patient/prescription/prescription_report_for_in_patient.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; diff --git a/lib/screens/patients/profile/prescriptions/out_patient_prescription_details_item.dart b/lib/screens/patients/profile/prescriptions/out_patient_prescription_details_item.dart index fc212afe..50585143 100644 --- a/lib/screens/patients/profile/prescriptions/out_patient_prescription_details_item.dart +++ b/lib/screens/patients/profile/prescriptions/out_patient_prescription_details_item.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/models/prescription_report.dart'; +import 'package:doctor_app_flutter/models/patient/prescription/prescription_report.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/screens/patients/profile/prescriptions/prescriptions_screen.dart b/lib/screens/patients/profile/prescriptions/prescriptions_screen.dart index 39e809e3..afb880b4 100644 --- a/lib/screens/patients/profile/prescriptions/prescriptions_screen.dart +++ b/lib/screens/patients/profile/prescriptions/prescriptions_screen.dart @@ -10,7 +10,7 @@ import 'package:provider/provider.dart'; import '../../../../config/shared_pref_kay.dart'; import '../../../../config/size_config.dart'; import '../../../../models/patient/patiant_info_model.dart'; -import '../../../../models/patient/prescription_req_model.dart'; +import '../../../../models/patient/prescription/prescription_req_model.dart'; import '../../../../providers/patients_provider.dart'; import '../../../../util/dr_app_shared_pref.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/radiology/radiology_screen.dart b/lib/screens/patients/profile/radiology/radiology_screen.dart index 19962c43..3db9da32 100644 --- a/lib/screens/patients/profile/radiology/radiology_screen.dart +++ b/lib/screens/patients/profile/radiology/radiology_screen.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/models/patient/radiology/radiology_req_model.dart'; import 'package:doctor_app_flutter/screens/patients/profile/radiology/radiology_report_screen.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; @@ -7,14 +8,11 @@ import 'package:provider/provider.dart'; import '../../../../config/shared_pref_kay.dart'; import '../../../../config/size_config.dart'; import '../../../../models/patient/patiant_info_model.dart'; -import '../../../../models/patient/radiology_req_model.dart'; import '../../../../providers/patients_provider.dart'; import '../../../../util/dr_app_shared_pref.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart'; import '../../../../widgets/shared/app_texts_widget.dart'; -import '../../../../widgets/shared/card_with_bg_widget.dart'; import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; -import '../../../../widgets/shared/profile_image_widget.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart index 8317cb2a..e8d49c8f 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/models/patient/vital_sign/vital_sign_req_model.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:flutter/material.dart'; @@ -7,8 +8,7 @@ import '../../../../config/shared_pref_kay.dart'; import '../../../../config/size_config.dart'; import '../../../../lookups/patient_lookup.dart'; import '../../../../models/patient/patiant_info_model.dart'; -import '../../../../models/patient/vital_sign_req_model.dart'; -import '../../../../models/patient/vital_sign_res_model.dart'; +import '../../../../models/patient/vital_sign/vital_sign_res_model.dart'; import '../../../../providers/patients_provider.dart'; import '../../../../routes.dart'; import '../../../../screens/patients/profile/vital_sign/vital_sign_item.dart'; diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart index 55f636d2..ebe3b9d9 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../../../lookups/patient_lookup.dart'; -import '../../../../models/patient/vital_sign_res_model.dart'; +import '../../../../models/patient/vital_sign/vital_sign_res_model.dart'; import '../../../../providers/patients_provider.dart'; import '../../../../screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart index a03a031c..64ab7bf3 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_screen.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/models/patient/vital_sign/vital_sign_req_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:flutter/material.dart'; @@ -6,7 +7,6 @@ import 'package:provider/provider.dart'; import '../../../../config/shared_pref_kay.dart'; import '../../../../config/size_config.dart'; import '../../../../models/patient/patiant_info_model.dart'; -import '../../../../models/patient/vital_sign_req_model.dart'; import '../../../../providers/patients_provider.dart'; import '../../../../util/dr_app_shared_pref.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart'; diff --git a/lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart b/lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart index 1959ca52..7ae4937a 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sing_chart_and_detials.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/models/patient/vital_sign_res_model.dart'; +import 'package:doctor_app_flutter/models/patient/vital_sign/vital_sign_res_model.dart'; import 'package:doctor_app_flutter/widgets/patients/vital_sign_details_wideget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier.dart'; import 'package:doctor_app_flutter/widgets/shared/charts/app_time_series_chart.dart'; diff --git a/lib/screens/profile_screen.dart b/lib/screens/profile_screen.dart index 979e187d..fa9869ad 100644 --- a/lib/screens/profile_screen.dart +++ b/lib/screens/profile_screen.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:flutter/material.dart'; import '../config/size_config.dart'; diff --git a/lib/util/helpers.dart b/lib/util/helpers.dart index aa92b253..416c723e 100644 --- a/lib/util/helpers.dart +++ b/lib/util/helpers.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/models/list_doctor_working_hours_table_model.dart'; +import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/widgets/auth/login_form.dart b/lib/widgets/auth/login_form.dart index b575ba98..1b800613 100644 --- a/lib/widgets/auth/login_form.dart +++ b/lib/widgets/auth/login_form.dart @@ -9,7 +9,7 @@ import 'package:provider/provider.dart'; import '../../config/shared_pref_kay.dart'; import '../../config/size_config.dart'; -import '../../models/user_model.dart'; +import '../../models/doctor/user_model.dart'; import '../../providers/auth_provider.dart'; import '../../providers/hospital_provider.dart'; import '../../routes.dart'; diff --git a/lib/widgets/auth/verfiy_account.dart b/lib/widgets/auth/verfiy_account.dart index 0689da6b..af3ed2e2 100644 --- a/lib/widgets/auth/verfiy_account.dart +++ b/lib/widgets/auth/verfiy_account.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'package:doctor_app_flutter/models/clinic_model.dart'; -import 'package:doctor_app_flutter/models/profile_req_Model.dart'; +import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; +import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart'; import 'package:doctor_app_flutter/widgets/auth/show_timer_text.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; diff --git a/lib/widgets/doctor/doctor_reply_widget.dart b/lib/widgets/doctor/doctor_reply_widget.dart index 0b6620de..3413749a 100644 --- a/lib/widgets/doctor/doctor_reply_widget.dart +++ b/lib/widgets/doctor/doctor_reply_widget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/models/list_gt_my_pationents_question_model.dart'; +import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; diff --git a/lib/widgets/doctor/lab_result_widget.dart b/lib/widgets/doctor/lab_result_widget.dart index 5ae4f901..3f6facce 100644 --- a/lib/widgets/doctor/lab_result_widget.dart +++ b/lib/widgets/doctor/lab_result_widget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/models/patient/lab_result.dart'; +import 'package:doctor_app_flutter/models/patient/lab_result/lab_result.dart'; import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart'; diff --git a/lib/widgets/doctor/my_referral_patient_widget.dart b/lib/widgets/doctor/my_referral_patient_widget.dart index 7d35e389..7b435e9b 100644 --- a/lib/widgets/doctor/my_referral_patient_widget.dart +++ b/lib/widgets/doctor/my_referral_patient_widget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/models/my_referral_patient_model.dart'; +import 'package:doctor_app_flutter/models/patient/my_referral/my_referral_patient_model.dart'; import 'package:doctor_app_flutter/providers/referral_patient_provider.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; diff --git a/lib/widgets/doctor/my_referred_patient_widget.dart b/lib/widgets/doctor/my_referred_patient_widget.dart index 0ff1e433..c4ad4f29 100644 --- a/lib/widgets/doctor/my_referred_patient_widget.dart +++ b/lib/widgets/doctor/my_referred_patient_widget.dart @@ -1,5 +1,5 @@ -import 'package:doctor_app_flutter/models/my_referral_patient_model.dart'; -import 'package:doctor_app_flutter/models/my_referred_patient_model.dart'; +import 'package:doctor_app_flutter/models/patient/my_referral/my_referral_patient_model.dart'; +import 'package:doctor_app_flutter/models/patient/my_referral/my_referred_patient_model.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/doctor/my_schedule_widget.dart b/lib/widgets/doctor/my_schedule_widget.dart index 48f70d7c..68194a31 100644 --- a/lib/widgets/doctor/my_schedule_widget.dart +++ b/lib/widgets/doctor/my_schedule_widget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/models/list_doctor_working_hours_table_model.dart'; +import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart'; diff --git a/lib/widgets/patients/profile/prescription_in_patinets_widget.dart b/lib/widgets/patients/profile/prescription_in_patinets_widget.dart index cafa6290..a5b9d014 100644 --- a/lib/widgets/patients/profile/prescription_in_patinets_widget.dart +++ b/lib/widgets/patients/profile/prescription_in_patinets_widget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/models/patient/prescription_report_for_in_patient.dart'; +import 'package:doctor_app_flutter/models/patient/prescription/prescription_report_for_in_patient.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart'; diff --git a/lib/widgets/patients/profile/prescription_out_patinets_widget.dart b/lib/widgets/patients/profile/prescription_out_patinets_widget.dart index bedd6427..fd43e48d 100644 --- a/lib/widgets/patients/profile/prescription_out_patinets_widget.dart +++ b/lib/widgets/patients/profile/prescription_out_patinets_widget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/models/patient/prescription_res_model.dart'; +import 'package:doctor_app_flutter/models/patient/prescription/prescription_res_model.dart'; import 'package:doctor_app_flutter/screens/patients/out_patient_prescription_details_screen.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart'; diff --git a/lib/widgets/patients/vital_sign_details_wideget.dart b/lib/widgets/patients/vital_sign_details_wideget.dart index c706e0ad..166680ca 100644 --- a/lib/widgets/patients/vital_sign_details_wideget.dart +++ b/lib/widgets/patients/vital_sign_details_wideget.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/models/patient/vital_sign_res_model.dart'; +import 'package:doctor_app_flutter/models/patient/vital_sign/vital_sign_res_model.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index 16f41a48..71cba13b 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -12,7 +12,7 @@ import '../../util/dr_app_shared_pref.dart'; import '../../widgets/shared/drawer_item_widget.dart'; import '../../widgets/shared/rounded_container_widget.dart'; import 'app_texts_widget.dart'; -import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; +import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); diff --git a/lib/widgets/shared/charts/app_time_series_chart.dart b/lib/widgets/shared/charts/app_time_series_chart.dart index d9e77120..f4bd354e 100644 --- a/lib/widgets/shared/charts/app_time_series_chart.dart +++ b/lib/widgets/shared/charts/app_time_series_chart.dart @@ -2,7 +2,7 @@ import 'package:charts_flutter/flutter.dart' as charts; import 'package:flutter/material.dart'; import '../../../config/size_config.dart'; -import '../../../models/patient/vital_sign_res_model.dart'; +import '../../../models/patient/vital_sign/vital_sign_res_model.dart'; import '../../../widgets/shared/rounded_container_widget.dart'; /* diff --git a/pubspec.lock b/pubspec.lock index 20f3bbd9..cafaf489 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -127,6 +127,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "7.1.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" charcode: dependency: transitive description: @@ -155,6 +162,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.2" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" code_builder: dependency: transitive description: @@ -246,6 +260,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.1.4" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" fixnum: dependency: transitive description: @@ -284,13 +305,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.7" - flutter_svg: - dependency: "direct main" - description: - name: flutter_svg - url: "https://pub.dartlang.org" - source: hosted - version: "0.17.4" flutter_test: dependency: "direct dev" description: flutter @@ -357,13 +371,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.4" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.12" imei_plugin: dependency: "direct main" description: @@ -475,21 +482,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" - path_drawing: - dependency: transitive - description: - name: path_drawing - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.1" - path_parsing: - dependency: transitive - description: - name: path_parsing - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.4" + version: "1.7.0" pedantic: dependency: transitive description: @@ -518,13 +511,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.0" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" platform: dependency: transitive description: @@ -697,7 +683,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.15" + version: "0.2.16" timing: dependency: transitive description: @@ -761,13 +747,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.0" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.6.1" yaml: dependency: transitive description: @@ -776,5 +755,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.7.0 <3.0.0" + dart: ">=2.9.0-14.0.dev <3.0.0" flutter: ">=1.12.13+hotfix.5 <2.0.0"