Commit Graph

2311 Commits (50e8e7b0d62baa46430a66b7111cc586640d6b8d)

Author SHA1 Message Date
hussam al-habibeh c652f40a89 add medical report new service 5 years ago
Mohammad Aljammal a5988c2885 Merge branch 'fixes' into 'development'
Fixes

See merge request Cloud_Solution/doctor_app_flutter!756
5 years ago
Elham Rababah 74b17c5fc9 Merge branches 'development' and 'fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes
 Conflicts:
	lib/models/patient/patiant_info_model.dart
5 years ago
Elham Rababah f5b7829e7d fix create create episode on live care 5 years ago
mosazaid 1fd9c4f2f2 Merge branch 'development' into video-stream-background
# Conflicts:
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
mosazaid e1c4721ac1 Merge branch 'development' into video_stream_fix_bugs
# Conflicts:
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Elham Rababah 0bc3b84cf8 fix sorting inside inpatient 5 years ago
mosazaid 385820fdce video stream add record icon and change button disable 5 years ago
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
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 e4a7f4e105 Merge branch 'sort_out_patient' into 'development'
first step form sort

See merge request Cloud_Solution/doctor_app_flutter!751
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
Elham Rababah 9da1bff723 first step form sort 5 years ago
Mohammad Aljammal 0e2bcd7916 Fix Qr issues 5 years ago
mosazaid 7fed1c58f3 working to open video stream from service 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 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 02f43d6e61 fix timer issue 5 years ago
Mohammad Aljammal 654a86a9b6 Add App Permissions Utils 5 years ago
Mohammad Aljammal bed7dee27c fix drop video call issue 5 years ago
Elham Rababah 4e6237f2ce fix header from lab 5 years ago
Elham Rababah b9711fce65 fix header from lab result details 5 years ago
Elham Rababah 78903043d9 fix header 5 years ago
Mohammad Aljammal 7614b4aa5c fix the video call issues 5 years ago
Mohammad Aljammal 746f44157e Add video call service 5 years ago
Elham Rababah c1ed1dc737 add loader 5 years ago
mosazaid 259a63384e fix draggable bugs 5 years ago
mosazaid 550b4a848d Merge branch 'development' into video-streaming-android 5 years ago
Mohammad Aljammal b4305a00ae Merge branch 'fix_header_out_patient' into 'development'
fix out patient header

See merge request Cloud_Solution/doctor_app_flutter!741
5 years ago
Elham Rababah f76bac898b make clinic id dynamic 5 years ago
Elham Rababah 09634716e5 Merge branches 'development' and 'special_clinic' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinic
 Conflicts:
	lib/locator.dart
5 years ago
Elham Rababah 3cf4ef4348 check if special in home page 5 years ago
Elham Rababah fee36336d8 fix out patient header 5 years ago
Mohammad Aljammal 6b44a1c3aa Merge branch 'scan_qr' into 'development'
Scan qr code refactoring

See merge request Cloud_Solution/doctor_app_flutter!740
5 years ago
mosazaid 883778d278 video call 5 years ago
Elham Rababah 37e6853976 add special one first calling 5 years ago
hussam al-habibeh 1c3391baed Scan qr code refactoring 5 years ago
Elham Rababah 7f3ae19fd2 remove todo 5 years ago
Elham Rababah 7b71bd752f add to do 5 years ago
Elham Rababah 363b55069f first step form Special Clinic 5 years ago
Mohammad Aljammal 84561a7363 Merge branch 'referral_reply' into 'development'
Scan QR Code fix

See merge request Cloud_Solution/doctor_app_flutter!739
5 years ago
hussam al-habibeh 3913f8936c Scan QR Code fix 5 years ago
Elham Rababah c46c339933 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinic
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah 1edd375fd7 first step from special clinic 5 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
5 years ago
Zohaib Iqbal Kambrani f60ff85e31 no message 5 years ago
Mohammad Aljammal 01a49ae200 Merge branch 'headers_refactor' into 'development'
Headers refactor

