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 |
Mohammad Aljammal
|
3ee0acbf6e
|
Add Analytics Service
|
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 |
mosazaid
|
adab2d47d3
|
video stream bug disconnect fixes
|
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 |
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
|
4 years ago |
mosazaid
|
7cc25f6101
|
make floating video screen
|
4 years ago |
Mohammad Aljammal
|
eb40cc819d
|
fix video call
|
4 years ago |
Mohammad Aljammal
|
4c8f79c87e
|
Fix medical report issues
|
4 years ago |
Mohammad Aljammal
|
8d8d7d8697
|
Merge branch 'outpatient_referral_change' into 'development'
referral change
See merge request Cloud_Solution/doctor_app_flutter!765
|
4 years ago |
mosazaid
|
405a363e28
|
referral change
|
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 |
hussam al-habibeh
|
9890d6a063
|
using dynimc setup id in medical report service
|
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
|
1918c2219e
|
improve the code.
|
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
|
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 |