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 |
Mohammad Aljammal
|
5705c02bfd
|
Merge branch 'fix_out_number' into 'development'
fix out patient number
See merge request Cloud_Solution/doctor_app_flutter!639
|
5 years ago |
Elham Rababah
|
583edfed89
|
fix out patient number
|
5 years ago |
Mohammad Aljammal
|
09d9f1ce25
|
Merge branch 'inpatient-hot-fix' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!638
|
5 years ago |
mosazaid
|
81d518e725
|
hot fix
|
5 years ago |
Sultan Khan
|
f84bc6da9d
|
voice command uodated
|
5 years ago |
Sultan Khan
|
b66d9d1ed6
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
5a42184716
|
voice commad updated
|
5 years ago |
hussam al-habibeh
|
4eba6d9f5a
|
Project refactoring
|
5 years ago |
Elham Rababah
|
1a1757f841
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
|
5 years ago |
mosazaid
|
802bd83ddd
|
design-changes
|
5 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
|
5 years ago |
Elham Rababah
|
c3c4b66271
|
refactor search file name
|
5 years ago |
Elham Rababah
|
7559ab31c0
|
fix out patient + fix steper in arabic
|
5 years ago |
mosazaid
|
a61cae4922
|
Merge branch 'development' into design-changes
|
5 years ago |
mosazaid
|
6fba03ed69
|
design fixes
|
5 years ago |
Mohammad Aljammal
|
866f6cc8ea
|
Merge branch 'add_out_patient_filter' into 'development'
hot fix
See merge request Cloud_Solution/doctor_app_flutter!630
|
5 years ago |
Elham Rababah
|
8e4d9d9692
|
hot fix
|
5 years ago |
mosazaid
|
3295143840
|
Merge branch 'development' into design-changes
|
5 years ago |
mosazaid
|
eb74002cf0
|
hot fix
|
5 years ago |
Mohammad Aljammal
|
c6ac829813
|
hot fixes in PatientReferralScreen
|
5 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
|
5 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
|
5 years ago |
mosazaid
|
b43b7cafcc
|
working on in-patient screen design
|
5 years ago |
Mohammad Aljammal
|
0d71378400
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Elham Rababah
|
7bc897bf39
|
fix profile issue
|
5 years ago |
Mohammad Aljammal
|
989774a0b3
|
Fix patient card and add the discharged in Patient referral page
|
5 years ago |
Elham Rababah
|
0b473f630f
|
translate progress_note_screen
|
5 years ago |
Elham Rababah
|
d5d57e7997
|
fix new design issue
|
5 years ago |
Mohammad Aljammal
|
2978aeecb2
|
fix the tab bar
|
5 years ago |
Mohammad Aljammal
|
27a3dd1eb4
|
fix the filter page
|
5 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
|
5 years ago |
Elham Rababah
|
eebaf01570
|
fix diff msg
|
5 years ago |
Elham Rababah
|
01bd55366a
|
date difference
|
5 years ago |
Elham Rababah
|
f4020af4f8
|
date fix
|
5 years ago |
Elham Rababah
|
4d87c6fb75
|
date fix
|
5 years ago |
Elham Rababah
|
7337dc4f87
|
date picker
|
5 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
|
5 years ago |
Mohammad Aljammal
|
ed3449bcf4
|
fix the doctor card in lab result and radiology
|
5 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
|
5 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
|
5 years ago |
hussam al-habibeh
|
c86a3dabda
|
page translation
|
5 years ago |
Elham Rababah
|
f0457f4e99
|
finish filter page
|
5 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
|
5 years ago |
Elham Rababah
|
0f8820fa44
|
fix profile screen and start the first step from filter page
|
5 years ago |
mosazaid
|
68f405cb21
|
design fixes
|
5 years ago |
mosazaid
|
55895496e1
|
Merge branch 'design-changes' into development
|
5 years ago |
mosazaid
|
3d6b55681a
|
fix arabic and font style
|
5 years ago |
Mohammad Aljammal
|
4613de5fe1
|
Merge branch 'fix_issus_soap' into 'development'
Fix issus soap
See merge request Cloud_Solution/doctor_app_flutter!617
|
5 years ago |
Mohammad Aljammal
|
16717ede58
|
Merge branch 'Haroon' into 'development'
Haroon
See merge request Cloud_Solution/doctor_app_flutter!616
|
5 years ago |
Elham Rababah
|
7c2889c5d2
|
fix height issue
|
5 years ago |
Haroon Amjad
|
0244334bb5
|
Update on store
|
5 years ago |
Elham Rababah
|
8e9687c2ed
|
fix issue on add examination
|
5 years ago |
Elham Rababah
|
30bc9b4bea
|
fix issue
|
5 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
|
5 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
|
5 years ago |
Mohammad Aljammal
|
1dd668ed70
|
hot fixes
|
5 years ago |
Elham Rababah
|
bfd36b1c77
|
fix scrolling step 3
|
5 years ago |
Elham Rababah
|
cfe3056f17
|
fix scrolling step 2
|
5 years ago |
Elham Rababah
|
72bf5d2337
|
fix scrolling in patient screen
|
5 years ago |
Elham Rababah
|
acb1bdbb37
|
fix
|
5 years ago |
Elham Rababah
|
b6d1c698e2
|
fix
|
5 years ago |
Elham Rababah
|
d37051ebe0
|
fix button
|
5 years ago |
Mohammad Aljammal
|
dc9f75f0ca
|
hot fixes
|
5 years ago |
mosazaid
|
b91d41428f
|
Merge branch 'development' into in-patient_re-design
|
5 years ago |
mosazaid
|
4f6fec07da
|
vital sign fix bug
|
5 years ago |
Mohammad Aljammal
|
ef70a8f15d
|
Merge branch 'referral_in_patient' into 'development'
Referral in patient
See merge request Cloud_Solution/doctor_app_flutter!607
|
5 years ago |
Mohammad Aljammal
|
a1a500813b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
21fd90ea8c
|
hot fixes
|
5 years ago |
Elham Rababah
|
4c493d8ea6
|
fix issue in patients_screen
|
5 years ago |
Mohammad Aljammal
|
60eb7adab1
|
hot fixes
|
5 years ago |
Elham Rababah
|
05a3ca7300
|
add doctor profile
|
5 years ago |
Mohammad Aljammal
|
3e2323fbc0
|
Merge branch 'referral_in_patient' into 'development'
hot fixes
See merge request Cloud_Solution/doctor_app_flutter!605
|
5 years ago |
Mohammad Aljammal
|
debfc02af0
|
Merge branch 'search_out_patient' into 'development'
Search out patient
See merge request Cloud_Solution/doctor_app_flutter!604
|
5 years ago |
Mohammad Aljammal
|
c3ac50a859
|
hot fixes
|
5 years ago |
Elham Rababah
|
29831e8207
|
return code back
|
5 years ago |
Elham Rababah
|
48471bbc07
|
fix small
|
5 years ago |
Elham Rababah
|
a91d64f103
|
samll fix
|
5 years ago |
Mohammad Aljammal
|
7346c9b0c3
|
Merge branch 'in_patient_services' into 'development'
add procedure form update
See merge request Cloud_Solution/doctor_app_flutter!603
|
5 years ago |
hussam al-habibeh
|
8a564b34ac
|
add procedure form update
|
5 years ago |
Mohammad Aljammal
|
85288cc014
|
Add filter in outpatient
|
5 years ago |
Mohammad Aljammal
|
3c4f7654a1
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
f4fd4b26d6
|
Add filter in outpatient
|
5 years ago |
Mohammad Aljammal
|
17512e372f
|
Merge branch 'search_out_patient' into 'development'
Search out patient
See merge request Cloud_Solution/doctor_app_flutter!600
|
5 years ago |
Elham Rababah
|
b6e698d4e4
|
fix header
|
5 years ago |
Mohammad Aljammal
|
ac4df7b9d8
|
Merge branch 'referral_in_patient' into 'development'
Referral in patient
See merge request Cloud_Solution/doctor_app_flutter!599
|
5 years ago |
Mohammad Aljammal
|
3af47304b3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
8d652372ff
|
Merge branch 'search_out_patient' into 'development'
Search out patient
See merge request Cloud_Solution/doctor_app_flutter!598
|
5 years ago |
Mohammad Aljammal
|
3927c40d7e
|
Fix Patient Profile
|
5 years ago |
Elham Rababah
|
b5a90bd658
|
finish search
|
5 years ago |
Elham Rababah
|
403fece008
|
commit things
|
5 years ago |
Elham Rababah
|
5daadc8369
|
commit
|
5 years ago |
Elham Rababah
|
46b4ea25ea
|
fix search part
|
5 years ago |
Mohammad Aljammal
|
e252eb6e1f
|
Merge branch 'search_out_patient' into 'development'
fix search issue
See merge request Cloud_Solution/doctor_app_flutter!597
|
5 years ago |
Elham Rababah
|
c12818f1d0
|
fix search issue
|
5 years ago |
mosazaid
|
7c8583075a
|
Merge branch 'development' into in-patient_re-design
# Conflicts:
# lib/core/viewModel/PatientSearchViewModel.dart
|
5 years ago |
Mohammad Aljammal
|
cab9cddef0
|
Merge branch 'in_patient_services' into 'development'
Search Profile Patient update
See merge request Cloud_Solution/doctor_app_flutter!596
|
5 years ago |
Zohaib Iqbal Kambrani
|
4b7688d620
|
showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
|
5 years ago |
hussam al-habibeh
|
975260df2a
|
Search Profile Patient update
|
5 years ago |
mosazaid
|
286d883c9b
|
in-patient re-design
|
5 years ago |
Elham Rababah
|
56a5209d92
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
Conflicts:
lib/core/model/PatientSearchRequestModel.dart
lib/core/viewModel/PatientSearchViewModel.dart
lib/locator.dart
|
5 years ago |
Elham Rababah
|
963e4b6373
|
fix issue
|
5 years ago |
Elham Rababah
|
20f7664b4c
|
fix issue
|
5 years ago |
mosazaid
|
40c0f9f4a0
|
Merge branch 'development' into in-patient_re-design
|
5 years ago |
mosazaid
|
3e24278d89
|
in-patient re-design
|
5 years ago |
Mohammad Aljammal
|
357e01c846
|
hot fixes
|
5 years ago |
Elham Rababah
|
c062a14cc2
|
Merge branches 'development' and 'search_out_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
|
5 years ago |
Elham Rababah
|
cb67dcc9e1
|
first step from search
|
5 years ago |
Mohammad Aljammal
|
55c63c9531
|
fix Discharged Patient
|
5 years ago |
Mohammad Aljammal
|
57d22aca13
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
c9c18efd72
|
add in lab result get in and out patient
|
5 years ago |
Mohammad Aljammal
|
d18ca12aac
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!587
|
5 years ago |
Sultan Khan
|
3b43550cec
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
099bf81d52
|
homepage and sms popup updated
|
5 years ago |
mosazaid
|
b3e8ecaef2
|
Merge branch 'development' into design-changes
|
5 years ago |
mosazaid
|
ddc266416d
|
some functionality and design changes
|
5 years ago |
Mohammad Aljammal
|
6fb565da17
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!585
|
5 years ago |
Elham Rababah
|
70e394cfc7
|
change font size
|
5 years ago |
Elham Rababah
|
5aa333ba2c
|
fix design
|
5 years ago |
Mohammad Aljammal
|
f708689d00
|
hot fixes
|
5 years ago |
Sultan Khan
|
bbdbc3cc25
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
045584bb28
|
voice feature added
|
5 years ago |
Mohammad Aljammal
|
29e2d962bc
|
Optimize imports
|
5 years ago |
Mohammad Aljammal
|
8523211e90
|
fix design
|
5 years ago |
mosazaid
|
58f1b21ea3
|
Merge branch 'development' into in-patient-changes
|
5 years ago |
mosazaid
|
a3eb9dbb55
|
vital sign design
|
5 years ago |
Mohammad Aljammal
|
86b5640fe6
|
Merge branch 'progress_note' into 'development'
fix radiology date
See merge request Cloud_Solution/doctor_app_flutter!578
|
5 years ago |
Mohammad Aljammal
|
8b1c400f2b
|
Merge branch 'referral_in_patient' into 'development'
Done Referral Discharged Patient
See merge request Cloud_Solution/doctor_app_flutter!576
|
5 years ago |
Elham Rababah
|
5075a52a02
|
fix radiology date
|
5 years ago |
mosazaid
|
9468450c4d
|
Merge branch 'development' into in-patient-changes
|
5 years ago |
mosazaid
|
3335147313
|
vital sign add oxygenation
|
5 years ago |
Mohammad Aljammal
|
b2bcb3dd6d
|
Done Referral Discharged Patient
|
5 years ago |
Elham Rababah
|
fd7b8b19e3
|
fix progress_note_screen
|
5 years ago |
mosazaid
|
5003b3a001
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
5 years ago |
mosazaid
|
1b8e3eb895
|
some fixes
|
5 years ago |
Mohammad Aljammal
|
a8dc3a8933
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
Conflicts:
lib/screens/patients/profile/note/progress_note_screen.dart
|
5 years ago |
Mohammad Aljammal
|
460a5293b9
|
add Discharged Patient
|
5 years ago |
Mohammad Aljammal
|
6f6e2d3397
|
Merge branch 'progress_note' into 'development'
fix progress_note issue
See merge request Cloud_Solution/doctor_app_flutter!571
|
5 years ago |
Elham Rababah
|
89f29d5de7
|
fix progress_note issue
|
5 years ago |
Sultan Khan
|
872e9cd0bd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
648f6fd7cb
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
2d52058a94
|
done replay onReferral Patient
|
5 years ago |
Mohammad Aljammal
|
a3cdacad08
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
15aaeef157
|
Merge branch 'in_patient_services' into 'development'
add doctor image to in patient insurance approvals
See merge request Cloud_Solution/doctor_app_flutter!568
|
5 years ago |
Mohammad Aljammal
|
b924d404a8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
cd3002b0e4
|
done the referral
|
5 years ago |
hussam al-habibeh
|
45e9ee60a9
|
add doctor image to in patient insurance approvals
|
5 years ago |
Elham Rababah
|
1a830b7f44
|
make icon on top
|
5 years ago |
Elham Rababah
|
d8f27f6a98
|
add speech to text
|
5 years ago |
Elham Rababah
|
b1fc59aa0f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
5 years ago |
Mohammad Aljammal
|
89e0107b86
|
Merge branch 'referral_in_patient' into 'development'
Referral in patient
See merge request Cloud_Solution/doctor_app_flutter!566
|
5 years ago |
Elham Rababah
|
09d2cbead5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
5 years ago |
Elham Rababah
|
c0d568070c
|
add icon
|
5 years ago |
Mohammad Aljammal
|
9b7bb687c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
0ab78827e3
|
Merge branch 'fridayf-fix-bug' into 'development'
finish in-patient referral
See merge request Cloud_Solution/doctor_app_flutter!563
|
5 years ago |
Mohammad Aljammal
|
5811a39a9c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
mosazaid
|
3074dfd42e
|
hot fix
|
5 years ago |
Sultan Khan
|
9e87c63d22
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
acf74ab9fc
|
bug fix
|
5 years ago |
mosazaid
|
a34db1b00c
|
Merge branch 'development' into fridayf-fix-bug
# Conflicts:
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
42d8fc0207
|
finish in-patient referral
|
5 years ago |
Mohammad Aljammal
|
1cfc970051
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
|
5 years ago |
Mohammad Aljammal
|
d14659d2b7
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!562
|
5 years ago |
Mohammad Aljammal
|
3c224ece41
|
Add replay on referral patient and add the time on the vital signs
|
5 years ago |
Sultan Khan
|
94806c3601
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
19f0d7ede9
|
voice feature added
|
5 years ago |
Elham Rababah
|
9c2f4e6adb
|
finally fix updating state issue
|
5 years ago |
Elham Rababah
|
66806ae8f1
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
5 years ago |
Elham Rababah
|
98e0e1f078
|
return note back
|
5 years ago |
Mohammad Aljammal
|
61d5f886ed
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!560
|
5 years ago |
Elham Rababah
|
23cb01daf5
|
prevent add spaces
|
5 years ago |
Elham Rababah
|
4a6503c2cf
|
fix design issue
|
5 years ago |
Elham Rababah
|
2d4cb00716
|
fix design issue
|
5 years ago |
mosazaid
|
6eb12b011f
|
Merge branch 'development' into fridayf-fix-bug
|
5 years ago |
mosazaid
|
d9f9c3e36e
|
REFERRAL DESIGN
|
5 years ago |
Mohammad Aljammal
|
7ed64c9007
|
Merge branch 'referral_in_patient' into 'development'
done first page in ReferralInPatient
See merge request Cloud_Solution/doctor_app_flutter!559
|
5 years ago |
Mohammad Aljammal
|
5333c0730b
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!557
|
5 years ago |
Mohammad Aljammal
|
6d530301b6
|
done first page in ReferralInPatient
|
5 years ago |
Elham Rababah
|
fceb351b6c
|
fix the progress_note_screen
|
5 years ago |
mosazaid
|
9d00440789
|
referral -re design
|
5 years ago |
Elham Rababah
|
9e31cf5379
|
first step from modification
|
5 years ago |
mosazaid
|
976da1e935
|
Merge branch 'development' into fridayf-fix-bug
|
5 years ago |
mosazaid
|
d06cf27724
|
vital-sign- fixes
|
5 years ago |
Sultan Khan
|
dad5aeb262
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
c9150ef088
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
3127a09ecf
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
704a4bd0be
|
hot fixes
|
5 years ago |
mosazaid
|
596f518525
|
Merge branch 'development' into release-hot-fix
# Conflicts:
# lib/screens/patients/profile/patient_profile_screen.dart
# lib/widgets/patients/profile/PatientProfileButton.dart
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
mosazaid
|
bf9ce4694f
|
fix logic
|
5 years ago |
Elham Rababah
|
b2a2884586
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
Conflicts:
lib/screens/patients/profile/radiology/radiology_home_page.dart
|
5 years ago |
hussam al-habibeh
|
1d09bcf251
|
hot fixes
|
5 years ago |
Elham Rababah
|
d4ddfa21e5
|
add the new logic
|
5 years ago |
Mohammad Aljammal
|
0ded3a5a03
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
9e8aef0835
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
8350d68397
|
Merge branch 'progress_note' into 'development'
add condition
See merge request Cloud_Solution/doctor_app_flutter!545
|
5 years ago |
Mohammad Aljammal
|
414ccdde49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
b37c607813
|
done the referral service
|
5 years ago |
Sultan Khan
|
426aa03aa5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
b5503a8411
|
fixes
|
5 years ago |
Elham Rababah
|
79037d8fc7
|
add condition
|
5 years ago |
Mohammad Aljammal
|
650a949c6a
|
Merge branch 'progress_note' into 'development'
Progress note
See merge request Cloud_Solution/doctor_app_flutter!542
|
5 years ago |
Elham Rababah
|
9d780f72b4
|
remove commented code
|
5 years ago |
Mohammad Aljammal
|
36189adf94
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/shared/doctor_card.dart
|
5 years ago |
Mohammad Aljammal
|
ae8882fbae
|
Merge branch 'in-patient-changes' into 'development'
In patient changes
See merge request Cloud_Solution/doctor_app_flutter!539
|
5 years ago |
Elham Rababah
|
8d7fef3db9
|
fix some issue on progress_note_screen
|
5 years ago |
hussam al-habibeh
|
e3102b3f5e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
Conflicts:
lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
|
5 years ago |
hussam al-habibeh
|
94e598c5f2
|
Insurance Approval In Patient
|
5 years ago |
mosazaid
|
2bf003c100
|
Merge branch 'development' into in-patient-changes
|
5 years ago |
mosazaid
|
33545d1180
|
work on in paitent referral
|
5 years ago |
Mohammad Aljammal
|
fd790978c4
|
add new referral service
|
5 years ago |
Sultan Khan
|
608198762d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
d0a39ca3d4
|
fixes
|
5 years ago |
Elham Rababah
|
acc3ecdbbe
|
cancel progress_note part
|
5 years ago |
Elham Rababah
|
4a263dda8a
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
Conflicts:
lib/config/config.dart
|
5 years ago |
Elham Rababah
|
82285ccf39
|
show progress_note part
|
5 years ago |
Mohammad Aljammal
|
e4aae762cc
|
Merge branch 'in-patient-changes' into 'development'
In patient changes
See merge request Cloud_Solution/doctor_app_flutter!536
|
5 years ago |
Sultan Khan
|
feef001323
|
bug fixes
|
5 years ago |
Elham Rababah
|
f2011301c6
|
update progress_note
|
5 years ago |
mosazaid
|
9aecc6fbdb
|
add lap results to inpatient and some changes on patient profile
|
5 years ago |
Elham Rababah
|
0909879ccf
|
Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
|
5 years ago |
Elham Rababah
|
5199104d7a
|
show progress_note
|
5 years ago |
mosazaid
|
b6a6f16b31
|
add vital sign inPatient
|
5 years ago |
mosazaid
|
37edd8cef9
|
add in-patient cards and header
|
5 years ago |
Elham Rababah
|
f4ce9eb004
|
Merge branches 'development' and 'radilology' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into radilology
|
5 years ago |
Elham Rababah
|
67abe2a5e7
|
first step from radiology
|
5 years ago |
Mohammad Aljammal
|
a95bb8be04
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!529
|
5 years ago |
Sultan Khan
|
5afb44adfd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Mohammad Aljammal
|
0260b92f24
|
Merge branch 'soap_refactor' into 'development'
Soap refactor
See merge request Cloud_Solution/doctor_app_flutter!528
|
5 years ago |
Sultan Khan
|
3aabb1537c
|
in patient
|
5 years ago |
Elham Rababah
|
bd01624f5a
|
create New order widget
|
5 years ago |
mosazaid
|
4b3c5b9f37
|
Merge branch 'development' into app-changes
|
5 years ago |
mosazaid
|
dde8d9aa48
|
design hot fixes
|
5 years ago |
mosazaid
|
54482bfb1d
|
hot fix
|
5 years ago |
Sultan Khan
|
6f52c9a7fd
|
fixe
|
5 years ago |
hussam al-habibeh
|
89451a3c70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
Conflicts:
lib/screens/medical-file/medical_file_page.dart
lib/screens/patients/profile/refer_patient_screen.dart
|
5 years ago |
mosazaid
|
72bb64b460
|
finish working on app text widget
|
5 years ago |
mosazaid
|
8ae0a91c05
|
working on text widget
|
5 years ago |
hussam al-habibeh
|
17c878fa4c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
Conflicts:
lib/screens/patients/profile/lab_result/lab_orders_screen.dart
lib/screens/patients/profile/refer_patient_screen.dart
|
5 years ago |
mosazaid
|
bbe94d2b9b
|
Merge branch 'development' into design-fixes
# Conflicts:
# lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
# lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
# lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
# lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
# lib/screens/patients/profile/refer_patient_screen.dart
# lib/screens/patients/profile/referral/refer-patient-screen.dart
# lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
# lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
# lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
# lib/screens/prescription/add_prescription_form.dart
# lib/screens/prescription/prescription_warnings.dart
# lib/widgets/auth/login_form.dart
# lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
|
5 years ago |
Elham Rababah
|
7b7ce4e037
|
refactor utils folder
|
5 years ago |
hussam al-habibeh
|
ebe05226e9
|
Delteing unused file & refactoring routes page
|
5 years ago |
Elham Rababah
|
7579a21b83
|
Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
Conflicts:
lib/widgets/auth/login_form.dart
|
5 years ago |
Elham Rababah
|
8220ef7700
|
add auto complete search
|
5 years ago |
mosazaid
|
b8f6c35e75
|
working on buttons widgets
|
5 years ago |
mosazaid
|
9f61c7eaa0
|
Merge branch 'design-fixes' into development
|
5 years ago |
mosazaid
|
65585ab586
|
add charts to procedures
|
5 years ago |
Elham Rababah
|
e73ca8af71
|
first step from change text fields
|
5 years ago |
Elham Rababah
|
59ec9d8e56
|
first step from change text fields
|
5 years ago |
Haroon Amjad
|
6fc72328b7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
5 years ago |
Haroon Amjad
|
27b4450dac
|
versionID changed to 5.5
|
5 years ago |
Mohammad Aljammal
|
fac8473f59
|
Merge branch 'design-fixes' into 'development'
lap result re-design
See merge request Cloud_Solution/doctor_app_flutter!515
|
5 years ago |
Mohammad Aljammal
|
43c254de05
|
Merge branch 'soap_refactor' into 'development'
Soap refactor
See merge request Cloud_Solution/doctor_app_flutter!513
|
5 years ago |
mosazaid
|
d543ce0f6f
|
lap result re-design
|
5 years ago |
Sultan Khan
|
4ed8f716db
|
dashboard changes
|
5 years ago |
Elham Rababah
|
2fd30ae1be
|
improve exam step
|
5 years ago |
Elham Rababah
|
042d4b4bfd
|
remove commented code
|
5 years ago |
Elham Rababah
|
4da72c81af
|
first step form code refactor
|
5 years ago |
Elham Rababah
|
76d411b79a
|
move soap folder to the correct place
|
5 years ago |
mosazaid
|
368ff27042
|
vitalsign fix error tet
|
5 years ago |
mosazaid
|
8950dabf7a
|
Merge branch 'development' into textfield-validation
|
5 years ago |
mosazaid
|
4b32487540
|
referral design and service changes
|
5 years ago |
Mohammad Aljammal
|
85a01edd5e
|
Merge branch 'textfield-validation' into 'development'
make referral changes
See merge request Cloud_Solution/doctor_app_flutter!498
|
5 years ago |
Mohammad Aljammal
|
b1234945e0
|
Merge branch 'fix-issues' into 'development'
Hot Fixes
See merge request Cloud_Solution/doctor_app_flutter!497
|
5 years ago |
mosazaid
|
82cbf392af
|
Merge branch 'development' into textfield-validation
|
5 years ago |
mosazaid
|
a701b6e989
|
make referral changes
|
5 years ago |
hussam al-habibeh
|
99ef89fa16
|
Hot Fixes
|
5 years ago |
Sultan Khan
|
649379d88f
|
bug fix
|
5 years ago |
Sultan Khan
|
6f9069addc
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
8652c30a24
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
da084d889c
|
hot ECG,add a new button and hot fixes
|
5 years ago |
Sultan Khan
|
20b31bde92
|
bug fix
|
5 years ago |
Sultan Khan
|
ffab532e94
|
bug fix
|
5 years ago |
Sultan Khan
|
5c4aee849e
|
bug fixes
|
5 years ago |
Sultan Khan
|
148ea967fb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
1fb59c17bc
|
bug fix
|
5 years ago |
mosazaid
|
9f35f53fa2
|
re-design
|
5 years ago |
mosazaid
|
604ff24a93
|
referral design fixes
|
5 years ago |
Sultan Khan
|
212d1dc05f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
0498545e5c
|
no data
|
5 years ago |
Sultan Khan
|
49a28c302a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
9c54f85782
|
bug fix
|
5 years ago |
mosazaid
|
0666940d56
|
Merge branch 'development' into textfield-validation
|
5 years ago |
mosazaid
|
38d577e1f7
|
vital sign fix appbar
|
5 years ago |
Mohammad Aljammal
|
b812ac4b06
|
add no data image in all pages
|
5 years ago |
hussam al-habibeh
|
6f914b3e93
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/screens/procedures/ProcedureCard.dart
lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
|
5 years ago |
hussam al-habibeh
|
3586d226e0
|
insurance approval & medical file design fix
|
5 years ago |
Mohammad Aljammal
|
f289ae0c44
|
Merge branch 'textfield-validation' into 'development'
Textfield validation
See merge request Cloud_Solution/doctor_app_flutter!475
|
5 years ago |
mosazaid
|
0e028c05f5
|
Merge branch 'development' into textfield-validation
|
5 years ago |
mosazaid
|
32e10269d4
|
add validation textfield
|
5 years ago |
Sultan Khan
|
0080b66c8e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
32d1a19248
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
915cf74d3c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/screens/patients/profile/radiology/radiology_home_page.dart
|
5 years ago |
Mohammad Aljammal
|
8055fa17eb
|
add the branch in all doctors card and add no data image
|
5 years ago |
Mohammad Aljammal
|
e1c67ad8ce
|
Merge branch 'fix-issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!471
|
5 years ago |
hussam al-habibeh
|
844bd9ba27
|
add lab & add radiology update
|
5 years ago |
mosazaid
|
3047b655cf
|
add Validation for customtextfield
|
5 years ago |
mosazaid
|
fea6501b9e
|
design fixes issues
|
5 years ago |
mosazaid
|
25c3bf1bb1
|
Merge branch 'development' into soap-objective-feature-re-design
|
5 years ago |
mosazaid
|
0128144f83
|
working onm referral card and update on ucaf design
|
5 years ago |
Mohammad Aljammal
|
9839ef4a00
|
Merge branch 'soap-objective-feature-re-design' into 'development'
cahnges on UCaf
See merge request Cloud_Solution/doctor_app_flutter!460
|
5 years ago |
Elham Rababah
|
eb5e5862ec
|
fix bugs
|
5 years ago |
Elham Rababah
|
3a7faf6b66
|
fix issues
|
5 years ago |
mosazaid
|
f017e4c280
|
cahnges on UCaf
|
5 years ago |
Mohammad Aljammal
|
c314bc7db7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/patients/profile/soap_update/update_soap_index.dart
|
5 years ago |
mosazaid
|
f0f4613960
|
Merge branch 'development' into soap-objective-feature-re-design
|
5 years ago |
mosazaid
|
f8f088fe8c
|
design changes
|
5 years ago |
Mohammad Aljammal
|
3449567086
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
hussam al-habibeh
|
b83c7835b9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
Conflicts:
lib/widgets/patients/profile/soap_update/steps_widget.dart
|
5 years ago |
hussam al-habibeh
|
26672dbb6e
|
Radiology details & assessment fix
|
5 years ago |
Mohammad Aljammal
|
87560250bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
4bf9650b4f
|
fix the design issues
|
5 years ago |
mosazaid
|
b735a69a4f
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
0e4ec6ed31
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!443
|
5 years ago |
Sultan Khan
|
2aaeaa1a36
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
1fb594617a
|
bug fixes
|
5 years ago |
hussam al-habibeh
|
1fba6c839c
|
insurance approvals deatils fix
|
5 years ago |
Mohammad Aljammal
|
2fbf48e676
|
fix font size
|
5 years ago |
Mohammad Aljammal
|
63f64356cb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Sultan Khan
|
46daeac487
|
bug fix
|
5 years ago |
Mohammad Aljammal
|
0a00413639
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
|
5 years ago |
Sultan Khan
|
9aa42c71c2
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
bb29a1ac0f
|
patient arrival
|
5 years ago |
Mohammad Aljammal
|
ecccb2d068
|
fix font size
|
5 years ago |
Mohammad Aljammal
|
4fe6652997
|
Merge branch 'patient_app_services' into 'development'
Patient app services
See merge request Cloud_Solution/doctor_app_flutter!430
|
5 years ago |
mosazaid
|
93dba4cbeb
|
vital sign fix bug
|
5 years ago |
Mohammad Aljammal
|
6ca4797c91
|
hot fixes
|
5 years ago |
mosazaid
|
f7235504fc
|
fixes
|
5 years ago |
mosazaid
|
c900969496
|
design bugs
|
5 years ago |
Mohammad Aljammal
|
98c33d550d
|
Merge branch 'fix-issues' into 'development'
insurance approvals design fix
See merge request Cloud_Solution/doctor_app_flutter!423
|
5 years ago |
hussam al-habibeh
|
6300d3f0fc
|
insurance approvals design fix
|
5 years ago |
mosazaid
|
9dc708fd3d
|
Merge branch 'development' into patients-new-design
|
5 years ago |
mosazaid
|
494f716f05
|
working on new design on vital sign and referral screens
|
5 years ago |
Mohammad Aljammal
|
7f7f7611f3
|
Merge branch 'fix-issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!419
|
5 years ago |
hussam al-habibeh
|
daa417a19b
|
Insurance approval new design
|
5 years ago |
hussam al-habibeh
|
03f39b8bab
|
insurance approval new design
|
5 years ago |
Mohammad Aljammal
|
3d8a118087
|
Merge branch 'patient_app_services' into 'development'
change the app icons
See merge request Cloud_Solution/doctor_app_flutter!415
|
5 years ago |
Mohammad Aljammal
|
17798247c7
|
change the app icons
|
5 years ago |
mosazaid
|
a454f434d1
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
2cda29a3e2
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
3a8225e666
|
hot fix
|
5 years ago |
mosazaid
|
c642d88804
|
some fixes
|
5 years ago |
mosazaid
|
46fffe56b6
|
small changes
|
5 years ago |
mosazaid
|
914f15462f
|
Merge branch 'development' into patients-new-design
|
5 years ago |
mosazaid
|
cc7c5af1d0
|
referral details fix bugs
|
5 years ago |
Mohammad Aljammal
|
3fafa0ab01
|
add the patient cad as toolbar
|
5 years ago |
mosazaid
|
caff27923b
|
Merge branch 'development' into patients-new-design
# Conflicts:
# lib/config/config.dart
|
5 years ago |
mosazaid
|
f57a5bbcef
|
working on referral page
|
5 years ago |
Mohammad Aljammal
|
34c0b0c119
|
Merge branch 'patients-new-design' into 'development'
finish Admission request new design
See merge request Cloud_Solution/doctor_app_flutter!394
|
5 years ago |
Mohammad Aljammal
|
d45b8a9cc5
|
change the font type in the app and Prescription
|
5 years ago |
mosazaid
|
f280ed731d
|
finish Admission request new design
|
5 years ago |
Mohammad Aljammal
|
2bd505290d
|
fix design
|
5 years ago |
hussam al-habibeh
|
2a1426ecd9
|
adding lab form and radiology
|
5 years ago |
Mohammad Aljammal
|
ba13ea7140
|
Merge branch 'patient_app_services' into 'development'
Patient app services
See merge request Cloud_Solution/doctor_app_flutter!389
|
5 years ago |
Mohammad Aljammal
|
920ec14bc2
|
add new design for Lab Result and Radiology Results
|
5 years ago |
Mohammad Aljammal
|
1068eea248
|
Merge branch 'patients-new-design' into 'development'
Patients new design
See merge request Cloud_Solution/doctor_app_flutter!387
|
5 years ago |
Mohammad Aljammal
|
5763970d23
|
Merge branch 'patient_app_services' into 'development'
Patient app services
See merge request Cloud_Solution/doctor_app_flutter!388
|
5 years ago |
mosazaid
|
1f70498982
|
Merge branch 'development' into patients-new-design
# Conflicts:
# lib/config/config.dart
|
5 years ago |
mosazaid
|
6eaf448d5a
|
working on new design for vital sign and admission request
|
5 years ago |
Mohammad Aljammal
|
6fbd2076d4
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
83762fbd6e
|
change the lab result design
|
5 years ago |
Sultan Khan
|
3c1a65f310
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
eadfe2d6bc
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
747a0b7da4
|
change the lab result design
|
5 years ago |
Mohammad Aljammal
|
f0c65bb70b
|
change color and font for ESG service
|
5 years ago |
Mohammad Aljammal
|
cdf923803e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
|
5 years ago |
Mohammad Aljammal
|
019553ba51
|
new design for ESG service
|
5 years ago |
mosazaid
|
8237270e73
|
fix navigation problem to patient profile cards
|
5 years ago |
mosazaid
|
c97b395810
|
send patient type to patient profile cards
|
5 years ago |
mosazaid
|
61a0e42afa
|
paient and referral screens new design
|
5 years ago |
Mohammad Aljammal
|
4877bc8f6d
|
Merge branch 'patient_app_services' into 'development'
hot fixes
See merge request Cloud_Solution/doctor_app_flutter!378
|
5 years ago |
Mohammad Aljammal
|
6267d805f0
|
hot fixes
|
5 years ago |
mosazaid
|
7117540a24
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patients-new-design
|
5 years ago |
mosazaid
|
27ff179750
|
working on referral screen bugs
|
5 years ago |
mosazaid
|
b3b2beef70
|
Merge branch 'refferal_card' into patients-new-design
|
5 years ago |
Sultan Khan
|
b19c3092a6
|
bug fixes
|
5 years ago |
mosazaid
|
ffd77528a2
|
patient profile new design
|
5 years ago |
Elham Rababah
|
4f558dc41d
|
fix referral card
|
5 years ago |
mosazaid
|
56f2b5f63a
|
Merge branch 'development' into patients-new-design
# Conflicts:
# lib/screens/patients/patients_screen.dart
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
mosazaid
|
0e05b90c6b
|
finish patient profile screen
|
5 years ago |
Sultan Khan
|
a491eee7f7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
e640bcf975
|
search updated
|
5 years ago |
Mohammad Aljammal
|
de48ae2bff
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/config/config.dart
|
5 years ago |
Mohammad Aljammal
|
17f8b05748
|
Add prescriptions and radiology from the patient app
|
5 years ago |
Sultan Khan
|
091234ad77
|
bug fix
|
5 years ago |
mosazaid
|
96d285daa6
|
patient profile new design
|
5 years ago |
Sultan Khan
|
10ef8f7954
|
bug fixes
|
5 years ago |
mosazaid
|
a13dd07734
|
Merge branch 'development' into patients-new-design
# Conflicts:
# pubspec.lock
|
5 years ago |
mosazaid
|
7702495e69
|
fix referral detail screen bug
|
5 years ago |
Mohammad Aljammal
|
7dae41513f
|
Add insurance approval services
|
5 years ago |
Mohammad Aljammal
|
e515265f11
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
0742d64428
|
add lab result services
|
5 years ago |
Sultan Khan
|
075ae0dcaa
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
5903fdd8b8
|
tab bar changes
|
5 years ago |
Elham Rababah
|
d0d8d81ae4
|
fix small issue in on search
|
5 years ago |
Elham Rababah
|
103a1bc6fc
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
Conflicts:
lib/config/localized_values.dart
lib/screens/medicine/medicine_search_screen.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Sultan Khan
|
93caeb3876
|
search screen updated
|
5 years ago |
Sultan Khan
|
bbb1a8ff74
|
arrival list updated
|
5 years ago |
Elham Rababah
|
96d07e7a59
|
fix small issue in radiology
|
5 years ago |
Elham Rababah
|
7ebf36f98f
|
add radiology open image
|
5 years ago |
Sultan Khan
|
4d4d3b460d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
27bbb9ac59
|
changes updated
|
5 years ago |
Elham Rababah
|
8a332b4d83
|
hot fix with search
|
5 years ago |
Elham Rababah
|
51c6329517
|
return back my code
|
5 years ago |
Elham Rababah
|
e7d1a6c805
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
Conflicts:
lib/screens/patients/patients_screen.dart
|
5 years ago |
Mohammad Aljammal
|
22fc45ce16
|
Merge branch 'ecg_services' into 'development'
Ecg services
See merge request Cloud_Solution/doctor_app_flutter!353
|
5 years ago |
Mohammad Aljammal
|
1af6115365
|
add ECG and Show sick leave
|
5 years ago |
Elham Rababah
|
42666e2200
|
move clinic list to its own file
|
5 years ago |
Sultan Khan
|
704d2484cf
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Mohammad Aljammal
|
ee25102c2d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ecg_services
Conflicts:
lib/screens/patients/profile/patient_profile_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
Mohammad Aljammal
|
e7e4aad962
|
add ECG service
|
5 years ago |
Sultan Khan
|
cf7d494944
|
search pages and dashboard updated
|
5 years ago |
Elham Rababah
|
e2e92c1c59
|
Clinic List widget
|
5 years ago |
Elham Rababah
|
64c7dae97c
|
Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
Conflicts:
lib/screens/patients/patients_screen.dart
|
5 years ago |
Elham Rababah
|
a40bec844b
|
Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
Conflicts:
lib/screens/patients/patients_screen.dart
|
5 years ago |
Elham Rababah
|
340bfd0a1c
|
add clinic to arrival search patient
|
5 years ago |
mosazaid
|
6c46e21031
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
# lib/screens/dashboard_screen.dart
# lib/screens/patients/patients_screen.dart
|
5 years ago |
mosazaid
|
92e60bd3fd
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
# lib/screens/dashboard_screen.dart
# lib/screens/patients/patients_screen.dart
|
5 years ago |
mosazaid
|
fdc893c3d6
|
make search patient profile have preview services
|
5 years ago |
Sultan Khan
|
a8ef4a98a5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
Sultan Khan
|
376653a344
|
dashboard changes
|
5 years ago |
Mohammad Aljammal
|
893fc05449
|
Merge branch 'patinet_profile_with_all_service' into 'development'
Patinet profile with all service
See merge request Cloud_Solution/doctor_app_flutter!345
|
5 years ago |
Elham Rababah
|
a329c447a2
|
fix allergic in header
|
5 years ago |
mosazaid
|
9b02bdc541
|
inhancements
|
5 years ago |
Elham Rababah
|
219ab8d4ac
|
fix DA-391
|
5 years ago |
mosazaid
|
a047255f2c
|
add referral get facilties
|
5 years ago |
Mohammad Aljammal
|
60e416e632
|
add done button in all pages user keyboard and hide the keyboard when the user click on background
|
5 years ago |
Mohammad Aljammal
|
8deba06957
|
Merge branch 'fix_patient_card' into 'development'
fix PatientCard
See merge request Cloud_Solution/doctor_app_flutter!304
|
5 years ago |
Elham Rababah
|
c8e5a7eeef
|
fix PatientCard
|
5 years ago |
mosazaid
|
498c6c00af
|
fix minor issue bugs (DA-273, DA-361, DA-362, DA-363)
|
5 years ago |
mosazaid
|
87f67ea2e8
|
DA-273 solve
|
5 years ago |
mosazaid
|
1207339b01
|
Merge branch 'development' into admission-request
|
5 years ago |
mosazaid
|
8d154239bb
|
finish admission request feature
|
5 years ago |
Elham Rababah
|
a1c60e692f
|
Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Elham Rababah
|
248367fbe9
|
fix DA-220
|
5 years ago |
mosazaid
|
a618292d20
|
bug fixes for DA-284-DA-285
|
5 years ago |
mosazaid
|
f87f851100
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/core/service/base/lookup-service.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
2b3a7f33d1
|
working on some bug fixes and finish addmission request
|
5 years ago |
Elham Rababah
|
1e84b73cf0
|
fix DA-279
|
5 years ago |
Elham Rababah
|
34d5ac7d43
|
add label on assessment and fix DA-333
|
5 years ago |
Mohammad Aljammal
|
9f04ef8066
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!290
|
5 years ago |
mosazaid
|
5b5954c6f3
|
working on Admission request feature adding lookup
|
5 years ago |
Elham Rababah
|
f84902b73b
|
fix : DA-333
|
5 years ago |
mosazaid
|
de1d0283d2
|
some lables and translation changes and add search functionality for ListSelectDialog
|
5 years ago |
mosazaid
|
a64088320f
|
DA-259 translation bug
|
5 years ago |
mosazaid
|
c2df291029
|
DA - 286 Fix
|
5 years ago |
mosazaid
|
2273808333
|
translation
|
5 years ago |
mosazaid
|
cca4e33fce
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
ebc5ba7743
|
some fixes
|
5 years ago |
Elham Rababah
|
7db8a42adc
|
Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
e75318799f
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
ac9fd8c936
|
samll fixes for labels and msges
|
5 years ago |
Elham Rababah
|
fd17fc4608
|
enforce user to add date in case referral
|
5 years ago |
Elham Rababah
|
905818b532
|
add admission no to orders
|
5 years ago |
Elham Rababah
|
b9eaee1887
|
fix design
|
5 years ago |
Elham Rababah
|
13c879654b
|
DA-250: fix age
|
5 years ago |
Elham Rababah
|
9ddfbd3e66
|
fix issue on app drawer
|
5 years ago |
Elham Rababah
|
8c9ffc2e62
|
fix multiple issue
|
5 years ago |
Elham Rababah
|
537f53c3de
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
cd95a581f0
|
simple changes
|
5 years ago |
Elham Rababah
|
e32c360f85
|
fix DA-154,DA-150
|
5 years ago |
mosazaid
|
e808d48035
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
88f1dc637f
|
some fixes
|
5 years ago |
Elham Rababah
|
8360179050
|
fix DA-195
|
5 years ago |
Elham Rababah
|
d53493aa52
|
fix DA-237
|
5 years ago |
Elham Rababah
|
c6156921e8
|
fix DA-197
|
5 years ago |
Elham Rababah
|
4a3175830d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
Conflicts:
lib/config/localized_values.dart
lib/screens/dashboard_screen.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
763d6bb49f
|
finish add loader
|
5 years ago |
Mohammad Aljammal
|
f75ab83981
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
Conflicts:
lib/config/localized_values.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
mosazaid
|
eae0bb443f
|
solve problem with vital signs charts depend on date
|
5 years ago |
mosazaid
|
dcb71e5c22
|
Add charts to patient vital signs feature
&
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/util/translations_delegate_base.dart
# pubspec.yaml
|
5 years ago |
Elham Rababah
|
23fb2e7297
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
5 years ago |
Elham Rababah
|
6bab2e0b2d
|
fix referral patient issue
|
5 years ago |
mosazaid
|
8424e92c4b
|
working on vital Sign feature with Charts
|
5 years ago |
mosazaid
|
8726653ffb
|
working on Referral feature
|
5 years ago |
mosazaid
|
2f17167e2f
|
some design enhancments
|
5 years ago |
mosazaid
|
97d05c72c2
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
21114fc88f
|
Merge branch 'development' into 'feature-ucaf'
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
Elham
|
9e7a7210c4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!244
|
5 years ago |
Elham Rababah
|
fb035cd4c9
|
fix patient_search_screen.dart
|
5 years ago |
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
5 years ago |
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
5 years ago |
mosazaid
|
9a5cafaaf5
|
working on UCAF detail screen , and some cahgnes on referral list
|
5 years ago |
mosazaid
|
e14df2855a
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
50d7f733b6
|
working on UCAF datails and add patient procedure list and diagnosis
|
5 years ago |
Mohammad Aljammal
|
eb5a3a59ff
|
hot fixing
|
5 years ago |
mosazaid
|
b67fd55aac
|
Merge branch 'development' into feature-ucaf
|
5 years ago |
mosazaid
|
e75e7801aa
|
working on UCAF get data
|
5 years ago |
Mohammad Aljammal
|
d7b8e29455
|
Merge branch 'medical-file' into 'development'
drug list
See merge request Cloud_Solution/doctor_app_flutter!234
|
5 years ago |
hussam al-habibeh
|
f997561bb8
|
drug list
|
5 years ago |
mosazaid
|
c9aac6e2e9
|
vital signs solve overflow of the width
|
5 years ago |
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
5 years ago |
mosazaid
|
88ee50f7cb
|
change make referral page loading behaviour
|
5 years ago |
mosazaid
|
ee9ca72057
|
change empty referral message
|
5 years ago |
mosazaid
|
ce164c3cb6
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
0c39dc6693
|
change on vital signs for uncoment the service
|
5 years ago |
mosazaid
|
4b5bec8c50
|
working on UCAF design
|
5 years ago |
Elham Rababah
|
ba14d23c05
|
Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
5 years ago |
Elham Rababah
|
e65740761a
|
add improvement on create episode
|
5 years ago |
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
5 years ago |
mosazaid
|
e9ffbf06a6
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
mosazaid
|
3578c82f62
|
solve hacking patient screen
|
5 years ago |
mosazaid
|
095a915a89
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
5 years ago |
mosazaid
|
cb4ee05b40
|
working on ucaf
|
5 years ago |
Mohammad Aljammal
|
a723ecbf1d
|
fix merger
|
5 years ago |
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
mosazaid
|
5142b5b6c7
|
finish admission request design
|
5 years ago |
Elham Rababah
|
05e7762533
|
fix obj page
|
5 years ago |
Elham Rababah
|
61209663f3
|
Finish arrived
|
5 years ago |
mosazaid
|
4d44d54806
|
Merge branch 'development' into feature_admission_request
|
5 years ago |
Mohammad Aljammal
|
806682b921
|
hack login
|
5 years ago |
Elham Rababah
|
dccf474e70
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_arrival_ist
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
lib/core/service/patient_service.dart
lib/core/viewModel/patient_view_model.dart
lib/lookups/patient_lookup.dart
lib/models/patient/patiant_info_model.dart
lib/screens/patients/patients_screen.dart
|
5 years ago |
mosazaid
|
433b2933c4
|
working with admission request and some changes in vital signs
|
5 years ago |
mosazaid
|
f35eff1220
|
working with admission request
|
5 years ago |
mosazaid
|
78e2c662c8
|
finish vital sign feature, and adding makeReferralResponse
|
5 years ago |
mosazaid
|
25d884c774
|
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/routes.dart
# lib/util/helpers.dart
# lib/util/translations_delegate_base.dart
# lib/widgets/patients/profile/SOAP/add_SOAP_index.dart
# pubspec.lock
|
5 years ago |
mosazaid
|
b5c937bd86
|
Working on vitalSigns,
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/routes.dart
|
5 years ago |
mosazaid
|
a71da8e4ef
|
working on vital signs
|
5 years ago |
hussam al-habibeh
|
d3bf97fdd8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/routes.dart
lib/util/translations_delegate_base.dart
lib/widgets/shared/TextFields.dart
lib/widgets/shared/app_buttons_widget.dart
lib/widgets/shared/app_text_form_field.dart
lib/widgets/shared/app_texts_widget.dart
|
5 years ago |
mosazaid
|
d11a8e6209
|
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/core/service/base/base_service.dart
# lib/locator.dart
|
5 years ago |
mosazaid
|
aafcd89222
|
working on vitalSigns feature
|
5 years ago |
hussam al-habibeh
|
1ce6571668
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/routes.dart
lib/screens/patients/profile/refer_patient_screen.dart
lib/util/translations_delegate_base.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
lib/widgets/shared/TextFields.dart
lib/widgets/shared/app_text_form_field.dart
|
5 years ago |
Sultan Khan
|
5585274b18
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
hussam al-habibeh
|
749e870ea2
|
get procedures get prescription
|
5 years ago |
Sultan Khan
|
5dcc03cfa8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
5 years ago |
mosazaid
|
4ac8fe4681
|
finish refferal module except accept/reject referral
&
Merge branch 'development' into feature--patient-referral
# Conflicts:
# lib/client/base_app_client.dart
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/locator.dart
# lib/util/translations_delegate_base.dart
|
5 years ago |
mosazaid
|
7cefbb4dbd
|
add referral pages
|
5 years ago |
Sultan Khan
|
8d58348267
|
dashboard changes
|
5 years ago |
Elham Rababah
|
c15300125e
|
First step objective_page.dart
|
5 years ago |
Elham Rababah
|
518c30bdeb
|
Merge branches 'SOAP' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/config/localized_values.dart
|
5 years ago |
Elham Rababah
|
44779e6ee7
|
patient screen
|
5 years ago |
Elham Rababah
|
9c018d3c55
|
first step from patient arrival
|
5 years ago |
Elham Rababah
|
46cdd9482c
|
First step from SOAP
|
5 years ago |
mosazaid
|
bb1f101e94
|
finish re-design refer-patient screen
|
5 years ago |
hussam al-habibeh
|
cbb8937b1d
|
'12/14'
|
5 years ago |
hussam al-habibeh
|
7de6a8e99f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/localized_values.dart
lib/landing_page.dart
lib/screens/patients/profile/refer_patient_screen.dart
|
5 years ago |
hussam al-habibeh
|
c581638e00
|
refer_patient_screen 'not finshed'
|
5 years ago |
Elham Rababah
|
9f19b2566f
|
finish refactor provider
|
5 years ago |
Elham Rababah
|
64dbcce06f
|
finish and remove patient provider
|
5 years ago |
Elham
|
6057e6a266
|
Merge branch 'refactor' into 'development'
Refactor
See merge request Cloud_Solution/doctor_app_flutter!180
|
5 years ago |
Elham
|
746765f4d7
|
Merge branch 'design-updates' into 'development'
patients_screen design update
See merge request Cloud_Solution/doctor_app_flutter!179
|
5 years ago |
Elham Rababah
|
1b1e8f0712
|
second step from patient provider
|
5 years ago |
hussam al-habibeh
|
6f90c31f9f
|
patients_screen design update
|
5 years ago |
Elham Rababah
|
6ab73916eb
|
first step from patient provider
|
5 years ago |
mosazaid
|
e5341e3031
|
Merge branch 'development' into replay-design
# Conflicts:
# lib/config/localized_values.dart
# lib/screens/patients/patients_screen.dart
|
5 years ago |
mosazaid
|
5ed9aea5a7
|
fix HexColor library error
|
5 years ago |
hussam al-habibeh
|
6bbc629060
|
patients out and patients in screens design updates
|
5 years ago |
hussam al-habibeh
|
911921e0b8
|
in-patient && out-patient
|
5 years ago |
Elham Rababah
|
91cc76a9cf
|
medicine search fix bugs =
|
5 years ago |
Elham Rababah
|
53862ec1b3
|
fix bugs in patient search
|
5 years ago |
Elham Rababah
|
f1721b686d
|
fix loader inside pharmacies_list
|
5 years ago |
Elham Rababah
|
b308dc5826
|
change doctor app icons and optimization
|
6 years ago |
Elham Rababah
|
8980fc03aa
|
Finish Patient search design
|
6 years ago |
Elham Rababah
|
fbc99d681f
|
First step from medicine search and change the logo
|
6 years ago |
Elham
|
7fe2a96065
|
Merge branch 'hussam' into 'development'
translation 'updates'
See merge request Cloud_Solution/doctor_app_flutter!136
|
6 years ago |
hussam al-habibeh
|
000315ac0e
|
translation 'updates'
|
6 years ago |
ibrahim albitar
|
c07f84ff78
|
fixing and enhancments
|
6 years ago |
hussam al-habibeh
|
91ffdabd73
|
Translation stage five
|
6 years ago |
hussam al-habibeh
|
fb6d54faaf
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
Conflicts:
lib/screens/dashboard_screen.dart
|
6 years ago |
hussam al-habibeh
|
054933b280
|
Translation stage four
|
6 years ago |
Elham Rababah
|
bd3ce0a4d4
|
refactor models
|
6 years ago |
erababah
|
cad096d8c7
|
fix issue on ios and improve structure by Elham & mohammad
|
6 years ago |
hussam al-habibeh
|
b63d8906bc
|
Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/profile_screen.dart
|
6 years ago |
hussam alhababieh
|
a02fe9c83d
|
translation stage two
|
6 years ago |
amjad nabil amireh
|
640829f454
|
Merge branch 'Amjad_search' into 'development'
Modify patiant screen icon avatar
See merge request Cloud_Solution/doctor_app_flutter!121
|
6 years ago |
Amjad Amireh
|
4e62947df2
|
Modify patiant screen icon avatar
|
6 years ago |
Elham Rababah
|
574a951fcf
|
finish clinic exept design
|
6 years ago |
hussam alhababieh
|
b0005e72f9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam alhababieh
|
b4570d7bd1
|
translation for pages stage one
|
6 years ago |
ibrahim albitar
|
09ca836ea7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
6 years ago |
ibrahim albitar
|
6fd43a281d
|
fixing
|
6 years ago |
Mohammad Aljammal
|
f6aec27788
|
Merge branch 'mohammad' into 'development'
fix issues in Patient
See merge request Cloud_Solution/doctor_app_flutter!115
|
6 years ago |
Mohammad ALjammal
|
d52429564d
|
fix issues in Patient
|
6 years ago |
hussam alhababieh
|
dcbf1312b7
|
translate dashboard/patient search
|
6 years ago |
hussam alhababieh
|
097d8df8c0
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
6 years ago |
hussam alhababieh
|
b178f08278
|
translate dashboard and patient search
|
6 years ago |