Elham Ali
|
81ae0b04d3
|
Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
|
4 years ago |
|
Elham Rababh
|
a6153db2f9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
Conflicts:
lib/client/base_app_client.dart
lib/config/localized_values.dart
lib/config/size_config.dart
lib/core/model/Prescriptions/prescription_report.dart
lib/core/model/Prescriptions/prescription_report_enh.dart
lib/core/model/auth/activation_Code_req_model.dart
lib/core/model/auth/activation_code_for_verification_screen_model.dart
lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
lib/core/model/auth/check_activation_code_request_model.dart
lib/core/model/labs/lab_result.dart
lib/core/model/patient_muse/PatientSearchRequestModel.dart
lib/core/model/procedure/get_ordered_procedure_request_model.dart
lib/core/model/referral/MyReferralPatientModel.dart
lib/core/model/sick_leave/sick_leave_patient_model.dart
lib/core/model/sick_leave/sick_leave_patient_request_model.dart
lib/core/service/VideoCallService.dart
lib/core/service/base/base_service.dart
lib/core/service/home/scan_qr_service.dart
lib/core/service/patient/LiveCarePatientServices.dart
lib/core/service/patient/MyReferralPatientService.dart
lib/core/service/patient/patient-doctor-referral-service.dart
lib/core/service/patient_medical_file/lab_order/labs_service.dart
lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart
lib/core/service/patient_medical_file/prescription/prescriptions_service.dart
lib/core/service/patient_medical_file/procedure/procedure_service.dart
lib/core/service/patient_medical_file/radiology/radiology_service.dart
lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart
lib/core/service/patient_medical_file/soap/SOAP_service.dart
lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart
lib/core/viewModel/PatientSearchViewModel.dart
lib/core/viewModel/SOAP_view_model.dart
lib/core/viewModel/authentication_view_model.dart
lib/core/viewModel/base_view_model.dart
lib/core/viewModel/dashboard_view_model.dart
lib/core/viewModel/doctor_replay_view_model.dart
lib/core/viewModel/labs_view_model.dart
lib/core/viewModel/patient-referral-viewmodel.dart
lib/core/viewModel/patient-ucaf-viewmodel.dart
lib/core/viewModel/prescription_view_model.dart
lib/core/viewModel/prescriptions_view_model.dart
lib/core/viewModel/procedure_View_model.dart
lib/core/viewModel/sick_leave_view_model.dart
lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
lib/models/SOAP/GetPhysicalExamReqModel.dart
lib/models/SOAP/my_selected_allergy.dart
lib/models/SOAP/my_selected_assement.dart
lib/models/SOAP/my_selected_examination.dart
lib/models/SOAP/my_selected_history.dart
lib/models/SOAP/post_chief_complaint_request_model.dart
lib/models/SOAP/post_physical_exam_request_model.dart
lib/models/doctor/list_gt_my_patients_question_model.dart
lib/models/doctor/profile_req_Model.dart
lib/models/doctor/replay/request_doctor_reply.dart
lib/models/livecare/start_call_res.dart
lib/models/patient/patiant_info_model.dart
lib/models/patient/progress_note_request.dart
lib/models/patient/vital_sign/vital_sign_req_model.dart
lib/models/pharmacies/pharmacies_items_request_model.dart
lib/screens/auth/verification_methods_screen.dart
lib/screens/doctor/doctor_repaly_chat.dart
lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
lib/screens/doctor/doctor_reply_screen.dart
lib/screens/doctor/my_referral_patient_screen.dart
lib/screens/home/dashboard_swipe_widget.dart
lib/screens/home/home_patient_card.dart
lib/screens/home/home_screen.dart
lib/screens/live_care/end_call_screen.dart
lib/screens/live_care/live_care_patient_screen.dart
lib/screens/live_care/video_call.dart
lib/screens/medical-file/health_summary_page.dart
lib/screens/medicine/medicine_search_screen.dart
lib/screens/patients/DischargedPatientPage.dart
lib/screens/patients/InPatientPage.dart
lib/screens/patients/PatientsInPatientScreen.dart
lib/screens/patients/insurance_approval_screen_patient.dart
lib/screens/patients/out_patient/out_patient_screen.dart
lib/screens/patients/patient_search/patient_search_header.dart
lib/screens/patients/patient_search/patient_search_result_screen.dart
lib/screens/patients/patient_search/patient_search_screen.dart
lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
lib/screens/patients/profile/UCAF/page-stepper-widget.dart
lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
lib/screens/patients/profile/lab_result/FlowChartPage.dart
lib/screens/patients/profile/lab_result/LabResultWidget.dart
lib/screens/patients/profile/lab_result/laboratory_result_page.dart
lib/screens/patients/profile/lab_result/laboratory_result_widget.dart
lib/screens/patients/profile/lab_result/labs_home_page.dart
lib/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart
lib/screens/patients/profile/medical_report/MedicalReportPage.dart
lib/screens/patients/profile/notes/note/progress_note_screen.dart
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
lib/screens/patients/profile/radiology/radiology_details_page.dart
lib/screens/patients/profile/radiology/radiology_home_page.dart
lib/screens/patients/profile/referral/my-referral-detail-screen.dart
lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart
lib/screens/patients/profile/referral/refer-patient-screen-in-patient.dart
lib/screens/patients/profile/referral/refer-patient-screen.dart
lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
lib/screens/patients/profile/referral/referred-patient-screen.dart
lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart
lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart
lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
lib/screens/patients/profile/soap_update/objective/examination_item_card.dart
lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart
lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_open_items.dart
lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart
lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart
lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart
lib/screens/patients/profile/soap_update/shared_soap_widgets/steps_widget.dart
lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart
lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
lib/screens/patients/profile/soap_update/subjective/history/priority_bar.dart
lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart
lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
lib/screens/patients/profile/soap_update/update_soap_index.dart
lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
lib/screens/prescription/add_prescription_form.dart
lib/screens/prescription/prescription_item_in_patient_page.dart
lib/screens/prescription/prescription_text_filed.dart
lib/screens/prescription/prescriptions_page.dart
lib/screens/procedures/ProcedureCard.dart
lib/screens/procedures/add-favourite-procedure.dart
lib/screens/procedures/procedure_checkout_screen.dart
lib/screens/procedures/procedure_screen.dart
lib/screens/reschedule-leaves/add-rescheduleleave.dart
lib/screens/reschedule-leaves/reschedule_leave.dart
lib/screens/sick-leave/add-sickleave.dart
lib/screens/sick-leave/show-sickleave.dart
lib/screens/sick-leave/sick_leave.dart
lib/util/VideoChannel.dart
lib/util/date-utils.dart
lib/util/translations_delegate_base.dart
lib/widgets/patients/patient-referral-item-widget.dart
lib/widgets/patients/patient_card/PatientCard.dart
lib/widgets/patients/profile/PatientProfileButton.dart
lib/widgets/patients/profile/patient-profile-app-bar.dart
lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
lib/widgets/patients/profile/profile-welcome-widget.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
lib/widgets/patients/profile/profile_medical_info_widget_search.dart
lib/widgets/patients/profile/profile_status_info_widget.dart
lib/widgets/shared/app_texts_widget.dart
lib/widgets/shared/bottom_nav_bar.dart
lib/widgets/shared/bottom_navigation_item.dart
lib/widgets/shared/buttons/app_buttons_widget.dart
lib/widgets/shared/card_with_bg_widget.dart
lib/widgets/shared/dialogs/dailog-list-select.dart
lib/widgets/shared/dialogs/master_key_dailog.dart
lib/widgets/shared/doctor_card.dart
lib/widgets/shared/doctor_card_insurance.dart
lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
lib/widgets/shared/master_key_checkbox_search_widget.dart
lib/widgets/shared/rounded_container_widget.dart
lib/widgets/shared/text_fields/app-textfield-custom.dart
lib/widgets/shared/text_fields/text_fields_utils.dart
lib/widgets/shared/user-guid/custom_validation_error.dart
lib/widgets/transitions/fade_page.dart
lib/widgets/transitions/slide_up_page.dart
pubspec.lock
pubspec.yaml
|
4 years ago |
|
Elham Rababh
|
cf498de70f
|
finish confirmation page
|
4 years ago |
Mohammad Aljammal
|
d5cff77743
|
fix login issue and add new localizedValues
|
4 years ago |
|
Mohammad Aljammal
|
243108e81a
|
Apply the new authentication logic
|
4 years ago |
hussam al-habibeh
|
07835aaa1b
|
medical report changes
|
4 years ago |
|
Mohammad Aljammal
|
e70eabe68d
|
Fix live care issues and qr code
|
4 years ago |
|
hussam al-habibeh
|
550d54c034
|
flutter 2 migration fix
|
4 years ago |
|
Elham Rababah
|
ca6306950d
|
Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_elham
Conflicts:
ios/Podfile
lib/client/base_app_client.dart
lib/core/model/patient_muse/PatientSearchRequestModel.dart
lib/core/model/referral/MyReferralPatientModel.dart
lib/core/service/patient/LiveCarePatientServices.dart
lib/core/service/patient/MyReferralPatientService.dart
lib/core/service/patient/patient_service.dart
lib/core/viewModel/LiveCarePatientViewModel.dart
lib/core/viewModel/PatientMedicalReportViewModel.dart
lib/core/viewModel/PatientSearchViewModel.dart
lib/core/viewModel/authentication_view_model.dart
lib/core/viewModel/dashboard_view_model.dart
lib/core/viewModel/patient-referral-viewmodel.dart
lib/core/viewModel/procedure_View_model.dart
lib/core/viewModel/referred_view_model.dart
lib/models/livecare/start_call_req.dart
lib/models/patient/patiant_info_model.dart
lib/screens/auth/login_screen.dart
lib/screens/auth/verification_methods_screen.dart
lib/screens/home/dashboard_slider-item-widget.dart
lib/screens/home/dashboard_swipe_widget.dart
lib/screens/home/home_page_card.dart
lib/screens/home/home_patient_card.dart
lib/screens/home/home_screen.dart
lib/screens/live_care/end_call_screen.dart
lib/screens/live_care/live-care_transfer_to_admin.dart
lib/screens/live_care/live_care_patient_screen.dart
lib/screens/medical-file/health_summary_page.dart
lib/screens/medical-file/medical_file_details.dart
lib/screens/patients/ECGPage.dart
lib/screens/patients/insurance_approval_screen_patient.dart
lib/screens/patients/insurance_approvals_details.dart
lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
lib/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart
lib/screens/patients/profile/medical_report/MedicalReportPage.dart
lib/screens/patients/profile/note/progress_note_screen.dart
lib/screens/patients/profile/profile_screen/PatientProfileCardModel.dart
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
lib/screens/patients/profile/radiology/radiology_details_page.dart
lib/screens/patients/profile/radiology/radiology_home_page.dart
lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart
lib/screens/patients/profile/referral/refer-patient-screen-in-patient.dart
lib/screens/patients/profile/referral/refer-patient-screen.dart
lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
lib/screens/patients/profile/referral/referred-patient-screen.dart
lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart
lib/screens/patients/profile/soap_update/update_soap_index.dart
lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart
lib/screens/prescription/add_favourite_prescription.dart
lib/screens/prescription/add_prescription_form.dart
lib/screens/prescription/prescription_home_screen.dart
lib/screens/prescription/prescription_item_in_patient_page.dart
lib/screens/prescription/prescription_items_page.dart
lib/screens/prescription/prescription_screen.dart
lib/screens/prescription/prescription_screen_history.dart
lib/screens/prescription/prescriptions_page.dart
lib/screens/procedures/ProcedureCard.dart
lib/screens/procedures/add-favourite-procedure.dart
lib/screens/procedures/add-procedure-form.dart
lib/screens/procedures/add_lab_home_screen.dart
lib/screens/procedures/add_lab_orders.dart
lib/screens/procedures/add_radiology_order.dart
lib/screens/procedures/add_radiology_screen.dart
lib/screens/procedures/base_add_procedure_tab_page.dart
lib/screens/procedures/entity_list_procedure_widget.dart
lib/screens/qr_reader/QR_reader_screen.dart
lib/util/VideoChannel.dart
lib/util/translations_delegate_base.dart
lib/widgets/auth/sms-popup.dart
lib/widgets/auth/verification_methods_list.dart
lib/widgets/dashboard/out_patient_stack.dart
lib/widgets/patients/patient-referral-item-widget.dart
lib/widgets/patients/patient_card/PatientCard.dart
lib/widgets/patients/profile/PatientHeaderWidgetNoAvatar.dart
lib/widgets/patients/profile/PatientProfileButton.dart
lib/widgets/patients/profile/patient-page-header-widget.dart
lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
lib/widgets/patients/profile/patient-profile-header-new-design.dart
lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
lib/widgets/patients/profile/profile-welcome-widget.dart
lib/widgets/shared/app_drawer_widget.dart
lib/widgets/shared/app_scaffold_widget.dart
lib/widgets/shared/app_texts_widget.dart
lib/widgets/shared/bottom_navigation_item.dart
lib/widgets/shared/buttons/app_buttons_widget.dart
lib/widgets/shared/drawer_item_widget.dart
pubspec.lock
|
4 years ago |
|
hussam al-habibeh
|
bb20b4d582
|
flutter 2 migration
|
4 years ago |
mosazaid
|
13ee7f6491
|
Merge branch 'videocall_popup' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into video-streaming-android
Conflicts:
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
lib/util/VideoChannel.dart
lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
|
4 years ago |
|
Mohammad Aljammal
|
ea2a635925
|
hot fix
|
4 years ago |
Zohaib Iqbal Kambrani
|
693f57a13e
|
Merge branch 'development' into ZohaibKambrani
* development: (102 commits)
prescription changes
pescription changes
fix imports
project refactoring
working on feature medical profile
prescription changes
hot fix
hot fix
hot fix
refactoring
hot fix
hot fix
add prescription form changes
Add Medical Report Page
hot fix
hot fix
add prescription changes
fix in note and AddReplayOnReferralPatient
Add Prescription changes
prescription changes
...
# Conflicts:
# lib/screens/patients/DischargedPatientPage.dart
# lib/screens/patients/ReferralDischargedPatientDetails.dart
# lib/screens/patients/insurance_approvals_details.dart
# lib/screens/patients/patients_screen.dart
# lib/screens/patients/profile/note/progress_note_screen.dart
# lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
# lib/screens/prescription/update_prescription_form.dart
# lib/screens/sick-leave/add-sickleave.dart
# lib/widgets/patients/PatientCard.dart
# pubspec.lock
|
4 years ago |
|
Elham Rababah
|
9d6a23c1a3
|
add NavigationService
|
4 years ago |
|
hussam al-habibeh
|
6e6a7deba5
|
migration Services to flutter 2
|
4 years ago |
|
Mohammad Aljammal
|
d784310c82
|
Migrate models to flutter 2
|
4 years ago |
|
Mohammad Aljammal
|
0747dfb1e0
|
Migrate to flutter 2
|
4 years ago |
|
Mohammad Aljammal
|
ad74ff00dc
|
fix issues in android and add ChangeCallStatus services in IOS
|
4 years ago |
|
mosazaid
|
f75ac64cad
|
procedure get template
|
5 years ago |
|
Mohammad Aljammal
|
281a807ec8
|
fix live care
|
5 years ago |
|
hussam al-habibeh
|
f26d870d5b
|
procedure changes
|
5 years ago |
|
Mohammad Aljammal
|
172b457092
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
|
5 years ago |
|
Mohammad Aljammal
|
40b4a83c6b
|
Fix Expansion Procedure
|
5 years ago |
|
hussam al-habibeh
|
c182928a5d
|
favourite template Procedure service
|
5 years ago |
|
hussam al-habibeh
|
3801d7b59a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
|
5 years ago |
|
mosazaid
|
9e552668c7
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
|
mosazaid
|
2fabe85b30
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
|
Mohammad Aljammal
|
1cc55d809c
|
fix authentication service
|
5 years ago |
|
mosazaid
|
deb126fdd5
|
meical report changes
|
5 years ago |
|
hussam al-habibeh
|
066acc404a
|
Procedure template service
|
5 years ago |
Mohammad Aljammal
|
a525787c19
|
Merge branch 'live_care' into 'development'
Live care
See merge request Cloud_Solution/doctor_app_flutter!668
|
5 years ago |
|
mosazaid
|
9e80a1879e
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/locator.dart
|
5 years ago |
|
mosazaid
|
fa830cf4da
|
changes
|
5 years ago |
|
Elham Rababah
|
d574dd0b16
|
return base app client
|
5 years ago |
|
Elham Rababah
|
56698a82fd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into merge_dev_into_auth_refactor
Conflicts:
lib/core/service/home/auth_service.dart
lib/core/viewModel/auth_view_model.dart
lib/core/viewModel/imei_view_model.dart
lib/locator.dart
lib/screens/auth/login_screen.dart
lib/screens/home/home_screen.dart
lib/screens/patients/patient_search/patient_search_screen.dart
lib/widgets/auth/verification_methods.dart
|
5 years ago |
|
mosazaid
|
6192d9a84f
|
working on medical-profile
|
5 years ago |
|
Mohammad Aljammal
|
1187c3b605
|
fix authentication provider
|
5 years ago |
|
Elham Rababah
|
6933b6577f
|
add session time out.
|
5 years ago |
|
Elham Rababah
|
9b34c2c833
|
first step from live care
|
5 years ago |
|
Elham Rababah
|
e0be4ec1be
|
move logout function from helper to authentication view model
|
5 years ago |
|
Mohammad Aljammal
|
8399677a0a
|
Fix Dubai user issues
|
5 years ago |
|
Mohammad Aljammal
|
bf86fcc168
|
fix in note and AddReplayOnReferralPatient
|
5 years ago |
|
Elham Rababah
|
7bc897bf39
|
fix profile issue
|
5 years ago |
|
Mohammad Aljammal
|
27a3dd1eb4
|
fix the filter page
|
5 years ago |
Haroon Amjad
|
0244334bb5
|
Update on store
|
5 years ago |
|
Elham Rababah
|
e06771a298
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
|
5 years ago |
|
Mohammad Aljammal
|
dc9f75f0ca
|
hot fixes
|
5 years ago |
|
Elham Rababah
|
cf1d4439f2
|
fix issue of out SA in case of 3 or 2 project id
|
5 years ago |
|
Mohammad Aljammal
|
4e37a16211
|
add PatientSearchRequestModel
|
5 years ago |
|
Mohammad Aljammal
|
c924ea667f
|
hot fixes
|
5 years ago |