See merge request Cloud_Solution/doctor_app_flutter!737
5 years ago
Elham Rababah 712a742aa2 fix small issue 5 years ago
Elham Rababah 161cb1e872 fix profile height size 5 years ago
hussam al-habibeh 142fbb93fd Referrel Doctor reply 5 years ago
Elham Rababah 411746da98 remove patient type and arrival type form patient profile header 5 years ago
Zohaib Iqbal Kambrani 1b4988e5f0 no message 5 years ago
Elham Rababah bc53ca7b8a fix appointment date in header 5 years ago
Elham Rababah 3fefcf60d7 match the app header design 5 years ago
Mohammad Aljammal e77f5773dc Merge branch 'video_screen_re-design' into 'development'
change video streaming design

See merge request Cloud_Solution/doctor_app_flutter!733
5 years ago
Elham Rababah 132565c298 Merge branches 'development' and 'headers_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor 5 years ago
Elham Rababah b0938562fa Merge branches 'development' and 'fix_medical_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_medical_report
 Conflicts:
	pubspec.lock
5 years ago
mosazaid c44b3d74bb reply changes 5 years ago
Mohammad Aljammal 726d3ab885 Fix video call issue android 5 years ago
Elham Rababah 30bf59458c finish medical report 5 years ago
mosazaid 1834d9f776 change video streaming design 5 years ago
Elham Rababah e530dc0168 first step from fix medical report 5 years ago
Elham Rababah 717468b637 fix design issue 5 years ago
Elham Rababah 57399c3dcb fix issues in header 5 years ago
Elham Rababah 95425d9568 fix issues in header 5 years ago
Elham Rababah 6aef8b5878 first step refactor headers 5 years ago
mosazaid 017669c406 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
5 years ago
Elham Rababah 354a1f2dec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes 5 years ago
Elham Rababah ca0cc745d5 remove headers 5 years ago
Elham Rababah 0e513ecca8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes 5 years ago
Elham Rababah 23feb2c354 remove unused code 5 years ago
mosazaid 1b47b60155 Merge branch 'development' into reply-doctor_changes
# Conflicts:
#	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
5 years ago
mosazaid 10441e4af0 referral changes 5 years ago
Mohammad Aljammal 228df1e762 Merge branch 'end_call_fixes' into 'development'
fix font size in header

See merge request Cloud_Solution/doctor_app_flutter!730
5 years ago
Elham Rababah 4cdc654348 fix font size in header 5 years ago
Mohammad Aljammal 418918558f Merge branch 'end_call_fixes' into 'development'
End call fixes

See merge request Cloud_Solution/doctor_app_flutter!729
5 years ago
Mohammad Aljammal a0c7f7321d Merge branch 'fix_label_replay_on_referral' into 'development'
fix label on replay referral

See merge request Cloud_Solution/doctor_app_flutter!728
5 years ago
Elham Rababah cb5abfb2ec remove comment code 5 years ago
Elham Rababah 36caca0e46 test live care and general result header in lab result 5 years ago
Mohammad Aljammal 0b52b4009d fix label on replay referral 5 years ago
Elham Rababah 176c0ab97c first step from live care fixes 5 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
5 years ago
Elham Rababah b1062dd537 fix merge issue 5 years ago
Elham Rababah 2e0f6aad5c Merge branches 'development' and 'navigation_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into navigation_service
 Conflicts:
	lib/locator.dart
5 years ago
Elham Rababah 9d6a23c1a3 add NavigationService 5 years ago
Elham Rababah 3df6a55dad remove comment 5 years ago
Elham Rababah 72966c3269 fix referral patient services 5 years ago
mosazaid 663c8d1104 Merge branch 'development' into referral-outpatient 5 years ago
Mohammad Aljammal 95b00dd67d Merge branch 'fix_live_care' into 'development'
fix live care issues

See merge request Cloud_Solution/doctor_app_flutter!725
5 years ago
Mohammad Aljammal f6922ee41a Merge branch 'live_care_fixes' into 'development'
Live care fixes

