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 |
Mohammad Aljammal
|
a5988c2885
|
Merge branch 'fixes' into 'development'
Fixes
See merge request Cloud_Solution/doctor_app_flutter!756
|
4 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
|
4 years ago |
Elham Rababah
|
f5b7829e7d
|
fix create create episode on live care
|
4 years ago |
mosazaid
|
1fd9c4f2f2
|
Merge branch 'development' into video-stream-background
# Conflicts:
# lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
|
4 years ago |
mosazaid
|
e1c4721ac1
|
Merge branch 'development' into video_stream_fix_bugs
# Conflicts:
# lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
|
4 years ago |
Elham Rababah
|
0bc3b84cf8
|
fix sorting inside inpatient
|
4 years ago |
mosazaid
|
385820fdce
|
video stream add record icon and change button disable
|
4 years ago |
hussam al-habibeh
|
07835aaa1b
|
medical report changes
|
4 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
|
4 years ago |
mosazaid
|
c9d7df01e3
|
video stream keyboard changing
|
4 years ago |
Mohammad Aljammal
|
d879f1da77
|
fix add prescription issue
|
4 years ago |
Mohammad Aljammal
|
e70eabe68d
|
Fix live care issues and qr code
|
4 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
|
4 years ago |
mosazaid
|
8d5f86e4f2
|
Merge branch 'development' into video_stream_fix_bugs
|
4 years ago |
mosazaid
|
321bf7825e
|
solve video stream publisher popup window bug
|
4 years ago |
Elham Rababah
|
9da1bff723
|
first step form sort
|
4 years ago |
Mohammad Aljammal
|
0e2bcd7916
|
Fix Qr issues
|
4 years ago |
mosazaid
|
7fed1c58f3
|
working to open video stream from service
|
4 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
|
4 years ago |
Mohammad Aljammal
|
0cb82586bd
|
Merge branch 'fix_inpatent_header' into 'development'
fix header
See merge request Cloud_Solution/doctor_app_flutter!744
|
4 years ago |
Mohammad Aljammal
|
f9a989b6fd
|
Merge remote-tracking branch 'origin/video-streaming-android' into video-streaming-android
|
4 years ago |
Mohammad Aljammal
|
61c94f85b2
|
fix the end call
|
4 years ago |
mosazaid
|
02f43d6e61
|
fix timer issue
|
4 years ago |
Mohammad Aljammal
|
654a86a9b6
|
Add App Permissions Utils
|
4 years ago |
Mohammad Aljammal
|
bed7dee27c
|
fix drop video call issue
|
4 years ago |
Elham Rababah
|
78903043d9
|
fix header
|
4 years ago |
Mohammad Aljammal
|
7614b4aa5c
|
fix the video call issues
|
4 years ago |
Mohammad Aljammal
|
746f44157e
|
Add video call service
|
4 years ago |
Elham Rababah
|
c1ed1dc737
|
add loader
|
4 years ago |
mosazaid
|
550b4a848d
|
Merge branch 'development' into video-streaming-android
|
4 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
|
4 years ago |
Elham Rababah
|
3cf4ef4348
|
check if special in home page
|
4 years ago |
Mohammad Aljammal
|
6b44a1c3aa
|
Merge branch 'scan_qr' into 'development'
Scan qr code refactoring
See merge request Cloud_Solution/doctor_app_flutter!740
|
4 years ago |
mosazaid
|
883778d278
|
video call
|
4 years ago |
Elham Rababah
|
37e6853976
|
add special one first calling
|
4 years ago |
hussam al-habibeh
|
1c3391baed
|
Scan qr code refactoring
|
4 years ago |
Elham Rababah
|
7f3ae19fd2
|
remove todo
|
4 years ago |
Elham Rababah
|
7b71bd752f
|
add to do
|
4 years ago |
Elham Rababah
|
363b55069f
|
first step form Special Clinic
|
4 years ago |
Mohammad Aljammal
|
84561a7363
|
Merge branch 'referral_reply' into 'development'
Scan QR Code fix
See merge request Cloud_Solution/doctor_app_flutter!739
|
4 years ago |
hussam al-habibeh
|
3913f8936c
|
Scan QR Code fix
|
4 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
|
4 years ago |
Elham Rababah
|
1edd375fd7
|
first step from special clinic
|
4 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
|
4 years ago |
Zohaib Iqbal Kambrani
|
f60ff85e31
|
no message
|
4 years ago |
Mohammad Aljammal
|
01a49ae200
|
Merge branch 'headers_refactor' into 'development'
Headers refactor
See merge request Cloud_Solution/doctor_app_flutter!737
|
4 years ago |
Elham Rababah
|
161cb1e872
|
fix profile height size
|
4 years ago |
hussam al-habibeh
|
142fbb93fd
|
Referrel Doctor reply
|
4 years ago |
Elham Rababah
|
411746da98
|
remove patient type and arrival type form patient profile header
|
4 years ago |
Zohaib Iqbal Kambrani
|
1b4988e5f0
|
no message
|
4 years ago |
Elham Rababah
|
bc53ca7b8a
|
fix appointment date in header
|
4 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
|
4 years ago |
Elham Rababah
|
132565c298
|
Merge branches 'development' and 'headers_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into headers_refactor
|
4 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
|
4 years ago |
mosazaid
|
c44b3d74bb
|
reply changes
|
4 years ago |
Mohammad Aljammal
|
726d3ab885
|
Fix video call issue android
|
4 years ago |
Elham Rababah
|
30bf59458c
|
finish medical report
|
4 years ago |
mosazaid
|
1834d9f776
|
change video streaming design
|
4 years ago |
Elham Rababah
|
e530dc0168
|
first step from fix medical report
|
4 years ago |
Elham Rababah
|
95425d9568
|
fix issues in header
|
4 years ago |
Elham Rababah
|
6aef8b5878
|
first step refactor headers
|
4 years ago |
mosazaid
|
017669c406
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/service/patient/LiveCarePatientServices.dart
|
4 years ago |
Elham Rababah
|
354a1f2dec
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes
|
4 years ago |
Elham Rababah
|
0e513ecca8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into end_call_fixes
|
4 years ago |
Elham Rababah
|
23feb2c354
|
remove unused code
|
4 years ago |
mosazaid
|
1b47b60155
|
Merge branch 'development' into reply-doctor_changes
# Conflicts:
# lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
|
4 years ago |
mosazaid
|
10441e4af0
|
referral changes
|
4 years ago |
Mohammad Aljammal
|
418918558f
|
Merge branch 'end_call_fixes' into 'development'
End call fixes
See merge request Cloud_Solution/doctor_app_flutter!729
|
4 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
|
4 years ago |
Elham Rababah
|
cb5abfb2ec
|
remove comment code
|
4 years ago |
Elham Rababah
|
36caca0e46
|
test live care and general result header in lab result
|
4 years ago |
Mohammad Aljammal
|
0b52b4009d
|
fix label on replay referral
|
4 years ago |
Elham Rababah
|
176c0ab97c
|
first step from live care fixes
|
4 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
|
4 years ago |
Elham Rababah
|
72966c3269
|
fix referral patient services
|
4 years ago |
mosazaid
|
663c8d1104
|
Merge branch 'development' into referral-outpatient
|
4 years ago |
Mohammad Aljammal
|
f6922ee41a
|
Merge branch 'live_care_fixes' into 'development'
Live care fixes
See merge request Cloud_Solution/doctor_app_flutter!724
|
4 years ago |
Elham Rababah
|
8a8b55d2de
|
move show timer to its own file
|
4 years ago |
Elham Rababah
|
792c85e28a
|
fix live care icon size
|
4 years ago |
mosazaid
|
ec9f628b67
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/service/patient/LiveCarePatientServices.dart
|
4 years ago |
Elham Rababah
|
f80215b6bb
|
fix doctor id spelling in live care service, fix colors in
|
4 years ago |
mosazaid
|
400420bd4d
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/service/patient/LiveCarePatientServices.dart
|
4 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
|
4 years ago |
mosazaid
|
0fe6d880fd
|
add livecare send instructions
|
4 years ago |
mosazaid
|
0afe3b3afd
|
livecare changes
|
4 years ago |
mosazaid
|
5d0a7a4045
|
livecare changes
|
4 years ago |
hussam al-habibeh
|
c800219428
|
Live Care Is Login Service
|
4 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
|
4 years ago |
hussam al-habibeh
|
6989235334
|
Live care Is Login service
|
4 years ago |
mosazaid
|
66d12f8fdd
|
procedure fixes, liveCare working
|
4 years ago |
mosazaid
|
b36ddf9317
|
add prescription to procedure type
|
4 years ago |
mosazaid
|
ea0658c05c
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/viewModel/procedure_View_model.dart
|
4 years ago |
mosazaid
|
91cd7f2b88
|
refactoring
|
4 years ago |
Mohammad Aljammal
|
6439bb9a90
|
Merge branch 'favourite_prescription' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!719
|
4 years ago |
hussam al-habibeh
|
4af94e6b71
|
hot fix
|
4 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
|
4 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
|
4 years ago |
Elham Rababah
|
fb6ef8fca1
|
fix appointment in live care
|
4 years ago |
mosazaid
|
3107950f5c
|
fix bug
|
4 years ago |
Mohammad Aljammal
|
151b69ed17
|
Merge branch 'favourite_prescription' into 'development'
Favourite prescription
See merge request Cloud_Solution/doctor_app_flutter!714
|
4 years ago |