Mohammad Aljammal
|
331b27c3ec
|
fix merge issue
|
5 years ago |
Mohammad Aljammal
|
5ad9976c40
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_registration
Conflicts:
lib/config/config.dart
lib/locator.dart
|
5 years ago |
Mohammad Aljammal
|
9689044be7
|
Add models and create vm, services for patient registration
|
5 years ago |
mosazaid
|
faa7c08266
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into register_patient_feature
Conflicts:
lib/locator.dart
|
5 years ago |
mosazaid
|
7b8312fe26
|
make register patient feature
|
5 years ago |
Elham Rababh
|
9e2b72a7cb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into diabetic_chart_values
Conflicts:
lib/config/config.dart
lib/routes.dart
|
5 years ago |
Elham Rababh
|
514e6c81c7
|
finish diabetic
|
5 years ago |
hussam al-habibeh
|
056b0bbd78
|
admission orders change
|
5 years ago |
hussam al-habibeh
|
3f7a839950
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
Conflicts:
lib/routes.dart
lib/screens/patients/profile/operation_report/operation_report.dart
lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
|
5 years ago |
hussam al-habibeh
|
ae0c588d32
|
get admission orders
|
5 years ago |
Elham Rababh
|
dd971ffddb
|
first step from get diabetic
|
5 years ago |
Mohammad Aljammal
|
52e5b86f6c
|
Merge branch 'get_operation_report' into 'development'
Get operation report
See merge request Cloud_Solution/doctor_app_flutter!862
|
5 years ago |
hussam al-habibeh
|
64b5652c8d
|
Pending Orders Service
|
5 years ago |
Elham Rababh
|
1a3567f917
|
finish the nursing DiagnosisScreen
|
5 years ago |
Elham Rababh
|
72c948371a
|
finish the nursing progress_note_screen
|
5 years ago |
Elham Rababh
|
4ebecc4277
|
Merge branch 'get_operation_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report
Conflicts:
lib/core/viewModel/operation_report_view_model.dart
|
5 years ago |
Elham Rababh
|
a44a207116
|
finish the operation Reports from our side
|
5 years ago |
Mohammad Aljammal
|
d7b1212b54
|
Merge branch 'get_operation_report' into 'development'
Get operation report
See merge request Cloud_Solution/doctor_app_flutter!860
|
5 years ago |
hussam al-habibeh
|
ee3d207795
|
get operation report
|
5 years ago |
Elham Rababh
|
231614e914
|
Merge branch 'get_operation_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report
Conflicts:
lib/core/service/operation_report_servive.dart
lib/core/viewModel/operation_report_view_model.dart
lib/screens/patients/profile/operation_report/update_operation_report.dart
|
5 years ago |
hussam al-habibeh
|
d035f1ba37
|
opertion report screen
|
5 years ago |
Elham Rababh
|
7684b65e8a
|
first step from update_operation_report.dart
|
5 years ago |
hussam al-habibeh
|
d4363aeefb
|
opertion report screen
|
5 years ago |
mosazaid
|
efbe6ae76b
|
home page design fix
|
5 years ago |
Mohammad Aljammal
|
65f8f061db
|
Merge branch 'fix_inpatient' into 'development'
Fix inpatient
See merge request Cloud_Solution/doctor_app_flutter!849
|
5 years ago |
Elham Rababh
|
8be6bd257d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sick_leave
Conflicts:
pubspec.lock
|
5 years ago |
Mohammad Aljammal
|
dd4eb2f76d
|
Merge branch 'design-fixes' into 'development'
design fixes
See merge request Cloud_Solution/doctor_app_flutter!846
|
5 years ago |
Elham Rababh
|
9a5eff8c8b
|
sick leave fixes
|
5 years ago |
mosazaid
|
495c8fb3b0
|
change lab result design
|
5 years ago |
Elham Rababh
|
f05455fddf
|
finish sick leave design
|
5 years ago |
mosazaid
|
2274affd9a
|
design fixes
|
5 years ago |
Elham Rababh
|
29336a9ef3
|
fix the design of all sick leave
|
5 years ago |
Mohammad Aljammal
|
faf8c8ede7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
5 years ago |
Mohammad Aljammal
|
1a7fd766d5
|
Merge branch 'all_special_lab_result' into 'development'
All special lab result
See merge request Cloud_Solution/doctor_app_flutter!839
|
5 years ago |
Elham Rababh
|
47df7e5919
|
fix in patient issues
|
5 years ago |
hussam al-habibeh
|
7be6ef6ed6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result
Conflicts:
pubspec.lock
|
5 years ago |
hussam al-habibeh
|
288bef5a5f
|
fix all special result
|
5 years ago |
Mohammad Aljammal
|
f56a23aad9
|
fix lab issue
|
5 years ago |
Elham Rababh
|
b119590e39
|
Doctor replay add info status 99
|
5 years ago |
Mohammad Aljammal
|
8383ce17bd
|
Merge branch 'in-patient-medication' into 'development'
Medication for in-patient hot fix
See merge request Cloud_Solution/doctor_app_flutter!833
|
5 years ago |
hussam al-habibeh
|
a731851a92
|
Medication for in-patient hot fix
|
5 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
|
5 years ago |
Elham Rababh
|
ce199f7d98
|
separate in patient and my in patient to 2 files
|
5 years ago |
Elham Rababh
|
a1f9729091
|
in patient list improve performace
|
5 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
|
5 years ago |
hussam al-habibeh
|
763686fc76
|
adding missing fields for medication
|
5 years ago |
Elham Rababh
|
9317173c05
|
add filtration on level of clinic
|
5 years ago |
Mohammad Aljammal
|
09c8d9c09e
|
Merge branch 'procedure_changes' into 'development'
dilog list & procedure changes
See merge request Cloud_Solution/doctor_app_flutter!826
|
5 years ago |
hussam al-habibeh
|
c5eac79522
|
dilog list & procedure changes
|
5 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
|
5 years ago |
Elham Rababh
|
e9e86e4d8c
|
add filter on in patient screen by clinic and by all clinic
|
5 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
|
5 years ago |
mosazaid
|
96ad55b552
|
re-design UCAF to pager
|
5 years ago |
Elham Rababh
|
1fd192e4bc
|
add pagination on in patient
|
5 years ago |
mosazaid
|
aae1cba405
|
re-design UCAF to pager
|
5 years ago |
Mohammad Aljammal
|
3762e60552
|
Merge branch 'sick_leave_fix' into 'development'
Sick leave fix
See merge request Cloud_Solution/doctor_app_flutter!823
|
5 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
|
5 years ago |
Elham Rababh
|
a014e0140d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into replay_status
|
5 years ago |
Elham Rababh
|
92c791dd72
|
improve add subjective info
|
5 years ago |
hussam al-habibeh
|
00b7aaf32a
|
fix sick leave
|
5 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
|
5 years ago |
mosazaid
|
c9fe9ccb63
|
changing lists from list.generator to list builder to make it faster in big size
|
5 years ago |
Elham Rababh
|
95a694a85f
|
improve update assessment details
|
5 years ago |
hussam al-habibeh
|
b461af1be2
|
medication for in patient
|
5 years ago |
Elham Rababh
|
449206c6e8
|
improve performance for Update Subject
|
5 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
|
5 years ago |
mosazaid
|
26f37893a1
|
home parallel calling services
|
5 years ago |
Elham Rababh
|
cc26053bc1
|
episode to inpatient
|
5 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
|
5 years ago |
Elham Rababh
|
b707857526
|
first step from get episode id
|
5 years ago |
Mohammad Aljammal
|
68e37ddf86
|
Merge branch 'all_special_lab_result' into 'development'
patient profile aligment fix
See merge request Cloud_Solution/doctor_app_flutter!813
|
5 years ago |
hussam al-habibeh
|
41ed593707
|
patient profile aligment fix
|
5 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
|
5 years ago |
mosazaid
|
632e930c6b
|
fix my inpatient issue
|
5 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
|
5 years ago |
hussam al-habibeh
|
19487ba435
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result
|
5 years ago |
Elham Rababh
|
df40a2dc09
|
first step from create episode inpatint
|
5 years ago |
hussam al-habibeh
|
792c7aea9b
|
all special lab result
|
5 years ago |
Mohammad Aljammal
|
d5cff77743
|
fix login issue and add new localizedValues
|
5 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
|
5 years ago |
mosazaid
|
ac4a68600c
|
working on lab result new service
|
5 years ago |
Elham Rababh
|
943463b1d9
|
add pagination to doctor replay
|
5 years ago |
hussam al-habibeh
|
8d493f40fa
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_soap
|
5 years ago |
hussam al-habibeh
|
528e16c3dc
|
lab result & radiolgy fix
|
5 years ago |
Mohammad Aljammal
|
fa9942ac24
|
Merge branch 'fix_login' into 'development'
Fix login issue
See merge request Cloud_Solution/doctor_app_flutter!793
|
5 years ago |
Mohammad Aljammal
|
0489e9584f
|
fix login issue
|
5 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
|
5 years ago |
Elham Rababh
|
e8c0281913
|
fix show count in home page
|
5 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
|
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
|
53d7d68012
|
add badge on bottom bar in order to show number of un replied msg
|
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
|
64697b82a6
|
fix issue
|
5 years ago |
Elham Rababh
|
c31db4890b
|
finish doctor response
|
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
|
41190bc501
|
move error to model
|
5 years ago |
Elham Rababh
|
6db5191e07
|
return the function code back
|
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
|
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 |
Elham Rababh
|
e58ce34aa4
|
move bottom sheet to index page
|
5 years ago |
Mohammad Aljammal
|
243108e81a
|
Apply the new authentication logic
|
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 |
hussam al-habibeh
|
64a7aca228
|
adding google anlyatic to doctor app
|
5 years ago |
Elham Rababh
|
d301c2a3f4
|
add new and old part form examination
|
5 years ago |
mosazaid
|
a84027ad6f
|
Merge branch 'development' into video-stream-floating
# Conflicts:
# lib/core/service/VideoCallService.dart
|
5 years ago |
Mohammad Aljammal
|
3ee0acbf6e
|
Add Analytics Service
|
5 years ago |
mosazaid
|
adab2d47d3
|
video stream bug disconnect fixes
|
5 years ago |
hussam al-habibeh
|
ef8db07875
|
add patient to doctor list in live care
|
5 years ago |
hussam al-habibeh
|
d19a881801
|
Sick Leave doctor app API
|
5 years ago |
mosazaid
|
7cc25f6101
|
make floating video screen
|
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 |
Mohammad Aljammal
|
e8f9c958b1
|
Fix medical report issues
|
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
|
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 |
mosazaid
|
d839fd3545
|
outpatirnt referral changes
|
5 years ago |
hussam al-habibeh
|
1e35b70b01
|
medical report fix
|
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 |
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 |
mosazaid
|
385820fdce
|
video stream add record icon and change button disable
|
5 years ago |
hussam al-habibeh
|
07835aaa1b
|
medical report changes
|
5 years ago |
mosazaid
|
c722c9b05a
|
Merge branch 'development' into video-stream-background
# Conflicts:
# android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt
# lib/core/service/VideoCallService.dart
# lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
|
5 years ago |
Mohammad Aljammal
|
e70eabe68d
|
Fix live care issues and qr code
|
5 years ago |
Elham Rababah
|
d4ff42ad88
|
Merge branches 'flutter_2_developemt' and 'flutter_vervion_2_elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_elham
|
5 years ago |