Mohammad Aljammal
|
307463865b
|
Merge branch 'feature-ucaf' into 'development'
Feature ucaf
See merge request Cloud_Solution/doctor_app_flutter!249
|
6 years ago |
Mohammad Aljammal
|
3306d6f400
|
Merge branch 'medical-file' into 'development'
post Procedure
See merge request Cloud_Solution/doctor_app_flutter!248
|
6 years ago |
hussam al-habibeh
|
dd53a9bd4d
|
post Procedure
|
6 years ago |
mosazaid
|
8726653ffb
|
working on Referral feature
|
6 years ago |
Sultan Khan
|
909940a6d9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Sultan Khan
|
40e9ab864a
|
login changes
|
6 years ago |
mosazaid
|
97d05c72c2
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
Mohammad Aljammal
|
21114fc88f
|
Merge branch 'development' into 'feature-ucaf'
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
Elham
|
9e7a7210c4
|
Merge branch 'soap_update' into 'development'
Soap update
See merge request Cloud_Solution/doctor_app_flutter!244
|
6 years ago |
Elham Rababah
|
0147e7e49b
|
do translation, fix some bugs
|
6 years ago |
Elham Rababah
|
175ba545e7
|
finish create episode
|
6 years ago |
Elham Rababah
|
4f1a892be4
|
first step form create episode
|
6 years ago |
mosazaid
|
fd2a86dca4
|
some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral
|
6 years ago |
mosazaid
|
ff906338bf
|
Merge branch 'development' into feature-ucaf
|
6 years ago |
mosazaid
|
9a5cafaaf5
|
working on UCAF detail screen , and some cahgnes on referral list
|
6 years ago |
mosazaid
|
e14df2855a
|
Merge branch 'development' into feature-ucaf
|
6 years ago |
mosazaid
|
50d7f733b6
|
working on UCAF datails and add patient procedure list and diagnosis
|
6 years ago |
Sultan Khan
|
c4cae6fb38
|
doctor leave bug fix
|
6 years ago |
Sultan Khan
|
87d90a394b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Sultan Khan
|
044ad7b51a
|
offtime leave
|
6 years ago |
mosazaid
|
b67fd55aac
|
Merge branch 'development' into feature-ucaf
|
6 years ago |
mosazaid
|
e75e7801aa
|
working on UCAF get data
|
6 years ago |
Mohammad Aljammal
|
d7b8e29455
|
Merge branch 'medical-file' into 'development'
drug list
See merge request Cloud_Solution/doctor_app_flutter!234
|
6 years ago |
hussam al-habibeh
|
f997561bb8
|
drug list
|
6 years ago |
mosazaid
|
a51239447b
|
Merge branch 'development' into feature-ucaf
|
6 years ago |
hussam al-habibeh
|
76cc4d11f8
|
medical file
|
6 years ago |
mosazaid
|
ceb0cde34c
|
finish UCAF design and solve problem on vital signs response
|
6 years ago |
mosazaid
|
88ee50f7cb
|
change make referral page loading behaviour
|
6 years ago |
mosazaid
|
ce164c3cb6
|
Merge branch 'development' into feature-ucaf
# Conflicts:
# lib/config/localized_values.dart
# lib/util/translations_delegate_base.dart
|
6 years ago |
mosazaid
|
0c39dc6693
|
change on vital signs for uncoment the service
|
6 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
|
6 years ago |
Sultan Khan
|
9adc5ddd8e
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Elham Rababah
|
71b50c8404
|
First step translations
|
6 years ago |
Sultan Khan
|
43a1e56a8b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Sultan Khan
|
9bf07d7117
|
reschedule leave
|
6 years ago |
hussam al-habibeh
|
4ffeb31181
|
update procedure fixes
|
6 years ago |
Mohammad Aljammal
|
d975fb021c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/routes.dart
lib/util/helpers.dart
|
6 years ago |
Sultan Khan
|
4587fdda59
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Sultan Khan
|
e23bb7ce94
|
reschedule leave
|
6 years ago |
Elham Rababah
|
423bd49aee
|
Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
Conflicts:
lib/routes.dart
|
6 years ago |
mosazaid
|
b4f813fc2d
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/locator.dart
# lib/routes.dart
|
6 years ago |
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
|
75eda8832d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
|
6 years ago |
hussam al-habibeh
|
d1a261c847
|
procedure update
|
6 years ago |
mosazaid
|
0e645c2b1f
|
Merge branch 'development' into feature_admission_request
|
6 years ago |
Elham Rababah
|
3cadd532d8
|
finish Updating
|
6 years ago |
Sultan Khan
|
b2aef274bb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Sultan Khan
|
3c968f0de1
|
doctor leave
|
6 years ago |
Elham Rababah
|
4caf40a2ab
|
finish plan page
|
6 years ago |
Elham Rababah
|
d8ac550357
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
|
6 years ago |
Elham Rababah
|
311bee5136
|
try to fix get
|
6 years ago |
Elham Rababah
|
46043efb42
|
Finish Update objective code Page
|
6 years ago |
Elham Rababah
|
c92a848851
|
Finish Update Subjective Page
|
6 years ago |
mosazaid
|
095a915a89
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
6 years ago |
mosazaid
|
cb4ee05b40
|
working on ucaf
|
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
|
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 |
Elham Rababah
|
39970fe1a8
|
get update_subjective_page.dart
|
6 years ago |
Elham Rababah
|
f0fd5d30e1
|
First step from update process
|
6 years ago |
mosazaid
|
ae6cd0e5f8
|
Merge branch 'development' into feature_admission_request
|
6 years ago |
mosazaid
|
5142b5b6c7
|
finish admission request design
|
6 years ago |
hussam al-habibeh
|
b3345a86ef
|
post prescription
|
6 years ago |
Sultan Khan
|
669655307a
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Sultan Khan
|
49e9ecfa4a
|
doctor leave
|
6 years ago |
Elham
|
88c2c04d68
|
Merge branch 'design-updates' into 'development'
post prescription
See merge request Cloud_Solution/doctor_app_flutter!203
|
6 years ago |
Elham Rababah
|
61209663f3
|
Finish arrived
|
6 years ago |
mosazaid
|
873ee67eb7
|
Merge branch 'development' into feature_admission_request
# Conflicts:
# lib/routes.dart
|
6 years ago |
mosazaid
|
433b2933c4
|
working with admission request and some changes in vital signs
|
6 years ago |
mosazaid
|
f35eff1220
|
working with admission request
|
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 |
Elham Rababah
|
efee00c79e
|
finish add assessment
|
6 years ago |
Elham Rababah
|
72886ccaa7
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/client/base_app_client.dart
|
6 years ago |
Elham Rababah
|
a47e9b69f5
|
add CDI service
|
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
|
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
|
6 years ago |
hussam al-habibeh
|
c7bfe24207
|
post procedure
|
6 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
|
6 years ago |
Elham Rababah
|
1672d9a3a0
|
add assessment_page code
|
6 years ago |
Elham Rababah
|
dc4250a4de
|
Post progress Note
|
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 |
Elham Rababah
|
1491a04b39
|
PostPhysicalExam works
|
6 years ago |
Elham Rababah
|
4df3b1fb40
|
First step from examination
|
6 years ago |
Elham Rababah
|
cde56a82f2
|
Finish subjective
|
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 |
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 |
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
|
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 |
Elham Rababah
|
74d315b887
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
Conflicts:
lib/client/base_app_client.dart
|
6 years ago |
mosazaid
|
47e9d2a558
|
Merge branch 'development' into feature--patient-referral
# Conflicts:
# lib/client/base_app_client.dart
|
6 years ago |
Elham Rababah
|
e96d38454c
|
First step from examination
|
6 years ago |
Elham Rababah
|
bb651478a0
|
Finish subjective
|
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
|
9b0731d5c8
|
check activation code
|
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 |
Elham Rababah
|
a3dff8c9f8
|
Post Allergies service
|
6 years ago |
Elham Rababah
|
405ad731c7
|
history list ready
|
6 years ago |
Elham Rababah
|
df68e912b5
|
first step from calling history
|
6 years ago |
Sultan Khan
|
8d58348267
|
dashboard changes
|
6 years ago |
Elham Rababah
|
ef6b1bc50e
|
add master lookups
|
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 |
mosazaid
|
94093e775e
|
add vital-sign files
|
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 |
mosazaid
|
bb1f101e94
|
finish re-design refer-patient screen
|
6 years ago |
Sultan Khan
|
900264bc26
|
sick leave
|
6 years ago |
Sultan Khan
|
06f71a22fb
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
|
6 years ago |
Elham Rababah
|
9f19b2566f
|
finish refactor provider
|
6 years ago |
Elham Rababah
|
1b1e8f0712
|
second step from patient provider
|
6 years ago |
Elham Rababah
|
6ab73916eb
|
first step from patient provider
|
6 years ago |
Elham Rababah
|
58de54997a
|
refactor search medicine Service
|
6 years ago |
Elham Rababah
|
45cde2cb72
|
refactor Referred Patient Service
|
6 years ago |
Elham Rababah
|
df9d151f46
|
refactor Referral Patient Service
|
6 years ago |
Elham Rababah
|
6e461f7212
|
refactor Schedule service
|
6 years ago |
Elham Rababah
|
0c7c4d7dae
|
refactor doctor replay service
|
6 years ago |
Mohammad Aljammal
|
e6edd5449f
|
Add MVVM
|
6 years ago |