Commit Graph

379 Commits (5669021add7cf8a1daaa2d277be055957a43a474)

Author SHA1 Message Date
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 9bf08e81da Add search button name and hint search text in MasterKeyCheckboxSearchWidget 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
Mohammad Aljammal 93bece09d7 add search in SOAP 4 years ago
Elham Rababah f0fd5d30e1 First step from update process 4 years ago
hussam al-habibeh b3345a86ef post prescription 4 years ago
Elham Rababah ea4bf159c6 commit issue 4 years ago
Elham Rababah 05e7762533 fix obj page 4 years ago
Elham Rababah 49f7dab008 Merge branches 'SOAP' and 'patient_arrival_ist' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 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
Elham Rababah fc82665f1b add ICD10 4 years ago
Elham Rababah 2f273dcde8 add ICD10 4 years ago
Elham Rababah 4e8de52efe add commented code 4 years ago
Elham Rababah 14955201a9 fix things 4 years ago
Elham Rababah efee00c79e finish add assessment 4 years ago
Elham Rababah a47e9b69f5 add CDI service 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
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
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
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
hussam al-habibeh 697f17f2cd prescription and procedure 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
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
Elham Rababah 4560706d55 improve code inside my eam 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 2658694b70 remove static value 4 years ago
Elham Rababah 9a614b25b5 Finish the login 4 years ago
Elham Rababah e96d38454c First step from examination 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