Commit Graph

101 Commits (e7d1a6c805dd3034f18380ae9edbc65866d7c5f7)

Author SHA1 Message Date
Elham Rababah e7d1a6c805 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
 Conflicts:
	lib/screens/patients/patients_screen.dart
4 years ago
Elham Rababah 42666e2200 move clinic list to its own file 4 years ago
Sultan Khan cf7d494944 search pages and dashboard updated 4 years ago
Elham Rababah e2e92c1c59 Clinic List widget 4 years ago
Elham Rababah 64c7dae97c Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
 Conflicts:
	lib/screens/patients/patients_screen.dart
4 years ago
Elham Rababah a40bec844b Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
 Conflicts:
	lib/screens/patients/patients_screen.dart
4 years ago
Elham Rababah 340bfd0a1c add clinic to arrival search patient 4 years ago
mosazaid 6c46e21031 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
mosazaid fdc893c3d6 make search patient profile have preview services 4 years ago
Sultan Khan 376653a344 dashboard changes 4 years ago
Elham Rababah c8e5a7eeef fix PatientCard 4 years ago
mosazaid 2273808333 translation 4 years ago
Elham Rababah 13c879654b DA-250: fix age 4 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 4 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 4 years ago
Elham Rababah d53493aa52 fix DA-237 4 years ago
Elham Rababah 4a3175830d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/dashboard_screen.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah 763d6bb49f finish add loader 4 years ago
Mohammad Aljammal f75ab83981 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
mosazaid dcb71e5c22 Add charts to patient vital signs feature
&
Merge branch 'development' into feature-ucaf

# Conflicts:
#	lib/util/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 4 years ago
Elham Rababah 4f1a892be4 first step form create episode 4 years ago
Mohammad Aljammal eb5a3a59ff hot fixing 4 years ago
Elham Rababah e65740761a add improvement on create episode 4 years ago
Mohammad Aljammal a723ecbf1d fix merger 4 years ago
Elham Rababah 61209663f3 Finish arrived 4 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
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
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 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
mosazaid 7cefbb4dbd add referral pages 4 years ago
Sultan Khan 8d58348267 dashboard changes 4 years ago
Elham Rababah 44779e6ee7 patient screen 4 years ago
Elham Rababah 9c018d3c55 first step from patient arrival 4 years ago
Elham Rababah 46cdd9482c First step from SOAP 4 years ago
Elham Rababah 9f19b2566f finish refactor provider 4 years ago
Elham Rababah 64dbcce06f finish and remove patient provider 4 years ago
Elham 746765f4d7 Merge branch 'design-updates' into 'development'
patients_screen design update

See merge request Cloud_Solution/doctor_app_flutter!179
4 years ago
hussam al-habibeh 6f90c31f9f patients_screen design update 4 years ago
mosazaid e5341e3031 Merge branch 'development' into replay-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
mosazaid 5ed9aea5a7 fix HexColor library error 4 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 4 years ago
hussam al-habibeh 911921e0b8 in-patient && out-patient 4 years ago
Elham Rababah 91cc76a9cf medicine search fix bugs = 4 years ago
Elham Rababah 53862ec1b3 fix bugs in patient search 4 years ago
Elham Rababah b308dc5826 change doctor app icons and optimization 4 years ago
hussam al-habibeh 000315ac0e translation 'updates' 4 years ago
hussam al-habibeh fb6d54faaf Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
 Conflicts:
	lib/screens/dashboard_screen.dart
4 years ago
hussam al-habibeh 054933b280 Translation stage four 4 years ago