mosazaid
|
957cf96c16
|
Merge branch 'development' into medical-profile-services
|
6 years ago |
|
mosazaid
|
8b2c7f1a05
|
livecare
|
6 years ago |
Elham Rababah
|
1367f2bebb
|
add translation
|
6 years ago |
|
Elham Rababah
|
6d989e3fc3
|
finish new service for live care
|
6 years ago |
|
Elham Rababah
|
d49d52458b
|
fix birthOfDate
|
6 years ago |
|
mosazaid
|
67e0cac742
|
add livecare to home
|
6 years ago |
|
Elham Rababah
|
342477beda
|
add rich editor for MedicalReportPage
|
6 years ago |
|
mosazaid
|
2fabe85b30
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
mosazaid
|
deb126fdd5
|
meical report changes
|
6 years ago |
Mohammad Aljammal
|
a97a331d87
|
fix bugs in change the clinic, login page when get the projects and add the special Result
|
6 years ago |
|
Mohammad Aljammal
|
57fcd2cdeb
|
fix home page design
|
6 years ago |
Mohammad Aljammal
|
a525787c19
|
Merge branch 'live_care' into 'development'
Live care
See merge request Cloud_Solution/doctor_app_flutter!668
|
6 years ago |
|
mosazaid
|
9e80a1879e
|
Merge branch 'development' into medical-profile-services
# Conflicts:
# lib/locator.dart
|
6 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
|
6 years ago |
|
mosazaid
|
6192d9a84f
|
working on medical-profile
|
6 years ago |
|
Elham Rababah
|
9b34c2c833
|
first step from live care
|
6 years ago |
|
Mohammad Aljammal
|
8ac040a809
|
hot fix
|
6 years ago |
|
Mohammad Aljammal
|
42275b41fd
|
Merge branch 'load_medical_report' into 'development'
Load medical report
See merge request Cloud_Solution/doctor_app_flutter!665
|
6 years ago |
|
Elham Rababah
|
6815e47814
|
remove doctor profile view model
|
6 years ago |
|
mosazaid
|
0e2b700136
|
vital sign hot fix
|
6 years ago |
|
mosazaid
|
25fb8ea5ae
|
hot fix
|
6 years ago |
|
Mohammad Aljammal
|
8541ddc0f8
|
fix LabOrderResult
|
6 years ago |
|
Mohammad Aljammal
|
8653d54a0d
|
Merge branch 'zohaib_and_dev' into 'development'
showDailog Migration
See merge request Cloud_Solution/doctor_app_flutter!658
|
6 years ago |
|
Mohammad Aljammal
|
8e4321b3da
|
Migration dev to Zohaib branch
|
6 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
|
6 years ago |
|
mosazaid
|
0bfa74f1c9
|
ucaf-change
|
6 years ago |
|
Mohammad Aljammal
|
b871009033
|
Merge branch 'feature-modeical_profile' into 'development'
Feature modeical profile
See merge request Cloud_Solution/doctor_app_flutter!654
|
6 years ago |
|
Mohammad Aljammal
|
74ded739c8
|
fix imports
|
6 years ago |
hussam al-habibeh
|
bc340693ba
|
project refactoring
|
6 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
|
6 years ago |
|
mosazaid
|
444afa464e
|
working on feature medical profile
|
6 years ago |
|
Elham Rababah
|
7af300d455
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
|
6 years ago |
|
Mohammad Aljammal
|
aab7808468
|
add medical report page design
|
6 years ago |
|
Elham Rababah
|
a5120b473f
|
rename Auth view model to Doctor Profile View Model
|
6 years ago |
|
Mohammad Aljammal
|
086ca517d2
|
Add Medical Report Page
|
6 years ago |
|
Mohammad Aljammal
|
16519d0ccf
|
hot fix
|
6 years ago |
|
Mohammad Aljammal
|
bf86fcc168
|
fix in note and AddReplayOnReferralPatient
|
6 years ago |
|
Mohammad Aljammal
|
5705c02bfd
|
Merge branch 'fix_out_number' into 'development'
fix out patient number
See merge request Cloud_Solution/doctor_app_flutter!639
|
6 years ago |
|
Elham Rababah
|
583edfed89
|
fix out patient number
|
6 years ago |
|
Mohammad Aljammal
|
09d9f1ce25
|
Merge branch 'inpatient-hot-fix' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!638
|
6 years ago |
|
mosazaid
|
81d518e725
|
hot fix
|
6 years ago |
Sultan Khan
|
f84bc6da9d
|
voice command uodated
|
6 years ago |
|
Sultan Khan
|
b66d9d1ed6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
|
Sultan Khan
|
5a42184716
|
voice commad updated
|
6 years ago |
|
hussam al-habibeh
|
4eba6d9f5a
|
Project refactoring
|
6 years ago |
|
Elham Rababah
|
1a1757f841
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
|
6 years ago |
|
mosazaid
|
802bd83ddd
|
design-changes
|
6 years ago |
|
Elham Rababah
|
607da6af66
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
Conflicts:
lib/core/viewModel/PatientSearchViewModel.dart
|
6 years ago |
|
Elham Rababah
|
c3c4b66271
|
refactor search file name
|
6 years ago |
|
Elham Rababah
|
7559ab31c0
|
fix out patient + fix steper in arabic
|
6 years ago |
|
mosazaid
|
a61cae4922
|
Merge branch 'development' into design-changes
|
6 years ago |
|
mosazaid
|
6fba03ed69
|
design fixes
|
6 years ago |
|
Mohammad Aljammal
|
866f6cc8ea
|
Merge branch 'add_out_patient_filter' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!630
|
6 years ago |
|
Elham Rababah
|
8e4d9d9692
|
hot fix
|
6 years ago |
|
mosazaid
|
3295143840
|
Merge branch 'development' into design-changes
|
6 years ago |
|
mosazaid
|
eb74002cf0
|
hot fix
|
6 years ago |
|
Mohammad Aljammal
|
c6ac829813
|
hot fixes in PatientReferralScreen
|
6 years ago |
|
Mohammad Aljammal
|
88b8454afe
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
Conflicts:
lib/screens/patients/DischargedPatientPage.dart
|
6 years ago |
|
mosazaid
|
7eea1bf4a5
|
Merge branch 'development' into design-changes
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
|
mosazaid
|
b43b7cafcc
|
working on in-patient screen design
|
6 years ago |
|
Mohammad Aljammal
|
0d71378400
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
6 years ago |
|
Elham Rababah
|
7bc897bf39
|
fix profile issue
|
6 years ago |
|
Mohammad Aljammal
|
989774a0b3
|
Fix patient card and add the discharged in Patient referral page
|
6 years ago |
|
Elham Rababah
|
0b473f630f
|
translate progress_note_screen
|
6 years ago |
|
Elham Rababah
|
d5d57e7997
|
fix new design issue
|
6 years ago |
|
Mohammad Aljammal
|
2978aeecb2
|
fix the tab bar
|
6 years ago |
|
Mohammad Aljammal
|
27a3dd1eb4
|
fix the filter page
|
6 years ago |
|
Mohammad Aljammal
|
2c81941428
|
Merge branch 'add_out_patient_filter' into 'development'
Add out patient filter
See merge request Cloud_Solution/doctor_app_flutter!622
|
6 years ago |
|
Elham Rababah
|
eebaf01570
|
fix diff msg
|
6 years ago |
|
Elham Rababah
|
01bd55366a
|
date difference
|
6 years ago |
|
Elham Rababah
|
f4020af4f8
|
date fix
|
6 years ago |
|
Elham Rababah
|
4d87c6fb75
|
date fix
|
6 years ago |
|
Elham Rababah
|
7337dc4f87
|
date picker
|
6 years ago |
|
Mohammad Aljammal
|
b1f1b7e34d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
Conflicts:
lib/screens/patients/profile/lab_result/labs_home_page.dart
lib/screens/patients/profile/radiology/radiology_home_page.dart
|
6 years ago |
|
Mohammad Aljammal
|
ed3449bcf4
|
fix the doctor card in lab result and radiology
|
6 years ago |
|
Mohammad Aljammal
|
04be0a7fc6
|
Merge branch 'add_out_patient_filter' into 'development'
Add out patient filter
See merge request Cloud_Solution/doctor_app_flutter!620
|
6 years ago |
|
hussam al-habibeh
|
b5bebea932
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
6 years ago |
|
hussam al-habibeh
|
c86a3dabda
|
page translation
|
6 years ago |
|
Elham Rababah
|
f0457f4e99
|
finish filter page
|
6 years ago |
|
Elham Rababah
|
dcdbe76e54
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issus_soap
Conflicts:
lib/screens/patients/profile/patient_profile_screen.dart
|
6 years ago |
|
Elham Rababah
|
0f8820fa44
|
fix profile screen and start the first step from filter page
|
6 years ago |
|
mosazaid
|
68f405cb21
|
design fixes
|
6 years ago |
|
mosazaid
|
55895496e1
|
Merge branch 'design-changes' into development
|
6 years ago |
|
mosazaid
|
3d6b55681a
|
fix arabic and font style
|
6 years ago |
|
Mohammad Aljammal
|
4613de5fe1
|
Merge branch 'fix_issus_soap' into 'development'
Fix issus soap
See merge request Cloud_Solution/doctor_app_flutter!617
|
6 years ago |
|
Mohammad Aljammal
|
16717ede58
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/doctor_app_flutter!616
|
6 years ago |
|
Elham Rababah
|
7c2889c5d2
|
fix height issue
|
6 years ago |
Haroon Amjad
|
0244334bb5
|
Update on store
|
6 years ago |
|
Elham Rababah
|
8e9687c2ed
|
fix issue on add examination
|
6 years ago |
|
Elham Rababah
|
30bc9b4bea
|
fix issue
|
6 years ago |
|
Mohammad Aljammal
|
f08a91b0b8
|
Merge branch 'in-patient_re-design' into 'development'
In patient re design
See merge request Cloud_Solution/doctor_app_flutter!608
|
6 years ago |
|
Haroon Amjad
|
53a610213c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
# lib/screens/home/home_screen.dart
# lib/widgets/auth/login_form.dart
# lib/widgets/auth/verfiy_account.dart
|
6 years ago |
|
Mohammad Aljammal
|
1dd668ed70
|
hot fixes
|
6 years ago |
|
Elham Rababah
|
bfd36b1c77
|
fix scrolling step 3
|
6 years ago |
|
Elham Rababah
|
cfe3056f17
|
fix scrolling step 2
|
6 years ago |
|
Elham Rababah
|
72bf5d2337
|
fix scrolling in patient screen
|
6 years ago |
|
Elham Rababah
|
acb1bdbb37
|
fix
|
6 years ago |
|
Elham Rababah
|
b6d1c698e2
|
fix
|
6 years ago |
|
Elham Rababah
|
d37051ebe0
|
fix button
|
6 years ago |
|
Mohammad Aljammal
|
dc9f75f0ca
|
hot fixes
|
6 years ago |