See merge request Cloud_Solution/doctor_app_flutter!724
5 years ago
Elham Rababah 8a8b55d2de move show timer to its own file 5 years ago
Elham Rababah 792c85e28a fix live care icon size 5 years ago
Mohammad Aljammal a1abcaa7c0 fix live care issues 5 years ago
mosazaid ec9f628b67 Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
5 years ago
Elham Rababah f80215b6bb fix doctor id spelling in live care service, fix colors in 5 years ago
Elham Rababah d57b331df2 add timer 5 years ago
mosazaid 400420bd4d Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/service/patient/LiveCarePatientServices.dart
5 years ago
Mohammad Aljammal 6dfcbcca12 Merge branch 'procedure_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedure_refactoring
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
5 years ago
mosazaid 0fe6d880fd add livecare send instructions 5 years ago
mosazaid 0afe3b3afd livecare changes 5 years ago
mosazaid 5d0a7a4045 livecare changes 5 years ago
hussam al-habibeh c800219428 Live Care Is Login Service 5 years ago
hussam al-habibeh 25583d7bee Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favourite_prescription
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
5 years ago
hussam al-habibeh 6989235334 Live care Is Login service 5 years ago
mosazaid 66d12f8fdd procedure fixes, liveCare working 5 years ago
mosazaid b36ddf9317 add prescription to procedure type 5 years ago
mosazaid ea0658c05c Merge branch 'development' into procedure_refactoring
# Conflicts:
#	lib/core/viewModel/procedure_View_model.dart
5 years ago
mosazaid 91cd7f2b88 refactoring 5 years ago
Mohammad Aljammal 6439bb9a90 Merge branch 'favourite_prescription' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!719
5 years ago
hussam al-habibeh 4af94e6b71 hot fix 5 years ago
Mohammad Aljammal d9358bce75 hot fix in medical report 5 years ago
Mohammad Aljammal a9a7c8a73c fix patient MRN 5 years ago
Elham Rababah 8dbfb92f88 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_appointment
 Conflicts:
	ios/Podfile.lock
5 years ago
Elham Rababah 9692e54b97 fix login issue
# Conflicts:
#	lib/core/viewModel/authentication_view_model.dart
#	lib/root_page.dart
#	lib/widgets/shared/app_drawer_widget.dart
5 years ago
Elham Rababah fb6ef8fca1 fix appointment in live care 5 years ago
mosazaid 3107950f5c fix bug 5 years ago
Mohammad Aljammal 151b69ed17 Merge branch 'favourite_prescription' into 'development'
Favourite prescription

See merge request Cloud_Solution/doctor_app_flutter!714
5 years ago
hussam al-habibeh a6a8f616e1 hot fix 5 years ago
hussam al-habibeh df6a9a7822 hot fix 5 years ago
Mohammad Aljammal 61ea94faeb Merge branch 'live_care_new_services' into 'development'
Live care new services

See merge request Cloud_Solution/doctor_app_flutter!713
5 years ago
Mohammad Aljammal ad74ff00dc fix issues in android and add ChangeCallStatus services in IOS 5 years ago
mosazaid bc48d915c6 procedure refactoring 5 years ago
hussam al-habibeh 519e6f2fec Prescription favourite templates 5 years ago
mosazaid 9454e9d8af working on procedure refactoring 5 years ago
mosazaid c82a4a05d5 medical report design changes 5 years ago
hussam al-habibeh 13fb50f9be prescription refactoring 5 years ago
hussam al-habibeh 7595629c8b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_refactor
 Conflicts:
	lib/screens/prescription/add_prescription_form.dart
5 years ago
mosazaid c7ce4676f6 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 59e06f53af hot fix 5 years ago
Mohammad Aljammal 6e660883f6 Fix medical report 5 years ago
mosazaid 1b2e158a24 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 54fbe76c7b medical report fixes and vital sign 5 years ago
Mohammad Aljammal e336821f65 fix lab result 5 years ago
Mohammad Aljammal 3c325ef199 fix load procedure 5 years ago
Mohammad Aljammal 80a751ae4d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favorite_procedure_templates 5 years ago
mosazaid b16dc2092b liveCare cahnges 5 years ago
Mohammad Aljammal 2b6736ed6a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into favorite_procedure_templates
 Conflicts:
	lib/screens/procedures/add-favourite-procedure.dart
5 years ago
Mohammad Aljammal 725c87fe8b Add favorite procedure templates for lab and radiology 5 years ago
mosazaid 390a34dd81 procedure hot fix 5 years ago
mosazaid f75ac64cad procedure get template 5 years ago
Mohammad Aljammal 6620c79478 fix ui issues 5 years ago
Mohammad Aljammal cf10eba134 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_live_care_issues 5 years ago
Mohammad Aljammal 280f87e514 fix live care issues 5 years ago
hussam al-habibeh e068009527 prescription form 5 years ago
hussam al-habibeh da45f8c4b6 prescription refactoring 5 years ago
Mohammad Aljammal ad036f7133 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into text-form-field
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 281a807ec8 fix live care 5 years ago
mosazaid 41515b311c lab-result-fixes 5 years ago
Mohammad Aljammal 1391799101 fix live care user 5 years ago
Mohammad Aljammal e89d5b13ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_cear_services 5 years ago
Mohammad Aljammal 169e5301a0 Merge branch 'lab-result-special' into 'development'
lab-result-special

