Commit Graph

1955 Commits (5d710054eadbb8d709b152da6467810e83121f07)

Author SHA1 Message Date
Elham Rababh 28140b6ca4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into replay_taps 4 years ago
Mohammad Aljammal 942bcd1bd3 Merge branch 'episode_inpatient_changes' into 'development'
fix login issue

See merge request Cloud_Solution/doctor_app_flutter!835
4 years ago
Mohammad Aljammal 777bdb8a0d fix login issue 4 years ago
Elham Rababh 5a821e3d64 remove create episode in case of in patinet 4 years ago
mosazaid 702bb5b8da fix design 4 years ago
mosazaid d70ad7f2c3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hot_fix_bugs 4 years ago
mosazaid 6ca3baf7cb solve lab results design issue 4 years ago
Elham Rababh c74dca1404 fix select clinic 4 years ago
Elham Rababh 5e90f14a89 add translation 4 years ago
Elham Rababh 99868a058c fix in patient issues 4 years ago
Elham Rababh f2dbfaf2be fix issue after merge the dev 4 years ago
Elham Rababh de5621a629 fix issue after merge the dev 4 years ago
Elham Rababh cdc3b36174 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/screens/patients/In_patient/in_patient_list_page.dart
4 years ago
Elham Rababh ce199f7d98 separate in patient and my in patient to 2 files 4 years ago
Mohammad Aljammal 3d7f8b5997 Merge branch 'app_bug_fixes' into 'development'
fix bug sick leave

See merge request Cloud_Solution/doctor_app_flutter!828
4 years ago
mosazaid 9598c09ea2 scroll problem 4 years ago
Elham Rababh 37cd34f568 move no data widget to separate file 4 years ago
mosazaid 6a96a9cb28 fix bug sick leave 4 years ago
Elham Rababh a1f9729091 in patient list improve performace 4 years ago
Mohammad Aljammal 0ff08801f1 Merge branch 'in-patient-medication' into 'development'
adding missing fields for medication

See merge request Cloud_Solution/doctor_app_flutter!827
4 years ago
hussam al-habibeh 763686fc76 adding missing fields for medication 4 years ago
Elham Rababh 9317173c05 add filtration on level of clinic 4 years ago
Mohammad Aljammal 09c8d9c09e Merge branch 'procedure_changes' into 'development'
dilog list & procedure changes

See merge request Cloud_Solution/doctor_app_flutter!826
4 years ago
hussam al-habibeh c5eac79522 dilog list & procedure changes 4 years ago
Elham Rababh 8fc4b1596b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/screens/patients/InPatientPage.dart
4 years ago
Elham Rababh e9e86e4d8c add filter on in patient screen by clinic and by all clinic 4 years ago
Mohammad Aljammal 680ba27bbc Merge branch 'list-performance' into 'development'
re-design UCAF to pager

See merge request Cloud_Solution/doctor_app_flutter!824
4 years ago
mosazaid 96ad55b552 re-design UCAF to pager 4 years ago
Elham Rababh 1fd192e4bc add pagination on in patient 4 years ago
mosazaid aae1cba405 re-design UCAF to pager 4 years ago
Mohammad Aljammal 3762e60552 Merge branch 'sick_leave_fix' into 'development'
Sick leave fix

See merge request Cloud_Solution/doctor_app_flutter!823
4 years ago
Mohammad Aljammal 353743b1b6 Merge branch 'all_special_lab_result' into 'development'
medication for in patient

See merge request Cloud_Solution/doctor_app_flutter!820
4 years ago
Elham Rababh a014e0140d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into replay_status 4 years ago
Elham Rababh a855dfca23 fix create episode design 4 years ago
Elham Rababh 92c791dd72 improve add subjective info 4 years ago
hussam al-habibeh 00b7aaf32a fix sick leave 4 years ago
Mohammad Aljammal e334dbd221 Merge branch 'replay_status' into 'development'
fix replay status

See merge request Cloud_Solution/doctor_app_flutter!821
4 years ago
Elham Rababh 7ef7c8225c fix replay status 4 years ago
hussam al-habibeh 8fc25538b0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result
 Conflicts:
	lib/config/config.dart
