Mohammad Aljammal
|
3cb96f35ca
|
Merge branch 'design-updates' into 'development'
Design updates
See merge request Cloud_Solution/doctor_app_flutter!211
|
6 years ago |
hussam al-habibeh
|
d1a261c847
|
procedure update
|
6 years ago |
Mohammad Aljammal
|
93c0bdf32a
|
return login
|
6 years ago |
hussam al-habibeh
|
b3567df020
|
medical file model
|
6 years ago |
hussam al-habibeh
|
9210600e15
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
6 years ago |
mosazaid
|
3578c82f62
|
solve hacking patient screen
|
6 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
|
6 years ago |
hussam al-habibeh
|
adb8033138
|
update prescription
|
6 years ago |
Mohammad Aljammal
|
a723ecbf1d
|
fix merger
|
6 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
|
6 years ago |
Mohammad Aljammal
|
45edddb49f
|
Add search in Procedure Screen
|
6 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
|
6 years ago |
hussam al-habibeh
|
b3345a86ef
|
post prescription
|
6 years ago |
Elham Rababah
|
05e7762533
|
fix obj page
|
6 years ago |
Elham Rababah
|
61209663f3
|
Finish arrived
|
6 years ago |
Mohammad Aljammal
|
806682b921
|
hack login
|
6 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
|
6 years ago |
hussam al-habibeh
|
17079a1bd9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
6 years ago |
hussam al-habibeh
|
9d8514c83b
|
post prescription
|
6 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
|
6 years ago |
Mohammad Aljammal
|
04ed76069c
|
hack login
|
6 years ago |
Mohammad Aljammal
|
21252c6ae9
|
Merge branch 'feature-vital-sign' into 'development'
Feature vital sign
See merge request Cloud_Solution/doctor_app_flutter!201
|
6 years ago |
mosazaid
|
78e2c662c8
|
finish vital sign feature, and adding makeReferralResponse
|
6 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
|
6 years ago |
mosazaid
|
b5c937bd86
|
Working on vitalSigns,
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/routes.dart
|
6 years ago |
hussam al-habibeh
|
c7bfe24207
|
post procedure
|
6 years ago |
mosazaid
|
a71da8e4ef
|
working on vital signs
|
6 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
|
6 years ago |
mosazaid
|
d11a8e6209
|
Merge branch 'development' into feature-vital-sign
# Conflicts:
# lib/core/service/base/base_service.dart
# lib/locator.dart
|
6 years ago |
Sultan Khan
|
1da12873c7
|
dashboard
|
6 years ago |
mosazaid
|
aafcd89222
|
working on vitalSigns feature
|
6 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
|
6 years ago |
Sultan Khan
|
5585274b18
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
hussam al-habibeh
|
749e870ea2
|
get procedures get prescription
|
6 years ago |
Sultan Khan
|
5dcc03cfa8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
mosazaid
|
47e9d2a558
|
Merge branch 'development' into feature--patient-referral
# Conflicts:
# lib/client/base_app_client.dart
|
6 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
|
6 years ago |
Elham Rababah
|
7001940d0d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new
|
6 years ago |
mosazaid
|
7cefbb4dbd
|
add referral pages
|
6 years ago |
Sultan Khan
|
8d58348267
|
dashboard changes
|
6 years ago |
Elham Rababah
|
c15300125e
|
First step objective_page.dart
|
6 years ago |
Sultan Khan
|
e61f3f0281
|
add sick leave
|
6 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
|
6 years ago |
Elham Rababah
|
44779e6ee7
|
patient screen
|
6 years ago |
Elham Rababah
|
9c018d3c55
|
first step from patient arrival
|
6 years ago |
Sultan Khan
|
4f96cff585
|
sick leave
|
6 years ago |
Sultan Khan
|
e5d542f1d0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Elham Rababah
|
46cdd9482c
|
First step from SOAP
|
6 years ago |
Sultan Khan
|
ba2697c917
|
sick leave
|
6 years ago |
Elham Rababah
|
4eee5cd9d8
|
new login type
|
6 years ago |