Commit Graph

262 Commits (c6156921e80777b15deff5a26b7b258a87bb5884)

Author SHA1 Message Date
Elham Rababah c6156921e8 fix DA-197 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 eae0bb443f solve problem with vital signs charts depend on date 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 23fb2e7297 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 4 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 4 years ago
mosazaid 8726653ffb working on Referral feature 4 years ago
mosazaid 2f17167e2f some design enhancments 4 years ago
mosazaid 97d05c72c2 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 21114fc88f Merge branch 'development' into 'feature-ucaf'
# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart
4 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!244
4 years ago
Elham Rababah fb035cd4c9 fix patient_search_screen.dart 4 years ago
Elham Rababah 4f1a892be4 first step form create episode 4 years ago
mosazaid fd2a86dca4 some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral 4 years ago
mosazaid 9a5cafaaf5 working on UCAF detail screen , and some cahgnes on referral list 4 years ago
mosazaid e14df2855a Merge branch 'development' into feature-ucaf 4 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 4 years ago
Mohammad Aljammal eb5a3a59ff hot fixing 4 years ago
mosazaid b67fd55aac Merge branch 'development' into feature-ucaf 4 years ago
mosazaid e75e7801aa working on UCAF get data 4 years ago
Mohammad Aljammal d7b8e29455 Merge branch 'medical-file' into 'development'
drug list

See merge request Cloud_Solution/doctor_app_flutter!234
4 years ago
hussam al-habibeh f997561bb8 drug list 4 years ago
mosazaid c9aac6e2e9 vital signs solve overflow of the width 4 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 4 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 4 years ago
mosazaid ee9ca72057 change empty referral message 4 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 0c39dc6693 change on vital signs for uncoment the service 4 years ago
mosazaid 4b5bec8c50 working on UCAF design 4 years ago
Elham Rababah ba14d23c05 Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Elham Rababah e65740761a add improvement on create episode 4 years ago
mosazaid b60bac6d6e working on UCAF design 4 years ago
mosazaid e9ffbf06a6 Merge branch 'development' into feature_admission_request 4 years ago
mosazaid 3578c82f62 solve hacking patient screen 4 years ago
mosazaid 095a915a89 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
4 years ago
mosazaid cb4ee05b40 working on ucaf 4 years ago
Mohammad Aljammal a723ecbf1d fix merger 4 years ago
mosazaid ae6cd0e5f8 Merge branch 'development' into feature_admission_request 4 years ago
mosazaid 5142b5b6c7 finish admission request design 4 years ago
Elham Rababah 05e7762533 fix obj page 4 years ago
Elham Rababah 61209663f3 Finish arrived 4 years ago
mosazaid 4d44d54806 Merge branch 'development' into feature_admission_request 4 years ago
Mohammad Aljammal 806682b921 hack login 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 433b2933c4 working with admission request and some changes in vital signs 4 years ago
mosazaid f35eff1220 working with admission request 4 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 4 years ago