Elham Rababah
|
13c879654b
|
DA-250: fix age
|
4 years ago |
Mohammad Aljammal
|
81fdcb2d8d
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!271
|
4 years ago |
Mohammad Aljammal
|
fbd509d6ec
|
Merge branch 'fix-issues' into 'development'
bugs fix
See merge request Cloud_Solution/doctor_app_flutter!272
|
4 years ago |
hussam al-habibeh
|
fb8381ea61
|
bugs fix
|
4 years ago |
Elham Rababah
|
68d27a451d
|
fix general issue
|
4 years ago |
Elham Rababah
|
a5bccddf55
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
4 years ago |
Elham Rababah
|
9ddfbd3e66
|
fix issue on app drawer
|
4 years ago |
Sultan Khan
|
d5d7ea6c49
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
63e8ee8dd0
|
sick leave
|
4 years ago |
hussam alhababieh
|
3c55af7adc
|
Merge branch 'development' into 'tasks-translation'
# Conflicts:
# lib/screens/prescription/add_prescription_form.dart
|
4 years ago |
hussam al-habibeh
|
7c800bdab4
|
medical file fix
|
4 years ago |
Elham Rababah
|
00543a759a
|
fix remarks in allergies
|
4 years ago |
Elham Rababah
|
8c9ffc2e62
|
fix multiple issue
|
4 years ago |
Elham Rababah
|
cbf850da2f
|
fix DA-201
|
4 years ago |
Mohammad Aljammal
|
35a9f34b18
|
Merge branch 'development' into 'sultan'
# Conflicts:
# lib/widgets/patients/profile/profile_medical_info_widget.dart
|
4 years ago |
Sultan Khan
|
135c852e8c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
735698ce90
|
bug fixes
|
4 years ago |
hussam al-habibeh
|
bada160cf5
|
Search Medacation
|
4 years ago |
hussam al-habibeh
|
d9fcf89c19
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
Conflicts:
lib/core/viewModel/medicine_view_model.dart
|
4 years ago |
hussam al-habibeh
|
4a4cd03f63
|
Prescription date
|
4 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
|
4 years ago |
Elham Rababah
|
ba263ada44
|
fix DA-201
|
4 years ago |
hussam al-habibeh
|
ced4edebde
|
patinet profile update
|
4 years ago |
Elham Rababah
|
53e88620ec
|
fix DA-230
|
4 years ago |
Sultan Khan
|
d55ce4c1ec
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Mohammad Aljammal
|
5af6210785
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!263
|
4 years ago |
Mohammad Aljammal
|
574e1525d9
|
Merge branch 'tasks-translation' into 'development'
Prescription & medical file fix
See merge request Cloud_Solution/doctor_app_flutter!262
|
4 years ago |
mosazaid
|
cd95a581f0
|
simple changes
|
4 years ago |
Sultan Khan
|
896078507f
|
gub fixes
|
4 years ago |
hussam al-habibeh
|
e133a014e8
|
Prescription & medical file fix
|
4 years ago |
Elham Rababah
|
e32c360f85
|
fix DA-154,DA-150
|
4 years ago |
mosazaid
|
e808d48035
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
mosazaid
|
88f1dc637f
|
some fixes
|
4 years ago |
Elham Rababah
|
8360179050
|
fix DA-195
|
4 years ago |
Elham Rababah
|
c11f195e72
|
fix DA-192
|
4 years ago |
Elham Rababah
|
d53493aa52
|
fix DA-237
|
4 years ago |
Elham Rababah
|
c6156921e8
|
fix DA-197
|
4 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
|
4 years ago |
Sultan Khan
|
417ca9401b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
a99b3847ac
|
login completed
|
4 years ago |
Elham Rababah
|
763d6bb49f
|
finish add loader
|
4 years ago |
hussam al-habibeh
|
5150f9b93d
|
Prescription & procedure body update
|
4 years ago |
Elham Rababah
|
bc8a90ef2c
|
first step from fix loader
|
4 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
|
4 years ago |
Mohammad Aljammal
|
9147cde86e
|
Merge branch 'tasks-translation' into 'development'
medical dile & Order Procedure translation
See merge request Cloud_Solution/doctor_app_flutter!256
|
4 years ago |
hussam al-habibeh
|
015c3b53c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
4 years ago |
hussam al-habibeh
|
e67233bb21
|
medical dile & Order Procedure translation
|
4 years ago |
mosazaid
|
eae0bb443f
|
solve problem with vital signs charts depend on date
|
4 years ago |
mosazaid
|
d9d4e22531
|
Merge branch 'development' into feature-ucaf
|
4 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
|
4 years ago |
hussam alhababieh
|
d87aeb290f
|
Merge branch 'development' into 'procedure-fix'
# Conflicts:
# lib/landing_page.dart
|
4 years ago |
hussam al-habibeh
|
b0410dc744
|
Procedure updates
|
4 years ago |
hussam al-habibeh
|
debcad3a3d
|
prescription
|
4 years ago |
hussam al-habibeh
|
4b54ca7d47
|
prescription
|
4 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
|
4 years ago |
Elham Rababah
|
6bab2e0b2d
|
fix referral patient issue
|
4 years ago |
mosazaid
|
8424e92c4b
|
working on vital Sign feature with Charts
|
4 years ago |
Sultan Khan
|
722e1a5c41
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
ad99cebf02
|
login and drug to drug
|
4 years ago |
Mohammad Aljammal
|
307463865b
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!249
|
4 years ago |
Mohammad Aljammal
|
3306d6f400
|
Merge branch 'medical-file' into 'development'
post Procedure
See merge request Cloud_Solution/doctor_app_flutter!248
|
4 years ago |
hussam al-habibeh
|
dd53a9bd4d
|
post Procedure
|
4 years ago |
mosazaid
|
8726653ffb
|
working on Referral feature
|
4 years ago |
Sultan Khan
|
909940a6d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
40e9ab864a
|
login changes
|
4 years ago |
mosazaid
|
2f17167e2f
|
some design enhancments
|
4 years ago |
Mohammad Aljammal
|
21114fc88f
|
Merge branch 'development' into 'feature-ucaf'
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
Mohammad Aljammal
|
70cfc4668b
|
Merge branch 'medical-file' into 'development'
Medical file
See merge request Cloud_Solution/doctor_app_flutter!243
|
4 years ago |
Elham
|
9e7a7210c4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!244
|
4 years ago |
Elham Rababah
|
fb035cd4c9
|
fix patient_search_screen.dart
|
4 years ago |
hussam al-habibeh
|
5253c28469
|
prescription form fix
|
4 years ago |
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
4 years ago |
mosazaid
|
289cf9b479
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
Mohammad Aljammal
|
e60cc5ec4a
|
Merge branch 'medical-file' into 'development'
Medical file
See merge request Cloud_Solution/doctor_app_flutter!240
|
4 years ago |
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
4 years ago |
hussam al-habibeh
|
f767467a67
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical-file
|
4 years ago |
hussam al-habibeh
|
bcbd091dae
|
ss
|
4 years ago |
hussam al-habibeh
|
a3fa8ef839
|
medical file fix
|
4 years ago |
mosazaid
|
ff906338bf
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
mosazaid
|
9a5cafaaf5
|
working on UCAF detail screen , and some cahgnes on referral list
|
4 years ago |
mosazaid
|
e14df2855a
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
mosazaid
|
50d7f733b6
|
working on UCAF datails and add patient procedure list and diagnosis
|
4 years ago |
Sultan Khan
|
71c4d48cca
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
c4cae6fb38
|
doctor leave bug fix
|
4 years ago |
Mohammad Aljammal
|
eb5a3a59ff
|
hot fixing
|
4 years ago |
Sultan Khan
|
87d90a394b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
044ad7b51a
|
offtime leave
|
4 years ago |
mosazaid
|
b67fd55aac
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
mosazaid
|
e75e7801aa
|
working on UCAF get data
|
4 years ago |
Mohammad Aljammal
|
d7b8e29455
|
Merge branch 'medical-file' into 'development'
drug list
See merge request Cloud_Solution/doctor_app_flutter!234
|
4 years ago |
hussam al-habibeh
|
f997561bb8
|
drug list
|
4 years ago |
Mohammad Aljammal
|
699c565427
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!232
|
4 years ago |
Mohammad Aljammal
|
d20604aaaf
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!231
|
4 years ago |
Sultan Khan
|
d67b531865
|
bug fix
|
4 years ago |
Sultan Khan
|
31d6ca5593
|
Doctor ID updated
|
4 years ago |
mosazaid
|
4f1c70a3f4
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
mosazaid
|
c9aac6e2e9
|
vital signs solve overflow of the width
|
4 years ago |
Mohammad Aljammal
|
ff9eaeb09f
|
Merge branch 'sultan' into 'development'
reschdule leave
See merge request Cloud_Solution/doctor_app_flutter!230
|
4 years ago |
Sultan Khan
|
ad48415038
|
reschdule leave
|
4 years ago |
mosazaid
|
a51239447b
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
Mohammad Aljammal
|
dc9a9ad4f6
|
Merge branch 'medical-file' into 'development'
medical file
See merge request Cloud_Solution/doctor_app_flutter!229
|
4 years ago |
mosazaid
|
7983f998bd
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
hussam al-habibeh
|
76cc4d11f8
|
medical file
|
4 years ago |
Sultan Khan
|
ad967e8aae
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
4 years ago |
Sultan Khan
|
68cfbf8fc7
|
doctor leave
|
4 years ago |
mosazaid
|
88ee50f7cb
|
change make referral page loading behaviour
|
4 years ago |
mosazaid
|
b5a102add3
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
mosazaid
|
ee9ca72057
|
change empty referral message
|
4 years ago |
hussam al-habibeh
|
eef5d57d2f
|
Merge branches 'development' and 'pesrcription-post' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pesrcription-post
|
4 years ago |
hussam al-habibeh
|
16b949461d
|
prescription post
|
4 years ago |
mosazaid
|
ce164c3cb6
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
mosazaid
|
0c39dc6693
|
change on vital signs for uncoment the service
|
4 years ago |
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 |
mosazaid
|
5ed9aea5a7
|
fix HexColor library error
|
4 years ago |
hussam al-habibeh
|
6bbc629060
|
patients out and patients in screens design updates
|
4 years ago |
Elham Rababah
|
58de54997a
|
refactor search medicine Service
|
4 years ago |
Elham Rababah
|
7863f13b0e
|
Merge branches 'development' and 'refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into refactor
|
4 years ago |
Elham Rababah
|
45cde2cb72
|
refactor Referred Patient Service
|
4 years ago |
Elham
|
f641698d6c
|
Merge branch 'refactor' into 'development'
refactor Referral Patient Service
See merge request Cloud_Solution/doctor_app_flutter!174
|
4 years ago |
hussam al-habibeh
|
911921e0b8
|
in-patient && out-patient
|
4 years ago |
Elham Rababah
|
df9d151f46
|
refactor Referral Patient Service
|
4 years ago |
Elham Rababah
|
6e461f7212
|
refactor Schedule service
|
4 years ago |
Elham Rababah
|
0c7c4d7dae
|
refactor doctor replay service
|
4 years ago |
Mohammad Aljammal
|
3cedf3c927
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_mvvm
Conflicts:
lib/providers/medicine_provider.dart
|
4 years ago |
Mohammad Aljammal
|
e6edd5449f
|
Add MVVM
|
4 years ago |
Elham Rababah
|
91cc76a9cf
|
medicine search fix bugs =
|
4 years ago |
Elham Rababah
|
ec3b69f0cb
|
The Patient services Names the words should be in separate line.
|
4 years ago |
Elham Rababah
|
53862ec1b3
|
fix bugs in patient search
|
4 years ago |
Elham Rababah
|
f1721b686d
|
fix loader inside pharmacies_list
|
4 years ago |
Elham Rababah
|
9a18c405c7
|
comment code not working in good way until we fixed
|
4 years ago |
Elham Rababah
|
1ad3652913
|
Fix issue related to pharmacies_list_screen.dart
|
4 years ago |
Elham Rababah
|
b308dc5826
|
change doctor app icons and optimization
|
4 years ago |
Elham Rababah
|
8980fc03aa
|
Finish Patient search design
|
4 years ago |
Elham Rababah
|
0d8455faa7
|
Finish medicine search design
|
4 years ago |
Elham Rababah
|
871bd6ab20
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medicine_desgin
Conflicts:
lib/config/localized_values.dart
lib/screens/medicine/medicine_search_screen.dart
lib/util/translations_delegate_base.dart
lib/widgets/shared/app_text_form_field.dart
|
4 years ago |
Elham Rababah
|
fbc99d681f
|
First step from medicine search and change the logo
|
4 years ago |
Mohammad Aljammal
|
2e4f9fa335
|
Merge remote-tracking branch 'origin/development' into development
|
4 years ago |
Mohammad Aljammal
|
146a53a6e5
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/config/config.dart
lib/models/pharmacies/pharmacies_List_request_model.dart
lib/screens/medicine/medicine_search_screen.dart
|
4 years ago |
Elham Rababah
|
d28d2ecdeb
|
add improvement dashboard screen design
|
4 years ago |
Elham Rababah
|
dff6c25031
|
add improvement dashboard screen design
|
4 years ago |
Elham Rababah
|
e37a3e8ce1
|
Finish dashboard screen design
|
4 years ago |
Sultan Khan
|
6eb2da3770
|
voice search
|
4 years ago |
hussam al-habibeh
|
efc5db9f5b
|
versionID update
|
4 years ago |
hussam al-habibeh
|
ba72d40deb
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
4 years ago |
hussam al-habibeh
|
b6d2cdb1db
|
fixing clinic name in app reopening
|
4 years ago |
Sultan Khan
|
3f7ef48fd5
|
live care chages
|
4 years ago |
hussam al-habibeh
|
d449086f9a
|
Fixing Clinic name in app reopening
|
4 years ago |
Mohammad ALjammal
|
d4b3e42070
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/dashboard_screen.dart
|
4 years ago |
Elham Rababah
|
287bb20d12
|
fix issues ios
|
4 years ago |
Mohammad ALjammal
|
d5825ccb85
|
fix issues
|
4 years ago |
Mohammad ALjammal
|
d22ce32cdb
|
add call back android
|
4 years ago |
hussam al-habibeh
|
acaaca314e
|
get clinic list after changing the language
|
4 years ago |
hussam al-habibeh
|
aa57f4c4d7
|
get clinic list after changing the language
|
4 years ago |
hussam al-habibeh
|
629ccbeda8
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
Conflicts:
lib/screens/dashboard_screen.dart
|
4 years ago |
hussam al-habibeh
|
d866d8b9de
|
get clinic list
|
4 years ago |
Mohammad Aljammal
|
9dc1c27334
|
Merge branch 'sultan' into 'development'
Sultan
See merge request Cloud_Solution/doctor_app_flutter!143
|
4 years ago |
Sultan Khan
|
8a9d20990b
|
Video call page updated
|
4 years ago |
Sultan Khan
|
cad6892c8b
|
Video call page updated
|
4 years ago |
ibrahim albitar
|
98950890a0
|
Add User Guid Module
|
4 years ago |
Sultan Khan
|
b66eebfd10
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
3b0aff2efa
|
overflow issue and model mapped
|
4 years ago |
Mohammad ALjammal
|
c671059a03
|
fix issues in video call
|
4 years ago |
Mohammad ALjammal
|
270d7ffa6d
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
Conflicts:
lib/main.dart
|
4 years ago |
Mohammad ALjammal
|
7cc1c36ab4
|
change Medicine Provider to use BaseAppClient
|
4 years ago |
Sultan Khan
|
dd3154a498
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
Sultan Khan
|
bde86ef829
|
live care features added.
|
4 years ago |
Mohammad ALjammal
|
42a639f8b8
|
integration with opentok ios
|
4 years ago |
Mohammad ALjammal
|
990d36d804
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
|
4 years ago |
Mohammad ALjammal
|
868b118243
|
integration with OpenTok android
|
4 years ago |
Elham
|
7fe2a96065
|
Merge branch 'hussam' into 'development'
translation 'updates'
See merge request Cloud_Solution/doctor_app_flutter!136
|
4 years ago |
hussam al-habibeh
|
000315ac0e
|
translation 'updates'
|
4 years ago |
ibrahim albitar
|
c07f84ff78
|
fixing and enhancments
|
4 years ago |
Sultan Khan
|
f052ffc8f3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
93936c3c55
|
video call screen added
|
4 years ago |
Elham
|
c35c6f7444
|
Merge branch 'elham' into 'development'
Elham
See merge request Cloud_Solution/doctor_app_flutter!134
|
4 years ago |
Elham Rababah
|
89241460da
|
change clinic name
|
4 years ago |
hussam al-habibeh
|
91ffdabd73
|
Translation stage five
|
4 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
|
4 years ago |
hussam al-habibeh
|
054933b280
|
Translation stage four
|
4 years ago |
Elham Rababah
|
bd3ce0a4d4
|
refactor models
|
4 years ago |
erababah
|
cad096d8c7
|
fix issue on ios and improve structure by Elham & mohammad
|
4 years ago |
Mohammad ALjammal
|
aff8f87a2f
|
fix merge issues
|
4 years ago |
Mohammad ALjammal
|
63dd8262da
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/screens/dashboard_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
4 years ago |
hussam al-habibeh
|
ea78db6a75
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
# Conflicts:
# lib/config/localized_values.dart
# lib/screens/dashboard_screen.dart
# lib/util/translations_delegate_base.dart
|
4 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
|
4 years ago |
Sultan Khan
|
79c2de3f96
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# fonts/DoctorApp.ttf
# lib/presentation/doctor_app_icons.dart
|
4 years ago |
hussam alhababieh
|
a02fe9c83d
|
translation stage two
|
4 years ago |
ibrahim albitar
|
fc1d4c9a9b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
4 years ago |
ibrahim albitar
|
57708de8e4
|
pharmacies screen scrollview
|
4 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
|
4 years ago |
Amjad Amireh
|
4e62947df2
|
Modify patiant screen icon avatar
|
4 years ago |
Elham
|
69b02e29c5
|
Merge branch 'elham' into 'development'
Elham
See merge request Cloud_Solution/doctor_app_flutter!120
|
4 years ago |
Elham Rababah
|
574a951fcf
|
finish clinic exept design
|
4 years ago |
hussam alhababieh
|
b0005e72f9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
4 years ago |
hussam alhababieh
|
b4570d7bd1
|
translation for pages stage one
|
4 years ago |
Elham Rababah
|
165d697e33
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
4 years ago |
Elham Rababah
|
5779fb9ad7
|
change profile based on change clinic
|
4 years ago |
Amjad Amireh
|
230bdb2430
|
Modify Dr profile data dynamic size
|
4 years ago |
Elham Rababah
|
ef8dfc5b5f
|
first step form change clinic
|
4 years ago |
ibrahim albitar
|
09ca836ea7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
4 years ago |