4 years ago
hussam al-habibeh 1ba47515c6 changing list genrate to list builder 4 years ago
mosazaid c9fe9ccb63 changing lists from list.generator to list builder to make it faster in big size 4 years ago
Elham Rababh 95a694a85f improve update assessment details 4 years ago
hussam al-habibeh b461af1be2 medication for in patient 4 years ago
Elham Rababh 449206c6e8 improve performance for Update Subject 4 years ago
Mohammad Aljammal ae190d8802 Merge branch 'home_screen_parallel' into 'development'
home parallel calling services

See merge request Cloud_Solution/doctor_app_flutter!817
4 years ago
mosazaid 26f37893a1 home parallel calling services 4 years ago
Elham Rababh 5bbb2049ce fix create episode url 4 years ago
Elham Rababh 4c2d55015f add loading 4 years ago
Elham Rababh cc26053bc1 episode to inpatient 4 years ago
Elham Rababh 46698a4382 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into create_episode_inpatient
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad Aljammal 441d319a9e Merge branch 'inpatient_issues' into 'development'
fix inpatient issues

See merge request Cloud_Solution/doctor_app_flutter!815
4 years ago
Mohammad Aljammal 835c8cd77d Merge branch 'fix_bugs_new' into 'development'
UI fix design

See merge request Cloud_Solution/doctor_app_flutter!814
4 years ago
Elham Rababh a4c8178695 fix inpatient issues 4 years ago
mosazaid 4ce6ff8d7d ui lab result history chart page 4 years ago
Elham Rababh 478900d4fd fix inpatient issues 4 years ago
mosazaid cdbd905a62 ui fix design 4 years ago
Elham Rababh 8eb9401941 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into replay_status
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 6b146ed00b Merge branch 'all_special_lab_result' into 'development'
All special lab result

See merge request Cloud_Solution/doctor_app_flutter!812
4 years ago
Elham Rababh 1f3d1f68fb change the status of replay 4 years ago
Mohammad Aljammal 766b563550 Merge branch 'fix_bugs_new' into 'development'
fix lap result design issue

See merge request Cloud_Solution/doctor_app_flutter!810
4 years ago
mosazaid 2acad4e5dc fix lap result design issue 4 years ago
hussam al-habibeh a0bc5b73de patient profile aligment fix 4 years ago
Mohammad Aljammal e5e7452dad Merge branch 'fix_bugs_new' into 'development'
Fix in patient screen bug

See merge request Cloud_Solution/doctor_app_flutter!809
4 years ago
mosazaid 632e930c6b fix my inpatient issue 4 years ago
Mohammad Aljammal 2a570b98be Merge branch 'all_special_lab_result' into 'development'
All special lab result

See merge request Cloud_Solution/doctor_app_flutter!807
4 years ago
hussam al-habibeh 19487ba435 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result 4 years ago
Elham Rababh df40a2dc09 first step from create episode inpatint 4 years ago
hussam al-habibeh 5241273303 all lab special result 4 years ago
mosazaid a4ba2de459 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_bugs_new 4 years ago
mosazaid dba43fb7bd bug fixes 4 years ago
hussam al-habibeh e4f350fad3 adding special lab result details 4 years ago
Elham Rababh 7e552cccd4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pagination_doctor_repay 4 years ago
Elham Rababh ae70fe1bdf first step from doctor replay 4 years ago
Mohammad Aljammal d4fec5080c Merge branch 'fix_bugs_new' into 'development'
working on lab result detail page

See merge request Cloud_Solution/doctor_app_flutter!804
4 years ago
mosazaid 829d7b9be7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_bugs_new 4 years ago
mosazaid 547eb430db working on lab result detail page 4 years ago
hussam al-habibeh 792c7aea9b all special lab result 4 years ago
Mohammad Aljammal d5cff77743 fix login issue and add new localizedValues 4 years ago
Mohammad Aljammal a33c0312b7 Merge branch 'pagination_doctor_repay' into 'development'
fix issue

See merge request Cloud_Solution/doctor_app_flutter!802
4 years ago
Mohammad Aljammal f03a6d0982 Merge branch 'in_patient_soap' into 'development'
fix add prescription

