mosazaid
|
4b5bec8c50
|
working on UCAF design
|
4 years ago |
Mohammad Aljammal
|
f0f98280b4
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
|
4 years ago |
Sultan Khan
|
9adc5ddd8e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
6a8c37e0d7
|
doctor leave
|
4 years ago |
|
Sultan Khan
|
6c894c3d3b
|
sick leave
|
4 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
|
4 years ago |
|
Elham Rababah
|
e65740761a
|
add improvement on create episode
|
4 years ago |
|
Sultan Khan
|
43a1e56a8b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
9bf07d7117
|
reschedule leave
|
4 years ago |
hussam al-habibeh
|
e72ef46efb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
4 years ago |
|
hussam al-habibeh
|
4ffeb31181
|
update procedure fixes
|
4 years ago |
|
Sultan Khan
|
4587fdda59
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
e23bb7ce94
|
reschedule leave
|
4 years ago |
|
mosazaid
|
b4f813fc2d
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/locator.dart
# lib/routes.dart
|
4 years ago |
Mohammad Aljammal
|
3cb96f35ca
|
Merge branch 'design-updates' into 'development'
Design updates
See merge request Cloud_Solution/doctor_app_flutter!211
|
4 years ago |
|
hussam al-habibeh
|
75eda8832d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
4 years ago |
|
hussam al-habibeh
|
d1a261c847
|
procedure update
|
4 years ago |
|
mosazaid
|
0e645c2b1f
|
Merge branch 'development' into feature_admission_request
|
4 years ago |
|
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
4 years ago |
|
Sultan Khan
|
70d11bfe9e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
93c0bdf32a
|
return login
|
4 years ago |
|
Sultan Khan
|
b2aef274bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
3c968f0de1
|
doctor leave
|
4 years ago |
|
hussam al-habibeh
|
b3567df020
|
medical file model
|
4 years ago |
|
mosazaid
|
e9ffbf06a6
|
Merge branch 'development' into feature_admission_request
|
4 years ago |
|
hussam al-habibeh
|
9210600e15
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
4 years ago |
|
mosazaid
|
3578c82f62
|
solve hacking patient screen
|
4 years ago |
|
mosazaid
|
095a915a89
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
4 years ago |
|
mosazaid
|
cb4ee05b40
|
working on ucaf
|
4 years ago |
|
hussam al-habibeh
|
ce0303fbce
|
Merge branch 'search_in_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/config.dart
|
4 years ago |
|
hussam al-habibeh
|
adb8033138
|
update prescription
|
4 years ago |
|
Mohammad Aljammal
|
a723ecbf1d
|
fix merger
|
4 years ago |
|
Mohammad Aljammal
|
5669021add
|
Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
Conflicts:
lib/widgets/patients/profile/SOAP/assessment_page.dart
lib/widgets/patients/profile/SOAP/subjective/add_allergies_widget.dart
lib/widgets/patients/profile/SOAP/subjective/subjective_page.dart
|
4 years ago |
|
Mohammad Aljammal
|
45edddb49f
|
Add search in Procedure Screen
|
4 years ago |
|
Mohammad Aljammal
|
b60b45ab53
|
Merge branch 'design-updates' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
Conflicts:
lib/screens/patients/patient_search_screen.dart
|
4 years ago |
|
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
4 years ago |
|
mosazaid
|
5142b5b6c7
|
finish admission request design
|
4 years ago |
|
hussam al-habibeh
|
b3345a86ef
|
post prescription
|
4 years ago |
|
Sultan Khan
|
669655307a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Sultan Khan
|
49e9ecfa4a
|
doctor leave
|
4 years ago |
Elham
|
88c2c04d68
|
Merge branch 'design-updates' into 'development'
post prescription
See merge request Cloud_Solution/doctor_app_flutter!203
|
4 years ago |
|
Elham Rababah
|
05e7762533
|
fix obj page
|
4 years ago |
|
Elham Rababah
|
61209663f3
|
Finish arrived
|
4 years ago |
|
mosazaid
|
4d44d54806
|
Merge branch 'development' into feature_admission_request
|
4 years ago |
|
Mohammad Aljammal
|
806682b921
|
hack login
|
4 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
|
4 years ago |
|
mosazaid
|
873ee67eb7
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
4 years ago |
|
mosazaid
|
433b2933c4
|
working with admission request and some changes in vital signs
|
4 years ago |
|
mosazaid
|
f35eff1220
|
working with admission request
|
4 years ago |
|
hussam al-habibeh
|
17079a1bd9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
4 years ago |
|
hussam al-habibeh
|
9d8514c83b
|
post prescription
|
4 years ago |
|
Mohammad Aljammal
|
6f2e764deb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hack_login
Conflicts:
lib/client/base_app_client.dart
lib/routes.dart
|
4 years ago |
|
Mohammad Aljammal
|
04ed76069c
|
hack login
|
4 years ago |
|
Mohammad Aljammal
|
21252c6ae9
|
Merge branch 'feature-vital-sign' into 'development'
Feature vital sign
See merge request Cloud_Solution/doctor_app_flutter!201
|
4 years ago |
|
mosazaid
|
78e2c662c8
|
finish vital sign feature, and adding makeReferralResponse
|
4 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
|
4 years ago |
|
mosazaid
|
b5c937bd86
|
Working on vitalSigns,
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/routes.dart
|
4 years ago |
|
hussam al-habibeh
|
c7bfe24207
|
post procedure
|
4 years ago |
|
mosazaid
|
a71da8e4ef
|
working on vital signs
|
4 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
|
4 years ago |
|
mosazaid
|
d11a8e6209
|
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/core/service/base/base_service.dart
# lib/locator.dart
|
4 years ago |
|
Sultan Khan
|
1da12873c7
|
dashboard
|
4 years ago |
|
mosazaid
|
aafcd89222
|
working on vitalSigns feature
|
4 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
|
4 years ago |
|
Sultan Khan
|
5585274b18
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
hussam al-habibeh
|
749e870ea2
|
get procedures get prescription
|
4 years ago |
|
Sultan Khan
|
5dcc03cfa8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
mosazaid
|
47e9d2a558
|
Merge branch 'development' into feature--patient-referral
# Conflicts:
# lib/client/base_app_client.dart
|
4 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
|
4 years ago |
|
Elham Rababah
|
7001940d0d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new
|
4 years ago |
|
mosazaid
|
7cefbb4dbd
|
add referral pages
|
4 years ago |
|
Sultan Khan
|
8d58348267
|
dashboard changes
|
4 years ago |
|
Elham Rababah
|
c15300125e
|
First step objective_page.dart
|
4 years ago |
|
Sultan Khan
|
e61f3f0281
|
add sick leave
|
4 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
|
4 years ago |
|
Elham Rababah
|
44779e6ee7
|
patient screen
|
4 years ago |
|
Elham Rababah
|
9c018d3c55
|
first step from patient arrival
|
4 years ago |
|
Sultan Khan
|
4f96cff585
|
sick leave
|
4 years ago |
|
Sultan Khan
|
e5d542f1d0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
|
Elham Rababah
|
46cdd9482c
|
First step from SOAP
|
4 years ago |
|
Sultan Khan
|
ba2697c917
|
sick leave
|
4 years ago |
|
Elham Rababah
|
4eee5cd9d8
|
new login type
|
4 years ago |
|
mosazaid
|
bb1f101e94
|
finish re-design refer-patient screen
|
4 years ago |
|
Sultan Khan
|
900264bc26
|
sick leave
|
4 years ago |
|
Sultan Khan
|
76e10459e0
|
sick leave
|
4 years ago |
|
Sultan Khan
|
cc1a63786f
|
sick leave
|
4 years ago |
|
hussam al-habibeh
|
cbb8937b1d
|
'12/14'
|
4 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
|
4 years ago |
|
hussam al-habibeh
|
c581638e00
|
refer_patient_screen 'not finshed'
|
4 years ago |
|
Elham Rababah
|
9f19b2566f
|
finish refactor provider
|
4 years ago |
|
Elham Rababah
|
64dbcce06f
|
finish and remove patient provider
|
4 years ago |
|
Elham
|
6057e6a266
|
Merge branch 'refactor' into 'development'
Refactor
See merge request Cloud_Solution/doctor_app_flutter!180
|
4 years ago |
|
Elham
|
746765f4d7
|
Merge branch 'design-updates' into 'development'
patients_screen design update
See merge request Cloud_Solution/doctor_app_flutter!179
|
4 years ago |
|
Elham Rababah
|
1b1e8f0712
|
second step from patient provider
|
4 years ago |
|
hussam al-habibeh
|
6f90c31f9f
|
patients_screen design update
|
4 years ago |
|
Elham Rababah
|
6ab73916eb
|
first step from patient provider
|
4 years ago |
|
mosazaid
|
e5341e3031
|
Merge branch 'development' into replay-design
# Conflicts:
# lib/config/localized_values.dart
# lib/screens/patients/patients_screen.dart
|
4 years ago |
|
mosazaid
|
f9ae2559f0
|
working on referral reply screen
|
4 years ago |
|
Elham
|
664d2b5c2b
|
Merge branch 'design-updates' into 'development'
patients out and patients in screens design updates
See merge request Cloud_Solution/doctor_app_flutter!177
|
4 years ago |
|
mosazaid
|
a55b605a6c
|
Merge branch 'development' into replay-design
|
4 years ago |