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 |
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
|
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 |
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 |
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
|
321bf7825e
|
solve video stream publisher popup window bug
|
5 years ago |
Elham Rababah
|
9da1bff723
|
first step form sort
|
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
|
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
|
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
|
550b4a848d
|
Merge branch 'development' into video-streaming-android
|
5 years ago |
mosazaid
|
883778d278
|
video call
|
5 years ago |
Elham Rababah
|
37e6853976
|
add special one first calling
|
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 |
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
|
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 |
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
|
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
|
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
|
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
|
72966c3269
|
fix referral patient services
|
5 years ago |
mosazaid
|
663c8d1104
|
Merge branch 'development' into referral-outpatient
|
5 years ago |
Elham Rababah
|
8a8b55d2de
|
move show timer to its own file
|
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 |
mosazaid
|
ea0658c05c
|
Merge branch 'development' into procedure_refactoring
# Conflicts:
# lib/core/viewModel/procedure_View_model.dart
|
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 |
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
|
fb6ef8fca1
|
fix appointment in live care
|
5 years ago |
mosazaid
|
9454e9d8af
|
working on procedure refactoring
|
5 years ago |
mosazaid
|
c82a4a05d5
|
medical report design changes
|
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
|
725c87fe8b
|
Add favorite procedure templates for lab and radiology
|
5 years ago |
Mohammad Aljammal
|
280f87e514
|
fix live care issues
|
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 |
mosazaid
|
41515b311c
|
lab-result-fixes
|
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
|
ac701c9806
|
fix live care issues
|
5 years ago |
mosazaid
|
73cf681e9d
|
lab-result-special
|
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 |
Elham Rababah
|
401516403f
|
first step from show Video call
|
5 years ago |
mosazaid
|
957cf96c16
|
Merge branch 'development' into medical-profile-services
|
5 years ago |
mosazaid
|
8b2c7f1a05
|
livecare
|
5 years ago |
Elham Rababah
|
1367f2bebb
|
add translation
|
5 years ago |
Elham Rababah
|
6d989e3fc3
|
finish new service for live care
|
5 years ago |
Elham Rababah
|
d49d52458b
|
fix birthOfDate
|
5 years ago |
mosazaid
|
67e0cac742
|
add livecare to home
|
5 years ago |
Elham Rababah
|
342477beda
|
add rich editor for MedicalReportPage
|
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 |
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 |
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 |
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 |
mosazaid
|
6192d9a84f
|
working on medical-profile
|
5 years ago |
Elham Rababah
|
9b34c2c833
|
first step from live care
|
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 |
Elham Rababah
|
6815e47814
|
remove doctor profile view model
|
5 years ago |
mosazaid
|
0e2b700136
|
vital sign hot fix
|
5 years ago |
mosazaid
|
25fb8ea5ae
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
8541ddc0f8
|
fix LabOrderResult
|
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 |
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 |
hussam al-habibeh
|
bc340693ba
|
project refactoring
|
5 years ago |
hussam al-habibeh
|
9457e04825
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
Conflicts:
lib/core/viewModel/PatientSearchViewModel.dart
lib/screens/patients/PatientsInPatientScreen.dart
lib/screens/patients/out_patient/out_patient_screen.dart
lib/screens/patients/patient_search/patient_search_result_screen.dart
lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
lib/screens/sick-leave/add-sickleave.dart
|
5 years ago |
mosazaid
|
444afa464e
|
working on feature medical profile
|
5 years ago |
Elham Rababah
|
7af300d455
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
|
5 years ago |
Mohammad Aljammal
|
aab7808468
|
add medical report page design
|
5 years ago |
Elham Rababah
|
a5120b473f
|
rename Auth view model to Doctor Profile View Model
|
5 years ago |
Mohammad Aljammal
|
086ca517d2
|
Add Medical Report Page
|
5 years ago |
Mohammad Aljammal
|
16519d0ccf
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
bf86fcc168
|
fix in note and AddReplayOnReferralPatient
|
5 years ago |