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 |
Elham Rababah
|
1e84b73cf0
|
fix DA-279
|
4 years ago |
|
Elham Rababah
|
34d5ac7d43
|
add label on assessment and fix DA-333
|
4 years ago |
Mohammad Aljammal
|
9f04ef8066
|
Merge branch 'fix_issues' into 'development'
Fix issues
See merge request Cloud_Solution/doctor_app_flutter!290
|
4 years ago |
|
mosazaid
|
5b5954c6f3
|
working on Admission request feature adding lookup
|
4 years ago |
|
Elham Rababah
|
f84902b73b
|
fix : DA-333
|
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 |
|
mosazaid
|
2273808333
|
translation
|
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
|
fd17fc4608
|
enforce user to add date in case referral
|
4 years ago |
|
Elham Rababah
|
905818b532
|
add admission no to orders
|
4 years ago |
|
Elham Rababah
|
b9eaee1887
|
fix design
|
4 years ago |
|
Elham Rababah
|
13c879654b
|
DA-250: fix age
|
4 years ago |
|
Elham Rababah
|
9ddfbd3e66
|
fix issue on app drawer
|
4 years ago |
|
Elham Rababah
|
8c9ffc2e62
|
fix multiple issue
|
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 |
|
mosazaid
|
cd95a581f0
|
simple changes
|
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
|
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 |
|
Elham Rababah
|
763d6bb49f
|
finish add 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 |
|
mosazaid
|
eae0bb443f
|
solve problem with vital signs charts depend on date
|
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 |
|
mosazaid
|
8726653ffb
|
working on Referral feature
|
4 years ago |
|
mosazaid
|
2f17167e2f
|
some design enhancments
|
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
|
fb035cd4c9
|
fix patient_search_screen.dart
|
4 years ago |
|
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
4 years ago |
|
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
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 |
|
Mohammad Aljammal
|
eb5a3a59ff
|
hot fixing
|
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 |
|
mosazaid
|
c9aac6e2e9
|
vital signs solve overflow of the width
|
4 years ago |
|
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
4 years ago |
|
mosazaid
|
88ee50f7cb
|
change make referral page loading behaviour
|
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 |
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 |
|
mosazaid
|
b60bac6d6e
|
working on UCAF design
|
4 years ago |
|
mosazaid
|
e9ffbf06a6
|
Merge branch 'development' into feature_admission_request
|
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 |
|
Mohammad Aljammal
|
a723ecbf1d
|
fix merger
|
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
|
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
|
433b2933c4
|
working with admission request and some changes in vital signs
|
4 years ago |
|
mosazaid
|
f35eff1220
|
working with admission request
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Elham Rababah
|
46cdd9482c
|
First step from SOAP
|
4 years ago |
|
mosazaid
|
bb1f101e94
|
finish re-design refer-patient screen
|
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 |