Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design

Conflicts: lib/widgets/patients/dynamic_elements.dart
4 years ago · 228237bf96
parent 182f890e92 d0bdf8c1e8
commit 228237bf96
317 changed files with 443 additions and 444 deletions
--- a/lib/client/base_app_client.dart
+++ b/lib/client/base_app_client.dart
@ -7,8 +7,8 @@ import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
 import 'package:doctor_app_flutter/core/service/NavigationService.dart';
 import 'package:doctor_app_flutter/core/viewModel/authentication_view_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/core/model/doctor/doctor_profile_model.dart';
+import 'package:doctor_app_flutter/core/model/patient/patiant_info_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';
--- a/lib/core/model/SOAP/Allergy_model.dart
+++ b/lib/core/model/SOAP/Allergy_model.dart
--- a/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
+++ b/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
--- a/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart
+++ b/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart
--- a/lib/core/model/SOAP/GeneralGetReqForSOAP.dart
+++ b/lib/core/model/SOAP/GeneralGetReqForSOAP.dart
--- a/lib/core/model/SOAP/GetAllergiesResModel.dart
+++ b/lib/core/model/SOAP/GetAllergiesResModel.dart
--- a/lib/core/model/SOAP/GetAssessmentReqModel.dart
+++ b/lib/core/model/SOAP/GetAssessmentReqModel.dart
--- a/lib/core/model/SOAP/GetAssessmentResModel.dart
+++ b/lib/core/model/SOAP/GetAssessmentResModel.dart
--- a/lib/core/model/SOAP/GetGetProgressNoteReqModel.dart
+++ b/lib/core/model/SOAP/GetGetProgressNoteReqModel.dart
--- a/lib/core/model/SOAP/GetGetProgressNoteResModel.dart
+++ b/lib/core/model/SOAP/GetGetProgressNoteResModel.dart
--- a/lib/core/model/SOAP/GetHistoryReqModel.dart
+++ b/lib/core/model/SOAP/GetHistoryReqModel.dart
--- a/lib/core/model/SOAP/GetHistoryResModel.dart
+++ b/lib/core/model/SOAP/GetHistoryResModel.dart
--- a/lib/core/model/SOAP/GetPhysicalExamListResModel.dart
+++ b/lib/core/model/SOAP/GetPhysicalExamListResModel.dart
--- a/lib/core/model/SOAP/GetPhysicalExamReqModel.dart
+++ b/lib/core/model/SOAP/GetPhysicalExamReqModel.dart
--- a/lib/core/model/SOAP/PatchAssessmentReqModel.dart
+++ b/lib/core/model/SOAP/PatchAssessmentReqModel.dart
--- a/lib/core/model/SOAP/PostEpisodeReqModel.dart
+++ b/lib/core/model/SOAP/PostEpisodeReqModel.dart
--- a/lib/core/model/SOAP/get_Allergies_request_model.dart
+++ b/lib/core/model/SOAP/get_Allergies_request_model.dart
--- a/lib/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart
+++ b/lib/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart
--- a/lib/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart
+++ b/lib/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart
--- a/lib/core/model/SOAP/master_key_model.dart
+++ b/lib/core/model/SOAP/master_key_model.dart
--- a/lib/core/model/SOAP/order-procedure.dart
+++ b/lib/core/model/SOAP/order-procedure.dart
--- a/lib/core/model/SOAP/post_allergy_request_model.dart
+++ b/lib/core/model/SOAP/post_allergy_request_model.dart
--- a/lib/core/model/SOAP/post_assessment_request_model.dart
+++ b/lib/core/model/SOAP/post_assessment_request_model.dart
--- a/lib/core/model/SOAP/post_chief_complaint_request_model.dart
+++ b/lib/core/model/SOAP/post_chief_complaint_request_model.dart
--- a/lib/core/model/SOAP/post_histories_request_model.dart
+++ b/lib/core/model/SOAP/post_histories_request_model.dart
--- a/lib/core/model/SOAP/post_physical_exam_request_model.dart
+++ b/lib/core/model/SOAP/post_physical_exam_request_model.dart
--- a/lib/core/model/SOAP/post_progress_note_request_model.dart
+++ b/lib/core/model/SOAP/post_progress_note_request_model.dart
--- a/lib/core/model/SOAP/selected_items/my_selected_allergy.dart
+++ b/lib/core/model/SOAP/selected_items/my_selected_allergy.dart
@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';

 class MySelectedAllergy {
  MasterKeyModel selectedAllergySeverity;
--- a/lib/core/model/SOAP/selected_items/my_selected_assement.dart
+++ b/lib/core/model/SOAP/selected_items/my_selected_assement.dart
@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';

 class MySelectedAssessment {
  MasterKeyModel selectedICD;
--- a/lib/core/model/SOAP/selected_items/my_selected_examination.dart
+++ b/lib/core/model/SOAP/selected_items/my_selected_examination.dart
@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';

 class MySelectedExamination {
  MasterKeyModel selectedExamination;
--- a/lib/core/model/SOAP/selected_items/my_selected_history.dart
+++ b/lib/core/model/SOAP/selected_items/my_selected_history.dart
@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';

 class MySelectedHistory {
  MasterKeyModel selectedHistory;
--- a/lib/core/model/admisson_orders/admission_orders_model.dart
+++ b/lib/core/model/admisson_orders/admission_orders_model.dart
--- a/lib/core/model/admisson_orders/admission_orders_request_model.dart
+++ b/lib/core/model/admisson_orders/admission_orders_request_model.dart
--- a/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
+++ b/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
+import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';

 class CheckActivationCodeForDoctorAppResponseModel {
  String authenticationTokenID;
--- a/lib/core/model/chart_axis_model.dart
+++ b/lib/core/model/chart_axis_model.dart
--- a/lib/core/model/countriesModel.dart
+++ b/lib/core/model/countriesModel.dart
--- a/lib/core/model/dashboard/dashboard_model.dart
+++ b/lib/core/model/dashboard/dashboard_model.dart
--- a/lib/core/model/dashboard/get_special_clinical_care_List_Respose_Model.dart
+++ b/lib/core/model/dashboard/get_special_clinical_care_List_Respose_Model.dart
--- a/lib/core/model/dashboard/get_special_clinical_care_mapping_List_Respose_Model.dart
+++ b/lib/core/model/dashboard/get_special_clinical_care_mapping_List_Respose_Model.dart
--- a/lib/core/model/discharge_summary/GetDischargeSummaryReqModel.dart
+++ b/lib/core/model/discharge_summary/GetDischargeSummaryReqModel.dart
--- a/lib/core/model/discharge_summary/GetDischargeSummaryResModel.dart
+++ b/lib/core/model/discharge_summary/GetDischargeSummaryResModel.dart
--- a/lib/core/model/doctor/clinic_model.dart
+++ b/lib/core/model/doctor/clinic_model.dart
--- a/lib/core/model/doctor/doctor_profile_model.dart
+++ b/lib/core/model/doctor/doctor_profile_model.dart
--- a/lib/core/model/doctor/list_doctor_working_hours_table_model.dart
+++ b/lib/core/model/doctor/list_doctor_working_hours_table_model.dart
--- a/lib/core/model/doctor/list_gt_my_patients_question_model.dart
+++ b/lib/core/model/doctor/list_gt_my_patients_question_model.dart
--- a/lib/core/model/doctor/profile_req_Model.dart
+++ b/lib/core/model/doctor/profile_req_Model.dart
--- a/lib/core/model/doctor/replay/request_create_doctor_response.dart
+++ b/lib/core/model/doctor/replay/request_create_doctor_response.dart
--- a/lib/core/model/doctor/replay/request_doctor_reply.dart
+++ b/lib/core/model/doctor/replay/request_doctor_reply.dart
--- a/lib/core/model/doctor/request_add_referred_doctor_remarks.dart
+++ b/lib/core/model/doctor/request_add_referred_doctor_remarks.dart
--- a/lib/core/model/doctor/request_schedule.dart
+++ b/lib/core/model/doctor/request_schedule.dart
--- a/lib/core/model/doctor/statstics_for_certain_doctor_request.dart
+++ b/lib/core/model/doctor/statstics_for_certain_doctor_request.dart
--- a/lib/core/model/doctor/user_model.dart
+++ b/lib/core/model/doctor/user_model.dart
--- a/lib/core/model/doctor/verify_referral_doctor_remarks.dart
+++ b/lib/core/model/doctor/verify_referral_doctor_remarks.dart
--- a/lib/core/model/livecare/end_call_req.dart
+++ b/lib/core/model/livecare/end_call_req.dart
--- a/lib/core/model/livecare/get_panding_req_list.dart
+++ b/lib/core/model/livecare/get_panding_req_list.dart
--- a/lib/core/model/livecare/get_pending_res_list.dart
+++ b/lib/core/model/livecare/get_pending_res_list.dart
--- a/lib/core/model/livecare/session_status_model.dart
+++ b/lib/core/model/livecare/session_status_model.dart
--- a/lib/core/model/livecare/start_call_req.dart
+++ b/lib/core/model/livecare/start_call_req.dart
--- a/lib/core/model/livecare/start_call_res.dart
+++ b/lib/core/model/livecare/start_call_res.dart
--- a/lib/core/model/livecare/transfer_to_admin.dart
+++ b/lib/core/model/livecare/transfer_to_admin.dart
--- a/lib/core/model/operation_report/create_update_operation_report_request_model.dart
+++ b/lib/core/model/operation_report/create_update_operation_report_request_model.dart
--- a/lib/core/model/operation_report/get_operation_details_request_modle.dart
+++ b/lib/core/model/operation_report/get_operation_details_request_modle.dart
--- a/lib/core/model/operation_report/get_operation_details_response_modle.dart
+++ b/lib/core/model/operation_report/get_operation_details_response_modle.dart
--- a/lib/core/model/operation_report/get_reservations_request_model.dart
+++ b/lib/core/model/operation_report/get_reservations_request_model.dart
--- a/lib/core/model/operation_report/get_reservations_response_model.dart
+++ b/lib/core/model/operation_report/get_reservations_response_model.dart
--- a/lib/core/model/patient/MedicalReport/MedicalReportTemplate.dart
+++ b/lib/core/model/patient/MedicalReport/MedicalReportTemplate.dart
--- a/lib/core/model/patient/MedicalReport/MeidcalReportModel.dart
+++ b/lib/core/model/patient/MedicalReport/MeidcalReportModel.dart
--- a/lib/core/model/patient/PatientArrivalEntity.dart
+++ b/lib/core/model/patient/PatientArrivalEntity.dart
--- a/lib/core/model/patient/get_clinic_by_project_id_request.dart
+++ b/lib/core/model/patient/get_clinic_by_project_id_request.dart
--- a/lib/core/model/patient/get_doctor_by_clinic_id_request.dart
+++ b/lib/core/model/patient/get_doctor_by_clinic_id_request.dart
--- a/lib/core/model/patient/get_list_stp_referral_frequency_request.dart
+++ b/lib/core/model/patient/get_list_stp_referral_frequency_request.dart
--- a/lib/core/model/patient/get_pending_patient_er_model.dart
+++ b/lib/core/model/patient/get_pending_patient_er_model.dart
--- a/lib/core/model/patient/insurance_aprovals_request.dart
+++ b/lib/core/model/patient/insurance_aprovals_request.dart
--- a/lib/core/model/patient/lab_orders/lab_orders_req_model.dart
+++ b/lib/core/model/patient/lab_orders/lab_orders_req_model.dart
--- a/lib/core/model/patient/lab_orders/lab_orders_res_model.dart
+++ b/lib/core/model/patient/lab_orders/lab_orders_res_model.dart
--- a/lib/core/model/patient/lab_result/lab_result.dart
+++ b/lib/core/model/patient/lab_result/lab_result.dart
--- a/lib/core/model/patient/lab_result/lab_result_req_model.dart
+++ b/lib/core/model/patient/lab_result/lab_result_req_model.dart
--- a/lib/core/model/patient/my_referral/PendingReferral.dart
+++ b/lib/core/model/patient/my_referral/PendingReferral.dart
--- a/lib/core/model/patient/my_referral/clinic-doctor.dart
+++ b/lib/core/model/patient/my_referral/clinic-doctor.dart
--- a/lib/core/model/patient/my_referral/my_referral_patient_model.dart
+++ b/lib/core/model/patient/my_referral/my_referral_patient_model.dart
--- a/lib/core/model/patient/my_referral/my_referred_patient_model.dart
+++ b/lib/core/model/patient/my_referral/my_referred_patient_model.dart
--- a/lib/core/model/patient/orders_request.dart
+++ b/lib/core/model/patient/orders_request.dart
--- a/lib/core/model/patient/patiant_info_model.dart
+++ b/lib/core/model/patient/patiant_info_model.dart
--- a/lib/core/model/patient/patient_arrival/get_patient_arrival_list_request_model.dart
+++ b/lib/core/model/patient/patient_arrival/get_patient_arrival_list_request_model.dart
--- a/lib/core/model/patient/patient_model.dart
+++ b/lib/core/model/patient/patient_model.dart
--- a/lib/core/model/patient/prescription/prescription_report.dart
+++ b/lib/core/model/patient/prescription/prescription_report.dart
--- a/lib/core/model/patient/prescription/prescription_report_for_in_patient.dart
+++ b/lib/core/model/patient/prescription/prescription_report_for_in_patient.dart
--- a/lib/core/model/patient/prescription/prescription_req_model.dart
+++ b/lib/core/model/patient/prescription/prescription_req_model.dart
--- a/lib/core/model/patient/prescription/prescription_res_model.dart
+++ b/lib/core/model/patient/prescription/prescription_res_model.dart
--- a/lib/core/model/patient/prescription/request_prescription_report.dart
+++ b/lib/core/model/patient/prescription/request_prescription_report.dart
--- a/lib/core/model/patient/progress_note_request.dart
+++ b/lib/core/model/patient/progress_note_request.dart
--- a/lib/core/model/patient/radiology/radiology_req_model.dart
+++ b/lib/core/model/patient/radiology/radiology_req_model.dart
--- a/lib/core/model/patient/radiology/radiology_res_model.dart
+++ b/lib/core/model/patient/radiology/radiology_res_model.dart
--- a/lib/core/model/patient/reauest_prescription_report_for_in_patient.dart
+++ b/lib/core/model/patient/reauest_prescription_report_for_in_patient.dart
--- a/lib/core/model/patient/refer_to_doctor_request.dart
+++ b/lib/core/model/patient/refer_to_doctor_request.dart
--- a/lib/core/model/patient/request_my_referral_patient_model.dart
+++ b/lib/core/model/patient/request_my_referral_patient_model.dart
--- a/lib/core/model/patient/topten_users_res_model.dart
+++ b/lib/core/model/patient/topten_users_res_model.dart
@ -6,7 +6,7 @@

 *@desc:   
 */
-import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
+import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';

 //ModelResponse
 class ModelResponse {
--- a/lib/core/model/patient/vital_sign/patient-vital-sign-data.dart
+++ b/lib/core/model/patient/vital_sign/patient-vital-sign-data.dart
--- a/lib/core/model/patient/vital_sign/patient-vital-sign-history.dart
+++ b/lib/core/model/patient/vital_sign/patient-vital-sign-history.dart
--- a/lib/core/model/patient/vital_sign/vital_sign_req_model.dart
+++ b/lib/core/model/patient/vital_sign/vital_sign_req_model.dart
--- a/Show More
+++ b/Show More