See merge request Cloud_Solution/doctor_app_flutter!801
4 years ago
Elham Rababh ff979c725e fix issue 4 years ago
hussam al-habibeh 393943a19b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_soap 4 years ago
hussam al-habibeh a845f5b48d fix add prescription 4 years ago
mosazaid 0625de2b15 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_bugs_new
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/patient_card/PatientCard.dart
4 years ago
mosazaid ac4a68600c working on lab result new service 4 years ago
Elham Rababh 076301e91a fix error happen while scrolling 4 years ago
Elham Rababh bf12203e81 fix error happen while scrolling 4 years ago
Elham Rababh 66e33b7085 fix error happen while scrolling 4 years ago
Elham Rababh 64c98ba128 modify pagination to make works on scroll 4 years ago
Elham Rababh 943463b1d9 add pagination to doctor replay 4 years ago
hussam al-habibeh de6936efb8 Profile app bar copying & lab result 4 years ago
hussam al-habibeh 0535566232 lab result & railogy fix 4 years ago
hussam al-habibeh 8d493f40fa Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_soap 4 years ago
hussam al-habibeh 528e16c3dc lab result & radiolgy fix 4 years ago
Elham Rababh 1712874c87 fix show count in home page 4 years ago
Mohammad Aljammal 1d6026f9fd Merge branch 'fix_login' into 'development'
fix issue in login and inpatient

See merge request Cloud_Solution/doctor_app_flutter!792
4 years ago
Mohammad Aljammal 800d6a1011 Merge branch 'fixes_before_live' into 'development'
fix show count in home page

See merge request Cloud_Solution/doctor_app_flutter!791
4 years ago
Mohammad Aljammal 94f7d7773f fix issue in login and inpatient 4 years ago
Elham Rababh e8c0281913 fix show count in home page 4 years ago
Mohammad Aljammal f25c93f7a2 Merge branch 'video-stream-new' into 'development'
video stream and notification

See merge request Cloud_Solution/doctor_app_flutter!779
4 years ago
Elham Rababh 2c0cdff0dc remove loader from InPatientPage.dart 4 years ago
Elham Rababh e2caebde8b some fixes before live 4 years ago
Mohammad Aljammal 8b7d61ba03 Merge branch 'episode_fixes_dev_merge' into 'development'
Episode fixes dev merge

See merge request Cloud_Solution/doctor_app_flutter!788
4 years ago
Elham Rababh 947fc7f8f8 fix issues related to add progress exam 4 years ago
Elham Rababh 79a0e0917f fix issue related to outpatient 4 years ago
Elham Rababh 53d7d68012 add badge on bottom bar in order to show number of un replied msg 4 years ago
Elham Rababh 539d8500f1 Merge branch 'in_patient_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes_dev_merge
 Conflicts:
	lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