See merge request Cloud_Solution/doctor_app_flutter!692
5 years ago
Mohammad Aljammal 7d423d9457 Merge branch 'prescription_changes' into 'development'
procedure changes

See merge request Cloud_Solution/doctor_app_flutter!691
5 years ago
Mohammad Aljammal ac701c9806 fix live care issues 5 years ago
mosazaid 73cf681e9d lab-result-special 5 years ago
hussam al-habibeh 764578f28e procedure changes 5 years ago
Elham Rababah 69eca869b4 fix error after merge 5 years ago
Elham Rababah fdc23ce932 Merge branches 'development' and 'live_care_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_patient
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Mohammad Aljammal b9831adeb2 Merge branch 'medical-profile-services' into 'development'
Medical profile services

See merge request Cloud_Solution/doctor_app_flutter!689
5 years ago
Mohammad Aljammal d7cd818a31 Merge branch 'expansion_procedure' into 'development'
Expansion procedure

See merge request Cloud_Solution/doctor_app_flutter!687
5 years ago
hussam al-habibeh 2a44840666 hot fix 5 years ago
hussam al-habibeh 17cca30b17 procedure changes 5 years ago
hussam al-habibeh 36ce997529 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/config/config.dart
5 years ago
hussam al-habibeh f26d870d5b procedure changes 5 years ago
Elham Rababah 401516403f first step from show Video call 5 years ago
mosazaid 0cd7fa0cb2 working on livecare 5 years ago
hussam al-habibeh 269c8e21f6 hot fix 5 years ago
Mohammad Aljammal e313722743 fix bug when logout 5 years ago
mosazaid 957cf96c16 Merge branch 'development' into medical-profile-services 5 years ago
Mohammad Aljammal 899c22419f Merge branch 'live_care_patient' into 'development'
add translation

See merge request Cloud_Solution/doctor_app_flutter!686
5 years ago
mosazaid 8b2c7f1a05 livecare 5 years ago
Elham Rababah 1367f2bebb add translation 5 years ago
Mohammad Aljammal dd23640a46 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure 5 years ago
Mohammad Aljammal 5d5f9f6928 Fix issues on the add procedure 5 years ago
Mohammad Aljammal 15d826c8d1 Merge branch 'live_care_patient' into 'development'
add VC_ID

See merge request Cloud_Solution/doctor_app_flutter!685
5 years ago
mosazaid ac460f1d19 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 0ed0dbb5aa livecare changes 5 years ago
Mohammad Aljammal 2de29f0b83 Merge branch 'prescription_changes' into 'development'
adding validation and voice speach to prescription form

See merge request Cloud_Solution/doctor_app_flutter!684
5 years ago
hussam al-habibeh b6cb6362f6 adding validation and voice speach to prescription form 5 years ago
Elham Rababah 04c9a1168b add VC_ID 5 years ago
Elham Rababah 6d989e3fc3 finish new service for live care 5 years ago
mosazaid ced177e1c0 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 0798057f31 change 5 years ago
Elham Rababah d49d52458b fix birthOfDate 5 years ago
Elham Rababah 8e140abee9 make pending service dynamic 5 years ago
Elham Rababah 3557e87b75 fix loading issue 5 years ago
Elham Rababah 1bc01e0ad1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor 5 years ago
Elham Rababah 97a855ab70 return condition in home page 5 years ago
Elham Rababah 5778a4a887 view list of Live care patient 5 years ago
mosazaid fef70604be Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/config.dart
5 years ago
mosazaid 186461f3a8 hot fix 5 years ago
Mohammad Aljammal 08d72ed121 Merge branch 'prescription_changes' into 'development'
Procedure template service

See merge request Cloud_Solution/doctor_app_flutter!680
5 years ago
Elham Rababah c4b434497a Merge branches 'development' and 'html_editor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor
 Conflicts:
	lib/screens/home/home_screen.dart
5 years ago
Elham Rababah 33ceb01d67 first step from Live care patient list 5 years ago