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
|
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
|
bf86fcc168
|
fix in note and AddReplayOnReferralPatient
|
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
|
7559ab31c0
|
fix out patient + fix steper in arabic
|
5 years ago |
mosazaid
|
6fba03ed69
|
design fixes
|
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
|
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 |
Elham Rababah
|
7c2889c5d2
|
fix height issue
|
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 |
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
|
60eb7adab1
|
hot fixes
|
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
|
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
|
f4fd4b26d6
|
Add filter in outpatient
|
5 years ago |
Mohammad Aljammal
|
3927c40d7e
|
Fix Patient Profile
|
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 |
Mohammad Aljammal
|
357e01c846
|
hot fixes
|
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 |
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 |
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 |
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 |
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
|
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 |
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
|
d06cf27724
|
vital-sign- 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
|
b37c607813
|
done the referral service
|
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 |
Elham Rababah
|
8d7fef3db9
|
fix some issue on progress_note_screen
|
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 |
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 |
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
|
0260b92f24
|
Merge branch 'soap_refactor' into 'development'
Soap refactor
See merge request Cloud_Solution/doctor_app_flutter!528
|
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 |
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 |
mosazaid
|
d543ce0f6f
|
lap result re-design
|
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
|
4b32487540
|
referral design and service changes
|
5 years ago |
mosazaid
|
a701b6e989
|
make referral changes
|
5 years ago |
Mohammad Aljammal
|
da084d889c
|
hot ECG,add a new button and hot fixes
|
5 years ago |
mosazaid
|
9f35f53fa2
|
re-design
|
5 years ago |
mosazaid
|
604ff24a93
|
referral design fixes
|
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 |
mosazaid
|
0e028c05f5
|
Merge branch 'development' into textfield-validation
|
5 years ago |
mosazaid
|
32e10269d4
|
add validation textfield
|
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 |
mosazaid
|
f0f4613960
|
Merge branch 'development' into soap-objective-feature-re-design
|
5 years ago |
mosazaid
|
f8f088fe8c
|
design changes
|
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 |
mosazaid
|
b735a69a4f
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
2fbf48e676
|
fix font size
|
5 years ago |
Mohammad Aljammal
|
ecccb2d068
|
fix font size
|
5 years ago |
mosazaid
|
93dba4cbeb
|
vital sign fix bug
|
5 years ago |
mosazaid
|
f7235504fc
|
fixes
|
5 years ago |
mosazaid
|
c900969496
|
design bugs
|
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
|
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 |
mosazaid
|
6eaf448d5a
|
working on new design for vital sign and admission request
|
5 years ago |
Mohammad Aljammal
|
83762fbd6e
|
change the lab result design
|
5 years ago |
Mohammad Aljammal
|
747a0b7da4
|
change the lab result design
|
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 |
Mohammad Aljammal
|
17f8b05748
|
Add prescriptions and radiology from the patient app
|
5 years ago |
mosazaid
|
96d285daa6
|
patient profile new design
|
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
|
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
|
96d07e7a59
|
fix small issue in radiology
|
5 years ago |
Elham Rababah
|
7ebf36f98f
|
add radiology open image
|
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 |
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 |
mosazaid
|
a047255f2c
|
add referral get facilties
|
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 |
mosazaid
|
5b5954c6f3
|
working on Admission request feature adding lookup
|
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
|
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
|
ac9fd8c936
|
samll fixes for labels and msges
|
5 years ago |
Elham Rababah
|
905818b532
|
add admission no to orders
|
5 years ago |
Elham Rababah
|
b9eaee1887
|
fix design
|
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
|
88f1dc637f
|
some fixes
|
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 |
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 |