Commit Graph

117 Commits (4d44d548066691b60ab04c642e891fae1ec07bfa)

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
5 years ago
Elham Rababah 2f273dcde8 add ICD10 5 years ago
Elham Rababah efee00c79e finish add assessment 5 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
5 years ago
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
5 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
5 years ago
Elham Rababah 1672d9a3a0 add assessment_page code 5 years ago
Elham Rababah dc4250a4de Post progress Note 5 years ago
Elham Rababah b22fd3f7ba fix listHisProgNotePhysicalExaminationVM 5 years ago
Elham Rababah f97d11183d progress Note 5 years ago
mosazaid a71da8e4ef working on vital signs 5 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
5 years ago
Elham Rababah a362901da8 improve code inside my eam 5 years ago
Elham Rababah cde56a82f2 Finish subjective 5 years ago
mosazaid d11a8e6209 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/core/service/base/base_service.dart
#	lib/locator.dart
5 years ago
mosazaid aafcd89222 working on vitalSigns feature 5 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
5 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 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
5 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 5 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 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
5 years ago
Elham Rababah 4560706d55 improve code inside my eam 5 years ago
mosazaid 47e9d2a558 Merge branch 'development' into feature--patient-referral
# Conflicts:
#	lib/client/base_app_client.dart
5 years ago
Elham Rababah bb651478a0 Finish subjective 5 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
5 years ago
Elham Rababah 9b0731d5c8 check activation code 5 years ago
Elham Rababah 7001940d0d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new 5 years ago
mosazaid 7cefbb4dbd add referral pages 5 years ago
Elham Rababah a3dff8c9f8 Post Allergies service 5 years ago
Elham Rababah df68e912b5 first step from calling history 5 years ago
Sultan Khan e61f3f0281 add sick leave 5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
Sultan Khan ba2697c917 sick leave 5 years ago
Elham Rababah 4eee5cd9d8 new login type 5 years ago
Elham Rababah 716cb28bf1 fix issue on vital_sign_res_model.dart 5 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
5 years ago
Sultan Khan 6eb2da3770 voice search 5 years ago
hussam al-habibeh efc5db9f5b versionID update 5 years ago
Sultan Khan e942999784 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 3f7ef48fd5 live care chages 5 years ago
Elham 2fe33bd57d Merge branch 'hussam' into 'development'
LogIn function refactoring

See merge request Cloud_Solution/doctor_app_flutter!152
5 years ago
hussam al-habibeh d3bb85129c LogIn function refactoring 5 years ago
Elham Rababah 6ea72f5ffa make things daynamic 5 years ago
Mohammad ALjammal d22ce32cdb add call back android 5 years ago
Sultan Khan 3b0aff2efa overflow issue and model mapped 6 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
6 years ago
Sultan Khan bde86ef829 live care features added. 6 years ago
ibrahim albitar ee8d481504 live care web service 6 years ago
Elham Rababah bd3ce0a4d4 refactor models 6 years ago