4 years ago
hussam al-habibeh 4abd005499 SOAP For in patient 4 years ago
Elham Rababh 74a6ebebdc remove unnecessary step for inpatient 4 years ago
hussam al-habibeh 26a1758af9 Soap for in Patient chef complint 4 years ago
Elham Rababh 42ecf9a0fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes_dev 4 years ago
Elham Rababh 80b976dff3 first step from change steper 4 years ago
hussam al-habibeh 562fd1b515 chef complint for in patient 4 years ago
Elham Rababh 64697b82a6 fix issue 4 years ago
Elham Rababh c31db4890b finish doctor response 4 years ago
Elham Rababh a1aa1d5689 small on in patient cases 4 years ago
Elham Rababh 7b65f1bade small fix on in patient 4 years ago
Elham Rababh 3626857317 finish fix Special Clinical 4 years ago
Elham Rababh 21f3ab9ac8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinical 4 years ago
Elham Rababh 300ad103d3 move error to model 4 years ago
Elham Rababh 41190bc501 move error to model 4 years ago
Elham Rababh 6db5191e07 return the function code back 4 years ago
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
4 years ago
Elham Rababh 7830c41d02 show update button in case of in patient 4 years ago
hussam al-habibeh 8c3fc3a6f7 chief complaint in in patient 4 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
4 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
4 years ago
Elham Rababh 369eecb0a3 return special Clinical function 4 years ago
Elham Rababh 854f42ce96 Create Doctor Response working fine 4 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
4 years ago
mosazaid 0d3b64af7d uncomment livecare services 4 years ago
Elham Rababh ae30e23d4d rename call back files 4 years ago
Elham Rababh a502308a8a finish update on soap 4 years ago
hussam al-habibeh 36786a3079 chinging chief complaint in the soap 4 years ago
Elham Rababh e58ce34aa4 move bottom sheet to index page 4 years ago
Elham Rababh b341bd5f47 fixes issues in small devices 4 years ago
Mohammad Aljammal 243108e81a Apply the new authentication logic 4 years ago
Elham Rababh 0780cafcca fixes issues in small devices 4 years ago
Elham Rababh 6b65de77e9 fix design issues on diff pages inside soap 4 years ago
Elham Rababh 7227679081 fix design 4 years ago
Elham Rababh 14a0911aec fix first step from Soap 4 years ago
Elham Rababh 88b04a8f5d fix stepper labels and translate it. 4 years ago
Elham Rababh 8a69becab3 fix header issues && exam issues 4 years ago
hussam al-habibeh d29d3e2666 adding google anlyatic to doctor app 4 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
4 years ago
hussam al-habibeh 64a7aca228 adding google anlyatic to doctor app 4 years ago
Elham Rababh 3b1a493d76 fix design issues on create episode and prevent exam from keep it state 4 years ago
Elham Rababh 7e57882349 fix design issues on first step form create episode 4 years ago
Elham Rababh 25d0a08105 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes 4 years ago
Elham Rababh d301c2a3f4 add new and old part form examination 4 years ago
Elham Rababh d0d6874159 create mapper for the selected items 4 years ago
Mohammad Aljammal 46683df8a9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into analytics_service 4 years ago
Elham Rababh 659e7f5886 Merge branch 'episode_fixes' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes 4 years ago
Elham Rababh b015cb06f7 add fixes on episode 4 years ago
Mohammad Aljammal 87c906ae2b Add check if has focus 4 years ago
Mohammad Aljammal 3b6fcb4240 fix app text field custom 4 years ago
Mohammad Aljammal 1429a59138 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes 4 years ago
Mohammad Aljammal 5a61a3eaba Add missing page tob google analytics 4 years ago
Elham Rababh c3ed212e6a remove base View 4 years ago
mosazaid a84027ad6f Merge branch 'development' into video-stream-floating
# Conflicts:
#	lib/core/service/VideoCallService.dart
4 years ago
Elham Rababh 469169023a fix get allergies issues 4 years ago
Elham Rababh f52917f219 fix get allergies issues 4 years ago
Elham Rababh 9b40638f86 fix get allergies issues 4 years ago
Elham Rababh c7c6314a8d finish create episode fixes 4 years ago
Elham Rababh ac6a6e7855 keep show header in bottom sheet while it loading 4 years ago
Elham Rababh c69f122713 prevent passing data and first step from refactor examinations 4 years ago
Elham Rababh 993a266d4f fix first step from fixes soap 4 years ago
Elham Rababh 638ae40035 first step for fix first step from fixes soap 4 years ago
Mohammad Aljammal f3d675cdf9 Merge branch 'medical_report_changes' into 'development'
add patient to doctor list in live care

See merge request Cloud_Solution/doctor_app_flutter!771
4 years ago
hussam al-habibeh ef8db07875 add patient to doctor list in live care 4 years ago
Mohammad Aljammal d63fa42178 Merge branch 'medical_report_changes' into 'development'
Medical report changes

See merge request Cloud_Solution/doctor_app_flutter!770
4 years ago
hussam al-habibeh d19a881801 Sick Leave doctor app API 4 years ago
Mohammad Aljammal 3be4fb2986 Fix verification methods screen 4 years ago
mosazaid 7cc25f6101 make floating video screen 4 years ago
hussam al-habibeh b41c0036d3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical_report_changes 4 years ago
hussam al-habibeh 158bea519e medical report fix 4 years ago
Mohammad Aljammal e8f9c958b1 Fix medical report issues 4 years ago
Elham Rababah 0006a4de57 remove comment 4 years ago
Elham Rababah 93c7797ed4 recall the service 4 years ago
Elham Rababah 0c730e8270 change the status condition 4 years ago
Elham Rababah 74294bfaf5 finish fix referral 4 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 4 years ago
Elham Rababah 33f032b6c4 return from part on header 4 years ago
Elham Rababah 1af52dc5b7 fix referral patient 4 years ago
Mohammad Aljammal 1a735dca62 Merge branch 'medical_report_changes' into 'development'
medical report fix

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

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

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

See merge request Cloud_Solution/doctor_app_flutter!757
4 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
4 years ago
mosazaid a7c5e1afde finish solve keybaord issue 4 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
4 years ago
Elham Rababah 29eeb21e76 finalize create episode on Live care. 4 years ago
hussam al-habibeh 19548ccb1e Medical Report change status 4 years ago
Elham Rababah 80ef1a241d first step from fix episode in patient live care list 4 years ago
hussam al-habibeh bec5eb82bc update medical file service 4 years ago
hussam al-habibeh c652f40a89 add medical report new service 4 years ago