Commit Graph

769 Commits (6f2e764deb186b9bb90456900af993ebf160bc7b)
 

Author SHA1 Message Date
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
Elham Rababah 2f273dcde8 add ICD10 4 years ago
Elham Rababah 4e8de52efe add commented code 4 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 4 years ago
Elham Rababah 14955201a9 fix things 4 years ago
Elham Rababah efee00c79e finish add assessment 4 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
4 years ago
Elham Rababah a47e9b69f5 add CDI service 4 years ago
Elham eec30761a2 Merge branch 'design-updates' into 'development'
post procedure

See merge request Cloud_Solution/doctor_app_flutter!200
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
Elham Rababah 8a6ea1c0c5 Fix SOAP 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
Mohammad Aljammal 94cdce2dea Merge branch 'fix_base_app_client' into 'development'
Fix base app client

See merge request Cloud_Solution/doctor_app_flutter!199
4 years ago
Mohammad Aljammal df83883139 fix base app client 4 years ago
Mohammad Aljammal 7c4e0d929f fix base app client 4 years ago
Elham 531a9f0545 Merge branch 'SOAP' into 'development'
Soap

See merge request Cloud_Solution/doctor_app_flutter!198
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 1672d9a3a0 add assessment_page code 4 years ago
Elham Rababah dc4250a4de Post progress Note 4 years ago
Elham Rababah b22fd3f7ba fix listHisProgNotePhysicalExaminationVM 4 years ago
Elham Rababah f97d11183d progress Note 4 years ago
Elham fb962acbc0 Merge branch 'design-updates' into 'development'
Design updates

See merge request Cloud_Solution/doctor_app_flutter!195
4 years ago
mosazaid a71da8e4ef working on vital signs 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
Elham 3ca4dceb77 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!197
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 e6af5a3e39 remove is Auth for test target 4 years ago
Elham Rababah cd46b4317c fix error null thing 4 years ago
Elham Rababah a362901da8 improve code inside my eam 4 years ago
Elham Rababah 4df3b1fb40 First step from examination 4 years ago
Elham Rababah cde56a82f2 Finish subjective 4 years ago
Elham ac7bbfeb49 Merge branch 'SOAP' into 'development'
Soap

See merge request Cloud_Solution/doctor_app_flutter!196
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
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
Elham Rababah 18d58e7037 remove is Auth for test target 4 years ago
Sultan Khan 384c7cd58a code merged 4 years ago
Elham debcefe7ce Merge branch 'feature--patient-referral' into 'development'
Feature  patient referral

See merge request Cloud_Solution/doctor_app_flutter!194
4 years ago