Commit Graph

87 Commits (00543a759a4c1632fba91de0fac7a91347ef3caa)

Author SHA1 Message Date
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
erababah cad096d8c7 fix issue on ios and improve structure by Elham & mohammad 4 years ago
amjad nabil amireh 640829f454 Merge branch 'Amjad_search' into 'development'
Modify patiant screen icon avatar

See merge request Cloud_Solution/doctor_app_flutter!121
4 years ago
Amjad Amireh 4e62947df2 Modify patiant screen icon avatar 4 years ago
Elham Rababah 574a951fcf finish clinic exept design 4 years ago
Mohammad ALjammal d52429564d fix issues in Patient 4 years ago
Mohammad ALjammal 79eb6b19d0 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/config/config.dart
	lib/presentation/doctor_app_icons.dart
	lib/screens/dashboard_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad ALjammal 80664439d9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 4 years ago
Mohammad ALjammal 513fcd24b1 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	lib/config/config.dart
4 years ago
Mohammad ALjammal 9b065036ae fix issues in get patients service 4 years ago
Salman Afzal 11f10f1eea Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 4 years ago
Salman Afzal a48ad33f36 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Salman Afzal a914ff9367 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/presentation/doctor_app_icons.dart
4 years ago
Mohammad ALjammal c16c8897be Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/dashboard_screen.dart
4 years ago