Commit Graph

104 Commits (33bb7dd6529f56d14d2ff0815efd749d38fdc97e)

Author SHA1 Message Date
Elham Rababah 05e7762533 fix obj page 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 dc4250a4de Post progress Note 5 years ago
mosazaid a71da8e4ef working on vital signs 5 years ago
hussam al-habibeh 47a350a811 prscription and procedure 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
hussam al-habibeh 697f17f2cd prescription and procedure 5 years ago
Sultan Khan e45220829f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 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
mosazaid f6ddf7a9eb make logout button close all screen stack and push to login 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
mosazaid 7cefbb4dbd add referral pages 5 years ago
Sultan Khan 989c06ae33 prescription changes 5 years ago
Sultan Khan 8d58348267 dashboard changes 5 years ago
Sultan Khan e61f3f0281 add sick leave 5 years ago
Elham Rababah dcba85c7b9 Finish first step subjective_page.dart 5 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
5 years ago
Sultan Khan 4f96cff585 sick leave 5 years ago
Sultan Khan e5d542f1d0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
Sultan Khan ba2697c917 sick leave 5 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 5 years ago
Sultan Khan 97d915ef99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan cc1a63786f sick leave 5 years ago
hussam al-habibeh dfca3aa0e5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 16821c17fc re-design in-patient detail page 5 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
5 years ago
hussam al-habibeh c581638e00 refer_patient_screen 'not finshed' 5 years ago
mosazaid e5341e3031 Merge branch 'development' into replay-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid f9ae2559f0 working on referral reply screen 5 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 5 years ago
Elham Rababah 91cc76a9cf medicine search fix bugs = 5 years ago
Elham Rababah ec3b69f0cb The Patient services Names the words should be in separate line. 5 years ago
Elham Rababah 53862ec1b3 fix bugs in patient search 5 years ago
Elham Rababah 8980fc03aa Finish Patient search design 6 years ago
Elham Rababah 871bd6ab20 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medicine_desgin
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/app_text_form_field.dart
6 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 6 years ago
Sultan Khan 3f7ef48fd5 live care chages 6 years ago
Mohammad ALjammal d4b3e42070 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/dashboard_screen.dart
6 years ago
Elham Rababah 287bb20d12 fix issues ios 6 years ago
Elham Rababah 6ea72f5ffa make things daynamic 6 years ago
Mohammad ALjammal d22ce32cdb add call back android 6 years ago
hussam al-habibeh aa57f4c4d7 get clinic list after changing the language 6 years ago