Elham Rababh
|
bfd86f533a
|
small fixes
|
3 years ago |
|
Elham Ali
|
189864f4ba
|
Merge branch 'revert-8a1d88c1' into 'development'
Revert "Merge branch 'hussam_flutter_2' into 'development'"
See merge request Cloud_Solution/doctor_app_flutter!894
|
3 years ago |
|
Elham Ali
|
81ae0b04d3
|
Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
|
3 years ago |
|
Elham Ali
|
8a1d88c1f6
|
Merge branch 'hussam_flutter_2' into 'development'
Hussam flutter 2
See merge request Cloud_Solution/doctor_app_flutter!893
|
3 years ago |
hussam al-habibeh
|
24618e5232
|
flutter 2 models
|
3 years ago |
|
hussam al-habibeh
|
1146f613df
|
flutter 2 models
|
3 years ago |
|
hussam al-habibeh
|
a8adacfc5c
|
Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam_flutter_2
Conflicts:
pubspec.lock
|
3 years ago |
|
Elham Ali
|
43c670e5b1
|
Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
4 step from fix screen
See merge request Cloud_Solution/doctor_app_flutter!891
|
3 years ago |
|
hussam al-habibeh
|
948b8c877d
|
flutter 2 models
|
3 years ago |
|
Elham Rababh
|
d808f8b2ac
|
4 step from fix screen
|
3 years ago |
|
Elham Ali
|
1eb2221a00
|
Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham
See merge request Cloud_Solution/doctor_app_flutter!890
|
3 years ago |
|
Elham Rababh
|
f4a9ab14c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
Conflicts:
lib/core/service/patient/profile/discharge_summary_servive.dart
lib/core/viewModel/profile/discharge_summary_view_model.dart
lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart
lib/screens/patients/profile/discharge_summary/discharge_summary.dart
lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart
|
3 years ago |
|
Elham Rababh
|
1f28a09043
|
first step from fix screen
|
3 years ago |
|
Elham Rababh
|
ec83d72038
|
first step from fix screen
|
3 years ago |
|
Elham Ali
|
cb29b1021e
|
Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham
See merge request Cloud_Solution/doctor_app_flutter!889
|
3 years ago |
|
Elham Rababh
|
dc0f3e7235
|
fix utils && widget
|
3 years ago |
|
Elham Rababh
|
ced1c9b392
|
first step from fix service
|
3 years ago |
|
Elham Ali
|
ede9574084
|
Merge branch 'flutter_vervion_2_by_elham' into 'flutter_2_developemt'
Flutter vervion 2 by elham
See merge request Cloud_Solution/doctor_app_flutter!888
|
3 years ago |
|
Elham Rababh
|
7f9969b6cf
|
some fixes to go flutter 2
|
3 years ago |
|
Elham Rababh
|
47437c8637
|
some fixes to go flutter 2
|
3 years ago |
|
Elham Ali
|
f99ce10edf
|
Merge branch 'discharge_report' into 'development'
Discharge report
See merge request Cloud_Solution/doctor_app_flutter!887
|
3 years ago |
|
Elham Ali
|
3974586bc9
|
Merge branch 'get_pending_orders' into 'development'
Get pending orders
See merge request Cloud_Solution/doctor_app_flutter!886
|
3 years ago |
|
hussam al-habibeh
|
dfce0d20e2
|
discharge summary card
|
3 years ago |
|
Elham Rababh
|
eceb3976ad
|
fix issues happend after merge
|
3 years ago |
|
hussam al-habibeh
|
37d4dfffa2
|
all discharge summary
|
3 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
|
3 years ago |
|
Elham Rababh
|
8f0e69df3a
|
fix text fields
|
3 years ago |
|
hussam al-habibeh
|
ff1cffc24d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
|
3 years ago |
|
hussam al-habibeh
|
bc92f9b9f5
|
contries model
|
3 years ago |
|
Elham Ali
|
49205f797d
|
Merge branch 'discharge_summary' into 'development'
Discharge summary
See merge request Cloud_Solution/doctor_app_flutter!885
|
3 years ago |
|
Elham Rababh
|
6ffbf92d43
|
finish pending discharge summary
|
3 years ago |
|
Elham Rababh
|
f23607b6e4
|
first step form discharge summary
|
3 years ago |
|
Elham Ali
|
f98c34fcc6
|
Merge branch 'nov_fixes' into 'development'
fix issues inside diff pages
See merge request Cloud_Solution/doctor_app_flutter!884
|
3 years ago |
|
Elham Rababh
|
2e884c4a35
|
fix issues inside diff pages
|
3 years ago |
|
Elham Ali
|
101bc9f1b6
|
Merge branch 'hijri_calender' into 'development'
Hijri calender
See merge request Cloud_Solution/doctor_app_flutter!883
|
3 years ago |
|
Elham Rababh
|
ca854638e5
|
fix merge issue
|
3 years ago |
|
Elham Rababh
|
0bdb15b14e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hijri_calender
Conflicts:
lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
|
3 years ago |
|
Elham Ali
|
c4617250ae
|
Merge branch 'get_pending_orders' into 'development'
Get pending orders
See merge request Cloud_Solution/doctor_app_flutter!882
|
3 years ago |
|
Elham Rababh
|
8d2b6e9b08
|
finish hijri calender
|
3 years ago |
|
hussam al-habibeh
|
132d781eb5
|
conflect resorved
|
3 years ago |
|
hussam al-habibeh
|
aaabae5900
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
Conflicts:
lib/models/doctor/profile_req_Model.dart
|
3 years ago |
|
hussam al-habibeh
|
92d81700e1
|
adding country option to register page
|
3 years ago |
|
Elham Rababh
|
8e85bb239e
|
first step from hijri Calender
|
3 years ago |
|
hussam al-habibeh
|
25f65802a5
|
register search page change
|
3 years ago |
|
Elham Ali
|
61d2c6cdad
|
Merge branch 'register_patient_services' into 'development'
Register patient services
See merge request Cloud_Solution/doctor_app_flutter!881
|
3 years ago |
|
Elham Rababh
|
eb89dc3395
|
fix navigator issues
|
3 years ago |
|
Elham Rababh
|
52ec3fc0e3
|
fix navigator issues
|
3 years ago |
|
Elham Ali
|
ffba0ae352
|
Merge branch 'register_patient_services' into 'development'
fix version id
See merge request Cloud_Solution/doctor_app_flutter!880
|
3 years ago |
|
Elham Rababh
|
03acd233cf
|
fix version id
|
3 years ago |
|
Elham Ali
|
26ffd7cb7a
|
Merge branch 'register_patient_services' into 'development'
Register patient services
See merge request Cloud_Solution/doctor_app_flutter!879
|
3 years ago |