Commit Graph

117 Commits (15dd0f7c1a222d9dbff984577500a3d314e5c14e)

Author SHA1 Message Date
Elham Rababah 537f53c3de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
mosazaid cd95a581f0 simple changes 5 years ago
Elham Rababah e32c360f85 fix DA-154,DA-150 5 years ago
mosazaid 88f1dc637f some fixes 5 years ago
mosazaid eae0bb443f solve problem with vital signs charts depend on date 5 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
5 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 5 years ago
mosazaid 8726653ffb working on Referral feature 5 years ago
mosazaid 2f17167e2f some design enhancments 5 years ago
mosazaid fd2a86dca4 some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral 5 years ago
mosazaid 9a5cafaaf5 working on UCAF detail screen , and some cahgnes on referral list 5 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 5 years ago
mosazaid b67fd55aac Merge branch 'development' into feature-ucaf 5 years ago
mosazaid e75e7801aa working on UCAF get data 5 years ago
Mohammad Aljammal d7b8e29455 Merge branch 'medical-file' into 'development'
drug list

See merge request Cloud_Solution/doctor_app_flutter!234
5 years ago
hussam al-habibeh f997561bb8 drug list 5 years ago
mosazaid c9aac6e2e9 vital signs solve overflow of the width 5 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 5 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 5 years ago
mosazaid ee9ca72057 change empty referral message 5 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 0c39dc6693 change on vital signs for uncoment the service 5 years ago
mosazaid 4b5bec8c50 working on UCAF design 5 years ago
mosazaid b60bac6d6e working on UCAF design 5 years ago
mosazaid cb4ee05b40 working on ucaf 5 years ago
mosazaid 5142b5b6c7 finish admission request design 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 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
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
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 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 Rababah 1b1e8f0712 second step from patient provider 5 years ago
Elham Rababah 6ab73916eb first step from patient provider 5 years ago
mosazaid 5ed9aea5a7 fix HexColor library error 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
ibrahim albitar c07f84ff78 fixing and enhancments 6 years ago
hussam al-habibeh 91ffdabd73 Translation stage five 6 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
6 years ago
hussam al-habibeh 054933b280 Translation stage four 6 years ago