Mohammad Aljammal
|
68e37ddf86
|
Merge branch 'all_special_lab_result' into 'development'
patient profile aligment fix
See merge request Cloud_Solution/doctor_app_flutter!813
|
4 years ago |
hussam al-habibeh
|
41ed593707
|
patient profile aligment fix
|
4 years ago |
Elham Rababh
|
99a4838044
|
add key
|
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 |
Elham Rababh
|
b1294a863c
|
fix issues
|
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
|
0deca4f624
|
patient profile aligment fix
|
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 |
Elham Rababh
|
5a91f6a25b
|
fix issues
|
4 years ago |
hussam al-habibeh
|
e4f350fad3
|
adding special lab result details
|
4 years ago |
Elham Rababh
|
50e8e7b0d6
|
add translation to text status
|
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
|
5ba26692c1
|
working on lab result new service
|
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 |
Elham Rababh
|
1c2ccd9149
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes_before_live
Conflicts:
lib/widgets/patients/profile/patient-profile-app-bar.dart
|
4 years ago |
Elham Rababh
|
c17f9fb91d
|
add copy to patient cart
|
4 years ago |
Elham Rababh
|
a5f3731b9a
|
first step from fixing header
|
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 |
Mohammad Aljammal
|
794c935d05
|
Merge branch 'fixes_before_live' into 'development'
fix show count in home page
See merge request Cloud_Solution/doctor_app_flutter!794
|
4 years ago |
mosazaid
|
0fb4b4a890
|
add copy to selected texts
|
4 years ago |
Elham Rababh
|
1712874c87
|
fix show count in home page
|
4 years ago |
Mohammad Aljammal
|
fa9942ac24
|
Merge branch 'fix_login' into 'development'
Fix login issue
See merge request Cloud_Solution/doctor_app_flutter!793
|
4 years ago |
Mohammad Aljammal
|
0489e9584f
|
fix login issue
|
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
|
5 years ago |
Elham Rababh
|
e2caebde8b
|
some fixes before live
|
5 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
|
5 years ago |
Elham Rababh
|
947fc7f8f8
|
fix issues related to add progress exam
|
5 years ago |
Elham Rababh
|
79a0e0917f
|
fix issue related to outpatient
|
5 years ago |
Elham Rababh
|
53d7d68012
|
add badge on bottom bar in order to show number of un replied msg
|
5 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
|
5 years ago |
hussam al-habibeh
|
4abd005499
|
SOAP For in patient
|
5 years ago |
Elham Rababh
|
74a6ebebdc
|
remove unnecessary step for inpatient
|
5 years ago |
hussam al-habibeh
|
26a1758af9
|
Soap for in Patient chef complint
|
5 years ago |
Elham Rababh
|
42ecf9a0fb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_fixes_dev
|
5 years ago |
Elham Rababh
|
80b976dff3
|
first step from change steper
|
5 years ago |
Elham Rababh
|
13be1c6a00
|
fix issue in the model
|
5 years ago |
hussam al-habibeh
|
562fd1b515
|
chef complint for in patient
|
5 years ago |
Elham Rababh
|
64697b82a6
|
fix issue
|
5 years ago |
Elham Rababh
|
c31db4890b
|
finish doctor response
|
5 years ago |
Elham Rababh
|
a1aa1d5689
|
small on in patient cases
|
5 years ago |
Elham Rababh
|
7b65f1bade
|
small fix on in patient
|
5 years ago |
Elham Rababh
|
3626857317
|
finish fix Special Clinical
|
5 years ago |
Elham Rababh
|
21f3ab9ac8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into special_clinical
|
5 years ago |
Elham Rababh
|
0ae0650acb
|
fix id
|
5 years ago |
Elham Rababh
|
300ad103d3
|
move error to model
|
5 years ago |
Elham Rababh
|
41190bc501
|
move error to model
|
5 years ago |
Elham Rababh
|
6db5191e07
|
return the function code back
|
5 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
|
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
|
ebea54f2cc
|
change info status
|
5 years ago |
Elham Rababh
|
8a4e0db113
|
commit config
|
5 years ago |
Elham Rababh
|
369eecb0a3
|
return special Clinical function
|
5 years ago |
Elham Rababh
|
854f42ce96
|
Create Doctor Response working fine
|
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 |
Mohammad Aljammal
|
243108e81a
|
Apply the new authentication logic
|
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 |
mosazaid
|
529711d2ce
|
video stream crash working to fix
|
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 |
Mohammad Aljammal
|
efd3d4942e
|
change the google json files
|
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 |
Elham Rababh
|
eabe16a1d3
|
change text field
|
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 |
Mohammad Aljammal
|
3ee0acbf6e
|
Add Analytics Service
|
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 |
mosazaid
|
adab2d47d3
|
video stream bug disconnect fixes
|
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 |
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
|
5 years ago |
hussam al-habibeh
|
ef8db07875
|
add patient to doctor list in live care
|
5 years ago |
Mohammad Aljammal
|
d63fa42178
|
Merge branch 'medical_report_changes' into 'development'
Medical report changes
See merge request Cloud_Solution/doctor_app_flutter!770
|
5 years ago |
hussam al-habibeh
|
d19a881801
|
Sick Leave doctor app API
|
5 years ago |
Mohammad Aljammal
|
3be4fb2986
|
Fix verification methods screen
|
5 years ago |
hussam al-habibeh
|
abb1e52515
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical_report_changes
Conflicts:
lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart
|
5 years ago |
mosazaid
|
7cc25f6101
|
make floating video screen
|
5 years ago |
Mohammad Aljammal
|
eb40cc819d
|
fix video call
|
5 years ago |
Mohammad Aljammal
|
4c8f79c87e
|
Fix medical report issues
|
5 years ago |
Mohammad Aljammal
|
8d8d7d8697
|
Merge branch 'outpatient_referral_change' into 'development'
referral change
See merge request Cloud_Solution/doctor_app_flutter!765
|
5 years ago |
mosazaid
|
405a363e28
|
referral change
|
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 |
hussam al-habibeh
|
9890d6a063
|
using dynimc setup id in medical report service
|
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
|
1918c2219e
|
improve the code.
|
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 |
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 |
hussam al-habibeh
|
d50740b9b9
|
Procedure template service
|
5 years ago |
mosazaid
|
70d171a599
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
mosazaid
|
67e0cac742
|
add livecare to home
|
5 years ago |
Mohammad Aljammal
|
172b457092
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into expansion_procedure
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
|
5 years ago |
Mohammad Aljammal
|
40b4a83c6b
|
Fix Expansion Procedure
|
5 years ago |
Mohammad Aljammal
|
fa479ce258
|
Merge branch 'prescription_changes' into 'development'
favourite template Procedure service
See merge request Cloud_Solution/doctor_app_flutter!677
|
5 years ago |
hussam al-habibeh
|
c182928a5d
|
favourite template Procedure service
|
5 years ago |
Mohammad Aljammal
|
0603ea1e40
|
Merge branch 'html_editor' into 'development'
add rich editor for MedicalReportPage
See merge request Cloud_Solution/doctor_app_flutter!676
|
5 years ago |
Mohammad Aljammal
|
16dac03b24
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_home_design
Conflicts:
lib/locator.dart
lib/screens/home/home_screen.dart
|
5 years ago |
Elham Rababah
|
342477beda
|
add rich editor for MedicalReportPage
|
5 years ago |
Mohammad Aljammal
|
f6539c82a6
|
add live care card in home page
|
5 years ago |
hussam al-habibeh
|
3801d7b59a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
|
5 years ago |
hussam al-habibeh
|
e1d00b87ad
|
favourite template Procedure service
|
5 years ago |
Mohammad Aljammal
|
5b94a19b60
|
Merge branch 'html_editor' into 'development'
add rich editor
See merge request Cloud_Solution/doctor_app_flutter!673
|
5 years ago |
Elham Rababah
|
8cac9b6fe9
|
add rich editor
|
5 years ago |
mosazaid
|
9e552668c7
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
mosazaid
|
2fabe85b30
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
1cc55d809c
|
fix authentication service
|
5 years ago |
mosazaid
|
deb126fdd5
|
meical report changes
|
5 years ago |
Mohammad Aljammal
|
a97a331d87
|
fix bugs in change the clinic, login page when get the projects and add the special Result
|
5 years ago |
hussam al-habibeh
|
623f2730e8
|
Procedure card design update
|
5 years ago |
hussam al-habibeh
|
066acc404a
|
Procedure template service
|
5 years ago |
Mohammad Aljammal
|
57fcd2cdeb
|
fix home page design
|
5 years ago |
Mohammad Aljammal
|
a525787c19
|
Merge branch 'live_care' into 'development'
Live care
See merge request Cloud_Solution/doctor_app_flutter!668
|
5 years ago |
mosazaid
|
9e80a1879e
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/locator.dart
|
5 years ago |
mosazaid
|
fa830cf4da
|
changes
|
5 years ago |
Elham Rababah
|
d574dd0b16
|
return base app client
|
5 years ago |
Elham Rababah
|
164a7fd2fc
|
fix merge issues
|
5 years ago |
Elham Rababah
|
56698a82fd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into merge_dev_into_auth_refactor
Conflicts:
lib/core/service/home/auth_service.dart
lib/core/viewModel/auth_view_model.dart
lib/core/viewModel/imei_view_model.dart
lib/locator.dart
lib/screens/auth/login_screen.dart
lib/screens/home/home_screen.dart
lib/screens/patients/patient_search/patient_search_screen.dart
lib/widgets/auth/verification_methods.dart
|
5 years ago |
hussam al-habibeh
|
84a7f44b68
|
favourite procedure templates
|
5 years ago |
Elham Rababah
|
14a3ca8695
|
fix login screen design
|
5 years ago |
Elham Rababah
|
515955663a
|
add verification
|
5 years ago |
hussam al-habibeh
|
3b800bcd19
|
favourite procedure templates
|
5 years ago |
mosazaid
|
6192d9a84f
|
working on medical-profile
|
5 years ago |
Mohammad Aljammal
|
1187c3b605
|
fix authentication provider
|
5 years ago |
Elham Rababah
|
6933b6577f
|
add session time out.
|
5 years ago |
Elham Rababah
|
9b34c2c833
|
first step from live care
|
5 years ago |
Elham Rababah
|
a9bd02a908
|
first step from user another account
|
5 years ago |
hussam al-habibeh
|
6b6243232c
|
Procedure template service
|
5 years ago |
Elham Rababah
|
0d8684481d
|
fix sms error and some design issue
|
5 years ago |
Mohammad Aljammal
|
8ac040a809
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
42275b41fd
|
Merge branch 'load_medical_report' into 'development'
Load medical report
See merge request Cloud_Solution/doctor_app_flutter!665
|
5 years ago |
Mohammad Aljammal
|
2c43cfcdde
|
Merge branch 'home-refactoring' into 'development'
Home refactoring
See merge request Cloud_Solution/doctor_app_flutter!648
|
5 years ago |
Elham Rababah
|
e0be4ec1be
|
move logout function from helper to authentication view model
|
5 years ago |
Elham Rababah
|
c9e7fb9883
|
small fix
|
5 years ago |
Elham Rababah
|
1eeaaa48ca
|
remove comment
|
5 years ago |
Elham Rababah
|
0adcfeccce
|
fix auth bug
|
5 years ago |
Elham Rababah
|
6815e47814
|
remove doctor profile view model
|
5 years ago |
Mohammad Aljammal
|
8399677a0a
|
Fix Dubai user issues
|
5 years ago |
Elham Rababah
|
2e71706cab
|
add UNVERIFIED status
|
5 years ago |
mosazaid
|
0e2b700136
|
vital sign hot fix
|
5 years ago |
mosazaid
|
25fb8ea5ae
|
hot fix
|
5 years ago |
Elham Rababah
|
fd9f93a936
|
do some refactor and change the code to view model
|
5 years ago |
mosazaid
|
70480cc09e
|
Merge branch 'development' into home-refactoring
|
5 years ago |
mosazaid
|
50b4b8eb50
|
dashboard change
|
5 years ago |
Mohammad Aljammal
|
8541ddc0f8
|
fix LabOrderResult
|
5 years ago |
mosazaid
|
6280904669
|
Merge branch 'development' into home-refactoring
|
5 years ago |
mosazaid
|
27f940b473
|
home design
|
5 years ago |
Mohammad Aljammal
|
5c73f3b3b6
|
Merge branch 'prescription_changes' into 'development'
prescreption hot fix
See merge request Cloud_Solution/doctor_app_flutter!659
|
5 years ago |
mosazaid
|
12bb283a68
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/screens/home/home_screen.dart
|
5 years ago |
mosazaid
|
72ee88d567
|
working on dashboard
|
5 years ago |
hussam al-habibeh
|
bf589e703e
|
prescreption hot fix
|
5 years ago |
Mohammad Aljammal
|
8653d54a0d
|
Merge branch 'zohaib_and_dev' into 'development'
showDailog Migration
See merge request Cloud_Solution/doctor_app_flutter!658
|
5 years ago |
Mohammad Aljammal
|
8e4321b3da
|
Migration dev to Zohaib branch
|
5 years ago |
Mohammad Aljammal
|
b3ae86db31
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
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 |
mosazaid
|
0bfa74f1c9
|
ucaf-change
|
5 years ago |
Elham Rababah
|
7dbd4c9cc6
|
Merge branch 'auth_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
Conflicts:
lib/screens/auth/login_screen.dart
|
5 years ago |
Elham Rababah
|
301972f9b7
|
small fixes
|
5 years ago |
Mohammad Aljammal
|
081bfe3f61
|
add TODO to Elham
|
5 years ago |
mosazaid
|
2023ce9b55
|
Merge branch 'development' into home-refactoring
# Conflicts:
# lib/core/viewModel/dashboard_view_model.dart
# lib/screens/home/home_screen.dart
|
5 years ago |
hussam al-habibeh
|
292bc2a97f
|
prescription changes
|
5 years ago |
mosazaid
|
95a6893b59
|
home design
|
5 years ago |
hussam al-habibeh
|
c50a483663
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
Conflicts:
lib/core/service/patient_medical_file/prescription/prescription_service.dart
lib/core/viewModel/prescription_view_model.dart
lib/screens/prescription/add_prescription_form.dart
|
5 years ago |
hussam al-habibeh
|
cecc1a725d
|
pescription changes
|
5 years ago |
Mohammad Aljammal
|
b871009033
|
Merge branch 'feature-modeical_profile' into 'development'
Feature modeical profile
See merge request Cloud_Solution/doctor_app_flutter!654
|
5 years ago |
Mohammad Aljammal
|
74ded739c8
|
fix imports
|
5 years ago |