hussam al-habibeh
|
07835aaa1b
|
medical report changes
|
5 years ago |
mosazaid
|
c722c9b05a
|
Merge branch 'development' into video-stream-background
# Conflicts:
# android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt
# lib/core/service/VideoCallService.dart
# lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
|
5 years ago |
mosazaid
|
c9d7df01e3
|
video stream keyboard changing
|
5 years ago |
hussam al-habibeh
|
c9a95188ce
|
Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_2_developemt
|
5 years ago |
hussam al-habibeh
|
6c6b043571
|
flutter 2 migration fix
|
5 years ago |
Mohammad Aljammal
|
db4501bd14
|
Merge branch 'live_care_issue' into 'development'
Live care issue
See merge request Cloud_Solution/doctor_app_flutter!753
|
5 years ago |
Mohammad Aljammal
|
d879f1da77
|
fix add prescription issue
|
5 years ago |
Mohammad Aljammal
|
e70eabe68d
|
Fix live care issues and qr code
|
5 years ago |
Mohammad Aljammal
|
b85d507781
|
Merge branch 'flutter_vervion_2_elham' into 'flutter_2_developemt'
Flutter vervion 2 elham
See merge request Cloud_Solution/doctor_app_flutter!752
|
5 years ago |
Elham Rababah
|
b8c7ce2920
|
fix header
|
5 years ago |
Elham Rababah
|
d4ff42ad88
|
Merge branches 'flutter_2_developemt' and 'flutter_vervion_2_elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_elham
|
5 years ago |
Elham Rababah
|
02307e8fac
|
fix header and verification method
|
5 years ago |
hussam al-habibeh
|
e5056c5d93
|
fix flutter 2 migration
|
5 years ago |
Elham Rababah
|
57178d3633
|
fix soap issue on flutter 2
|
5 years ago |
Elham Rababah
|
9a2ce62216
|
first step from fixing Soap
|
5 years ago |
Mohammad Aljammal
|
e4a7f4e105
|
Merge branch 'sort_out_patient' into 'development'
first step form sort
See merge request Cloud_Solution/doctor_app_flutter!751
|
5 years ago |
Mohammad Aljammal
|
cfd1912f7d
|
Merge branch 'video_stream_fix_bugs' into 'development'
Video stream fix bugs
See merge request Cloud_Solution/doctor_app_flutter!750
|
5 years ago |
hussam al-habibeh
|
550d54c034
|
flutter 2 migration fix
|
5 years ago |
mosazaid
|
8d5f86e4f2
|
Merge branch 'development' into video_stream_fix_bugs
|
5 years ago |
mosazaid
|
321bf7825e
|
solve video stream publisher popup window bug
|
5 years ago |
Mohammad Aljammal
|
b3933c1568
|
Merge branch 'fix_qr_issues' into 'development'
Fix Qr issues
See merge request Cloud_Solution/doctor_app_flutter!749
|
5 years ago |
Elham Rababah
|
9da1bff723
|
first step form sort
|
5 years ago |
Mohammad Aljammal
|
eb2b614f74
|
Merge branch 'flutter_vervion_2_elham' into 'flutter_2_developemt'
Flutter vervion 2 elham
See merge request Cloud_Solution/doctor_app_flutter!748
|
5 years ago |
Mohammad Aljammal
|
95c7161987
|
fix flutter 2 issue
|
5 years ago |
Mohammad Aljammal
|
0e2bcd7916
|
Fix Qr issues
|
5 years ago |
mosazaid
|
7fed1c58f3
|
working to open video stream from service
|
5 years ago |
Elham Rababah
|
a1ef722954
|
fix yaml
|
5 years ago |
Elham Rababah
|
329711a002
|
fix error to make the code work with flutter 2
|
5 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
|
5 years ago |
Mohammad Aljammal
|
ac5ec049da
|
Merge branch 'video_call_and_app_bar' into 'flutter_2_developemt'
Merge video call into flutter_2_development
See merge request Cloud_Solution/doctor_app_flutter!747
|
5 years ago |
Mohammad Aljammal
|
7f6128b458
|
fix app bar issues
|
5 years ago |
Mohammad Aljammal
|
4d3371e882
|
Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/live_care/end_call_screen.dart
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
lib/util/helpers.dart
lib/widgets/patients/profile/patient-profile-app-bar.dart
lib/widgets/shared/app_scaffold_widget.dart
|
5 years ago |
Mohammad Aljammal
|
78338ebc64
|
Merge branch 'video-streaming-android' into 'development'
Merge video call into 'development'
See merge request Cloud_Solution/doctor_app_flutter!745
|
5 years ago |
Mohammad Aljammal
|
327d392f6b
|
Merge branch 'headers_refactor' into 'flutter_2_developemt'
Headers refactor
See merge request Cloud_Solution/doctor_app_flutter!738
|
5 years ago |
Mohammad Aljammal
|
47dfde6e78
|
fix patient app bar
|
5 years ago |
Mohammad Aljammal
|
737d0e9bec
|
Merge branch 'flutter_2_developemt' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor
Conflicts:
lib/screens/patients/profile/lab_result/laboratory_result_page.dart
lib/screens/patients/profile/lab_result/labs_home_page.dart
lib/widgets/patients/profile/patient-profile-app-bar.dart
|
5 years ago |
Mohammad Aljammal
|
3990ba6ff7
|
Merge branch 'login_home_design' into 'flutter_2_developemt'
Login home design
See merge request Cloud_Solution/doctor_app_flutter!723
|
5 years ago |
Mohammad Aljammal
|
387f75b36c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_home_design
Conflicts:
lib/screens/home/home_patient_card.dart
lib/screens/home/home_screen.dart
|
5 years ago |
Mohammad Aljammal
|
0cb82586bd
|
Merge branch 'fix_inpatent_header' into 'development'
fix header
See merge request Cloud_Solution/doctor_app_flutter!744
|
5 years ago |
Mohammad Aljammal
|
352d3263ac
|
Merge branch 'special_clinic' into 'development'
add loader
See merge request Cloud_Solution/doctor_app_flutter!743
|
5 years ago |
Mohammad Aljammal
|
f9a989b6fd
|
Merge remote-tracking branch 'origin/video-streaming-android' into video-streaming-android
|
5 years ago |
Mohammad Aljammal
|
61c94f85b2
|
fix the end call
|
5 years ago |
mosazaid
|
c585cbb5be
|
fix timer issue
|
5 years ago |
Elham Rababah
|
bf54139647
|
first procedure
|
5 years ago |
mosazaid
|
02f43d6e61
|
fix timer issue
|
5 years ago |
Elham Rababah
|
8940de50d6
|
Merge branch 'flutter_vervion_2' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2
|
5 years ago |
Elham Rababah
|
764e2e29f5
|
first fix from procedure
|
5 years ago |
mosazaid
|
d17316f7b2
|
fix disconected stream
|
5 years ago |
hussam al-habibeh
|
e4ef47213d
|
Merge branch 'flutter_vervion_2' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2
|
5 years ago |
hussam al-habibeh
|
73f2abbea2
|
flutter 2 migration
|
5 years ago |