Commit Graph

222 Commits (ae6cd0e5f827c494ed82e7c2cf2bd4fa7db95d6f)

Author SHA1 Message Date
mosazaid ae6cd0e5f8 Merge branch 'development' into feature_admission_request 5 years ago
mosazaid 5142b5b6c7 finish admission request design 5 years ago
Elham Rababah 05e7762533 fix obj page 5 years ago
Elham Rababah 61209663f3 Finish arrived 5 years ago
mosazaid 4d44d54806 Merge branch 'development' into feature_admission_request 5 years ago
Mohammad Aljammal 806682b921 hack login 5 years ago
Elham Rababah dccf474e70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_arrival_ist
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
	lib/core/service/patient_service.dart
	lib/core/viewModel/patient_view_model.dart
	lib/lookups/patient_lookup.dart
	lib/models/patient/patiant_info_model.dart
	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid 433b2933c4 working with admission request and some changes in vital signs 5 years ago
mosazaid f35eff1220 working with admission request 5 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 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
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
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
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 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 8d58348267 dashboard changes 5 years ago
Elham Rababah c15300125e First step objective_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
Elham Rababah 44779e6ee7 patient screen 5 years ago
Elham Rababah 9c018d3c55 first step from patient arrival 5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 5 years ago
hussam al-habibeh cbb8937b1d '12/14' 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
Elham Rababah 9f19b2566f finish refactor provider 5 years ago
Elham Rababah 64dbcce06f finish and remove patient provider 5 years ago
Elham 6057e6a266 Merge branch 'refactor' into 'development'
Refactor

See merge request Cloud_Solution/doctor_app_flutter!180
5 years ago
Elham 746765f4d7 Merge branch 'design-updates' into 'development'
patients_screen design update

See merge request Cloud_Solution/doctor_app_flutter!179
5 years ago
Elham Rababah 1b1e8f0712 second step from patient provider 5 years ago
hussam al-habibeh 6f90c31f9f patients_screen design update 5 years ago
Elham Rababah 6ab73916eb first step from patient provider 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 5ed9aea5a7 fix HexColor library error 5 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 5 years ago
hussam al-habibeh 911921e0b8 in-patient && out-patient 5 years ago
Elham Rababah 91cc76a9cf medicine search fix bugs = 5 years ago
Elham Rababah 53862ec1b3 fix bugs in patient search 5 years ago
Elham Rababah f1721b686d fix loader inside pharmacies_list 5 years ago
Elham Rababah b308dc5826 change doctor app icons and optimization 6 years ago
Elham Rababah 8980fc03aa Finish Patient search design 6 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 6 years ago
Elham 7fe2a96065 Merge branch 'hussam' into 'development'
translation 'updates'

See merge request Cloud_Solution/doctor_app_flutter!136
6 years ago