hussam al-habibeh
|
d115564cc1
|
DA-355
|
4 years ago |
Sultan Khan
|
388c095d7f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
a309acbf46
|
dashboard changes
|
4 years ago |
Elham Rababah
|
083b49aa0a
|
fix DA-341
|
4 years ago |
mosazaid
|
a047255f2c
|
add referral get facilties
|
4 years ago |
Sultan Khan
|
f0539860c2
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
400f8e25f6
|
bug xis
|
4 years ago |
mosazaid
|
1207339b01
|
Merge branch 'development' into admission-request
|
4 years ago |
mosazaid
|
8d154239bb
|
finish admission request feature
|
4 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
|
4 years ago |
Elham Rababah
|
248367fbe9
|
fix DA-220
|
4 years ago |
Elham Rababah
|
753ef3bfb0
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
4 years ago |
Elham Rababah
|
a5a7425a09
|
fix DA-149
|
4 years ago |
mosazaid
|
a618292d20
|
bug fixes for DA-284-DA-285
|
4 years ago |
mosazaid
|
f87f851100
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/core/service/base/lookup-service.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
mosazaid
|
2b3a7f33d1
|
working on some bug fixes and finish addmission request
|
4 years ago |
Sultan Khan
|
8b7acf7202
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
6a23c2a137
|
bug fix
|
4 years ago |
mosazaid
|
5b5954c6f3
|
working on Admission request feature adding lookup
|
4 years ago |
Mohammad Aljammal
|
8b992b4189
|
Merge branch 'development' into 'fix_issues'
# Conflicts:
# lib/config/localized_values.dart
|
4 years ago |
Elham Rababah
|
494479f1d9
|
fix : DA-264 fix merge error
|
4 years ago |
Elham Rababah
|
437ae3dfb5
|
Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
Conflicts:
lib/config/localized_values.dart
|
4 years ago |
Elham Rababah
|
34692b94c2
|
fix : DA-264
|
4 years ago |
mosazaid
|
de1d0283d2
|
some lables and translation changes and add search functionality for ListSelectDialog
|
4 years ago |
mosazaid
|
a64088320f
|
DA-259 translation bug
|
4 years ago |
mosazaid
|
c2df291029
|
DA - 286 Fix
|
4 years ago |
Mohammad Aljammal
|
6253e2c9a3
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_ios
Conflicts:
lib/util/translations_delegate_base.dart
|
4 years ago |
Mohammad Aljammal
|
75efcde0bc
|
fix ios
|
4 years ago |
mosazaid
|
cca4e33fce
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
mosazaid
|
ebc5ba7743
|
some fixes
|
4 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
|
4 years ago |
mosazaid
|
e75318799f
|
Merge branch 'development' into feature-ucaf
|
4 years ago |
mosazaid
|
ac9fd8c936
|
samll fixes for labels and msges
|
4 years ago |
Elham Rababah
|
c065dbbdb3
|
Fixed DA:266
|
4 years ago |
Elham Rababah
|
913ffc3052
|
Fix DA-260,DA-267
|
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 |
Elham Rababah
|
68d27a451d
|
fix general issue
|
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 |
Elham Rababah
|
484c737836
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
|
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 |
Elham Rababah
|
f0cd33ae43
|
fix issue on assessment design
|
4 years ago |
Elham Rababah
|
1de25aae2f
|
fix issue on assessment design
|
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
|
cc92fe56c6
|
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
|
c11f195e72
|
fix DA-192
|
4 years ago |
Elham Rababah
|
855ed0ac12
|
fix 145
|
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 |
Elham Rababah
|
9674eb89d9
|
add modification on so
|
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 |
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 |
hussam al-habibeh
|
1fa52e0394
|
medical dile & Order Procedure translation
|
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
|
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 |
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
|
97d05c72c2
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
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 |
Elham
|
9e7a7210c4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!244
|
4 years ago |
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
4 years ago |
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
4 years ago |
mosazaid
|
ca9f1a022b
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
4 years ago |
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
4 years ago |
Elham
|
8494f6e0f4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!241
|
4 years ago |
Elham Rababah
|
a46a61c5cf
|
fix get and post issue to make it works with vida
|
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 |
Elham Rababah
|
7ce1d2dd55
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
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
|
e75e7801aa
|
working on UCAF get data
|
4 years ago |
Elham Rababah
|
ffe7e7c57f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
4 years ago |
Elham Rababah
|
c3bb408787
|
add some translations
|
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 |
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
|
ee9ca72057
|
change empty referral message
|
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 |
Elham Rababah
|
71b50c8404
|
First step translations
|
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
|
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 |
hussam al-habibeh
|
d1a261c847
|
procedure update
|
4 years ago |
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
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
|
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
|
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 |
Elham Rababah
|
f0fd5d30e1
|
First step from update process
|
4 years ago |
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
4 years ago |
mosazaid
|
5142b5b6c7
|
finish admission request design
|
4 years ago |
Elham Rababah
|
ea4bf159c6
|
commit issue
|
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
|
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 |
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
|
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 |
Elham Rababah
|
efee00c79e
|
finish add assessment
|
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 |
hussam al-habibeh
|
0c18d96ba2
|
post procedure
|
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
|
b2aade9b2b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/client/base_app_client.dart
lib/config/config.dart
|
4 years ago |
hussam al-habibeh
|
c7bfe24207
|
post procedure
|
4 years ago |
Elham Rababah
|
ab9740ccdd
|
remove Vida Auth from config
|
4 years ago |
Elham Rababah
|
edef444534
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/config/config.dart
lib/core/service/base/lookup-service.dart
|
4 years ago |
Elham Rababah
|
dc4250a4de
|
Post progress Note
|
4 years ago |
hussam al-habibeh
|
47a350a811
|
prscription and procedure
|
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 |
Elham Rababah
|
1491a04b39
|
PostPhysicalExam works
|
4 years ago |
hussam al-habibeh
|
697f17f2cd
|
prescription and procedure
|
4 years ago |
Sultan Khan
|
e45220829f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Elham Rababah
|
cde56a82f2
|
Finish subjective
|
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 |
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 |
Elham Rababah
|
d4a1dcfc81
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/client/base_app_client.dart
lib/core/service/base/lookup-service.dart
|
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 |
Elham Rababah
|
74d315b887
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/client/base_app_client.dart
|
4 years ago |
mosazaid
|
47e9d2a558
|
Merge branch 'development' into feature--patient-referral
# Conflicts:
# lib/client/base_app_client.dart
|
4 years ago |
Elham Rababah
|
abbe891673
|
improve code quality
|
4 years ago |
Elham Rababah
|
bb651478a0
|
Finish subjective
|
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
|
9b0731d5c8
|
check activation code
|
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 |
Elham Rababah
|
a3dff8c9f8
|
Post Allergies service
|
4 years ago |
Sultan Khan
|
989c06ae33
|
prescription changes
|
4 years ago |
Sultan Khan
|
8d58348267
|
dashboard changes
|
4 years ago |
Elham Rababah
|
ef6b1bc50e
|
add master lookups
|
4 years ago |
Sultan Khan
|
e61f3f0281
|
add sick leave
|
4 years ago |
Elham Rababah
|
dcba85c7b9
|
Finish first step subjective_page.dart
|
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
|
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
|
81352c2b0e
|
small fix.
|
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
|
97d915ef99
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
cc1a63786f
|
sick leave
|
4 years ago |
hussam al-habibeh
|
dfca3aa0e5
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
Conflicts:
lib/config/localized_values.dart
lib/util/translations_delegate_base.dart
|
4 years ago |
hussam al-habibeh
|
cbb8937b1d
|
'12/14'
|
4 years ago |
Sultan Khan
|
06f71a22fb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
mosazaid
|
16821c17fc
|
re-design in-patient detail page
|
4 years ago |
Sultan Khan
|
ac747e7519
|
dashboard
|
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 |
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 |
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
|
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
|
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
|
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 |
Sultan Khan
|
e942999784
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Sultan Khan
|
3f7ef48fd5
|
live care chages
|
4 years ago |
hussam al-habibeh
|
d3bb85129c
|
LogIn function refactoring
|
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
|
d866d8b9de
|
get clinic list
|
4 years ago |
Mohammad ALjammal
|
c671059a03
|
fix issues in video call
|
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 |
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 |
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 |
ibrahim albitar
|
33979f4838
|
Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
4 years ago |
ibrahim albitar
|
ee8d481504
|
live care web service
|
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 |
hussam al-habibeh
|
8f04edb450
|
Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/landing_page.dart
|
4 years ago |
Mohammad ALjammal
|
aff8f87a2f
|
fix merge issues
|
4 years ago |
hussam al-habibeh
|
c486d7f357
|
translation stage three
|
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 |
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 |
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 |
ibrahim albitar
|
73844dd4f2
|
Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
|
4 years ago |
ibrahim albitar
|
8da67db69f
|
fix patient type dropdown
|
4 years ago |
hussam alhababieh
|
dcbf1312b7
|
translate dashboard/patient search
|
4 years ago |
hussam alhababieh
|
097d8df8c0
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
|
4 years ago |
hussam alhababieh
|
b178f08278
|
translate dashboard and patient search
|
4 years ago |
Mohammad ALjammal
|
a3730e4efb
|
fix issues with sultan branch
|
4 years ago |
Mohammad ALjammal
|
79eb6b19d0
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
Conflicts:
lib/config/config.dart
lib/presentation/doctor_app_icons.dart
lib/screens/dashboard_screen.dart
lib/screens/medicine/medicine_search_screen.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
4 years ago |
Mohammad ALjammal
|
692674fac0
|
merge ibrahim
|
4 years ago |
ibrahim albitar
|
4638ba56a2
|
jira fixes
|
4 years ago |
Salman Afzal
|
11f10f1eea
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# lib/config/config.dart
# lib/screens/dashboard_screen.dart
# lib/screens/patients/patients_screen.dart
|
4 years ago |
Amjad Amireh
|
f3c20d9866
|
Modify Patiant screen List style
|
4 years ago |
Elham Rababah
|
3e05a58dd7
|
delete app client
|
4 years ago |
Mohammad ALjammal
|
eb09cda2a1
|
fix issues in patients provider
|
4 years ago |
Elham Rababah
|
d4ba01de5b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham
|
4 years ago |
Elham Rababah
|
a42f06c9ff
|
modify hospital provider to make it call app base
|
4 years ago |
unknown
|
ce5ee4a21e
|
Merge branch 'develop' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
Conflicts:
lib/providers/patients_provider.dart
lib/routes.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
|
4 years ago |
Salman Afzal
|
a48ad33f36
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
4 years ago |
Salman Afzal
|
a914ff9367
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
# lib/config/config.dart
# lib/presentation/doctor_app_icons.dart
|
4 years ago |
unknown
|
39cc4fa4bf
|
refere to doctor
|
4 years ago |
Amjad Amireh
|
d136537b44
|
Modify Patiant screen List style
|
4 years ago |
Mohammad ALjammal
|
2ad96dad88
|
create Prescription In and Out Patient
|
4 years ago |