Commit Graph

975 Commits (cc26053bc186c8ff0b3ba463df875331f0cc9878)

Author SHA1 Message Date
Elham Rababh 8147d20fc6 Merge branch 'in_patient_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes_dev
 Conflicts:
	lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
5 years ago
Elham Rababh 7830c41d02 show update button in case of in patient 5 years ago
hussam al-habibeh 8c3fc3a6f7 chief complaint in in patient 5 years ago
hussam al-habibeh ab584c792a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_soap
 Conflicts:
	lib/config/config.dart
	lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
5 years ago
Elham Rababh 1c45fcea22 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes
 Conflicts:
	lib/core/viewModel/authentication_view_model.dart
5 years ago
Elham Rababh 369eecb0a3 return special Clinical function 5 years ago
mosazaid e046928e3e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into video-stream-new
 Conflicts:
	android/app/build.gradle
	lib/core/viewModel/authentication_view_model.dart
5 years ago
mosazaid 0d3b64af7d uncomment livecare services 5 years ago
Elham Rababh ae30e23d4d rename call back files 5 years ago
Elham Rababh a502308a8a finish update on soap 5 years ago
hussam al-habibeh 36786a3079 chinging chief complaint in the soap 5 years ago
Elham Rababh e58ce34aa4 move bottom sheet to index page 5 years ago
Elham Rababh b341bd5f47 fixes issues in small devices 5 years ago
Elham Rababh 0780cafcca fixes issues in small devices 5 years ago
Elham Rababh 6b65de77e9 fix design issues on diff pages inside soap 5 years ago
Elham Rababh 7227679081 fix design 5 years ago
Elham Rababh 14a0911aec fix first step from Soap 5 years ago
Elham Rababh 88b04a8f5d fix stepper labels and translate it. 5 years ago
Elham Rababh 8a69becab3 fix header issues && exam issues 5 years ago
hussam al-habibeh d29d3e2666 adding google anlyatic to doctor app 5 years ago
hussam al-habibeh cac949f402 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical_report_changes
 Conflicts:
	lib/screens/medical-file/health_summary_page.dart
	lib/screens/patients/insurance_approval_screen_patient.dart
	lib/screens/patients/profile/medical_report/MedicalReportPage.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
5 years ago
hussam al-habibeh 64a7aca228 adding google anlyatic to doctor app 5 years ago
Elham Rababh 3b1a493d76 fix design issues on create episode and prevent exam from keep it state 5 years ago
Elham Rababh 7e57882349 fix design issues on first step form create episode 5 years ago
Elham Rababh 25d0a08105 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes 5 years ago
Elham Rababh d301c2a3f4 add new and old part form examination 5 years ago
Elham Rababh d0d6874159 create mapper for the selected items 5 years ago
Mohammad Aljammal 46683df8a9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into analytics_service 5 years ago
Elham Rababh 659e7f5886 Merge branch 'episode_fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes 5 years ago
Elham Rababh b015cb06f7 add fixes on episode 5 years ago
Mohammad Aljammal 87c906ae2b Add check if has focus 5 years ago
Mohammad Aljammal 3b6fcb4240 fix app text field custom 5 years ago
Mohammad Aljammal 1429a59138 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes 5 years ago
Mohammad Aljammal 5a61a3eaba Add missing page tob google analytics 5 years ago
Elham Rababh c3ed212e6a remove base View 5 years ago
mosazaid a84027ad6f Merge branch 'development' into video-stream-floating
# Conflicts:
#	lib/core/service/VideoCallService.dart
5 years ago
Elham Rababh 469169023a fix get allergies issues 5 years ago
Elham Rababh f52917f219 fix get allergies issues 5 years ago
Elham Rababh 9b40638f86 fix get allergies issues 5 years ago
Elham Rababh c7c6314a8d finish create episode fixes 5 years ago
Elham Rababh ac6a6e7855 keep show header in bottom sheet while it loading 5 years ago
Elham Rababh c69f122713 prevent passing data and first step from refactor examinations 5 years ago
Elham Rababh 993a266d4f fix first step from fixes soap 5 years ago
Elham Rababh 638ae40035 first step for fix first step from fixes soap 5 years ago
hussam al-habibeh ef8db07875 add patient to doctor list in live care 5 years ago
mosazaid 7cc25f6101 make floating video screen 5 years ago
hussam al-habibeh b41c0036d3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical_report_changes 5 years ago
hussam al-habibeh 158bea519e medical report fix 5 years ago
Mohammad Aljammal e8f9c958b1 Fix medical report issues 5 years ago
Elham Rababah 0006a4de57 remove comment 5 years ago
Elham Rababah 93c7797ed4 recall the service 5 years ago
Elham Rababah 0c730e8270 change the status condition 5 years ago
Elham Rababah 74294bfaf5 finish fix referral 5 years ago
Elham Rababah 7d6123f9cb Merge branches 'development' and 'refferal_out_fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into refferal_out_fixes 5 years ago
Elham Rababah 33f032b6c4 return from part on header 5 years ago
Elham Rababah 1af52dc5b7 fix referral patient 5 years ago
Mohammad Aljammal 1a735dca62 Merge branch 'medical_report_changes' into 'development'
medical report fix

See merge request Cloud_Solution/doctor_app_flutter!761
5 years ago
Mohammad Aljammal b1f3cf3ece Merge branch 'outpatient_referral_change' into 'development'
outpatirnt referral changes

See merge request Cloud_Solution/doctor_app_flutter!762
5 years ago
mosazaid d839fd3545 outpatirnt referral changes 5 years ago
hussam al-habibeh 1e35b70b01 medical report fix 5 years ago
mosazaid 1bb40ddeb9 Merge branch 'development' into video-stream-background 5 years ago
mosazaid 783c74108b video isRecord change 5 years ago
Mohammad Aljammal ec3ac18a15 Merge branch 'video-stream-background' into 'development'
Video stream background

See merge request Cloud_Solution/doctor_app_flutter!759
5 years ago
Mohammad Aljammal 9303091f20 Merge branch 'medical_report_changes' into 'development'
Medical report changes

See merge request Cloud_Solution/doctor_app_flutter!757
5 years ago
mosazaid eb62fdfe21 Merge branch 'development' into video-stream-background
# Conflicts:
#	android/app/src/main/kotlin/com/hmg/hmgDr/MainActivity.kt
#	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 a7c5e1afde finish solve keybaord issue 5 years ago
Elham Rababah e80523749b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_episode_no
 Conflicts:
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Elham Rababah 29eeb21e76 finalize create episode on Live care. 5 years ago
hussam al-habibeh 19548ccb1e Medical Report change status 5 years ago
Elham Rababah 80ef1a241d first step from fix episode in patient live care list 5 years ago
hussam al-habibeh bec5eb82bc update medical file service 5 years ago
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
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
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 321bf7825e solve video stream publisher popup window bug 5 years ago
Elham Rababah 9da1bff723 first step form sort 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 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 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 550b4a848d Merge branch 'development' into video-streaming-android 5 years ago
mosazaid 883778d278 video call 5 years ago
Elham Rababah 37e6853976 add special one first calling 5 years ago
Elham Rababah 7f3ae19fd2 remove todo 5 years ago