Commit Graph

56 Commits (f137bd44c0cf1860e9e4028dd6d332a047230e62)

Author SHA1 Message Date
Mohammad Aljammal 29f0402cbd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/services/appointment_services/GetDoctorsList.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Mohammad Aljammal d3d0fa00e7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/pages/landing/home_page.dart
4 years ago
Mohammad Aljammal 53bbafdc2b fix Authenticated User Object 4 years ago
Sultan Khan 3ad928902b voice command 4 years ago
Mohammad Aljammal 06416b4934 add Not authenticated Page 4 years ago
Sultan Khan da317431ba Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Amjad amireh 4009aed000 child Vaccines 4 years ago
Sultan Khan 227731f8f8 Merge 4 years ago
Mohammad Aljammal ac871bb416 Merge branch 'Blood_Donation' into 'master'
Blood donation

See merge request Cloud_Solution/diplomatic-quarter!58
4 years ago
Amjad amireh 5e50c0dc32 Blood Denote 4 years ago
Mohammad Aljammal 3946f0355c Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
4 years ago
Mohammad Aljammal d6a27a8e28 change medical profile icons 4 years ago
Mohammad Aljammal 3ffff9686d Done allergies service 4 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 4 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 4 years ago
hussam al-habibeh 3c5adc0a1d HMG Service layout 4 years ago
Mohammad Aljammal 9f06ce7d1d done EyeMeasurements service 4 years ago
Mohammad Aljammal c01e6095f2 done my trackers 4 years ago
haroon amjad a5fd9f53ab Payment flow implemented in advance payment 4 years ago
Mohammad Aljammal 4ac77593ad add payment service page and translations 4 years ago
Mohammad Aljammal a0300738e8 done My balance 4 years ago
Mohammad Aljammal 4dd3f9ad01 done Patient Sick Leave 4 years ago
Mohammad Aljammal 11f9daa3ff add PatientSickLeave 4 years ago
Mohammad Aljammal 153335538a done monthly reports 4 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 4 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 4 years ago
Mohammad Aljammal 02ce04a397 medical_profile_page.dart 4 years ago
Mohammad Aljammal d52e612bff Merge branch 'insurance' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	pubspec.yaml
4 years ago
Mohammad Aljammal 1b3a780a29 add ar lan for medical profile 4 years ago
hussam al-habibeh 3a79ddb488 vaccine service 4 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 4 years ago
Sultan Khan 1974e51602 merge 4 years ago
Mohammad Aljammal 30c0963063 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 760db6a873 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/locator.dart
4 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 4 years ago
Mohammad Aljammal f5b16734c6 add time line 4 years ago
Mohammad Aljammal f6d30178bf done medical report 4 years ago
Mohammad Aljammal b6319c558c Merge branch 'report_service' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
4 years ago
Mohammad Aljammal 75fdf28036 fix lab Result 4 years ago
haroon amjad db30fbdfd2 implementing livecare 4 years ago
haroon amjad 59c279998c working on vital signs integration 4 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 4 years ago
Mohammad Aljammal a5e63817f2 done vital sign 4 years ago
Amjad Amireh 97dbe62f93 done report service 4 years ago
Mohammad Aljammal d093ecd5e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	ios/Podfile
	ios/Runner.xcodeproj/project.pbxproj
	lib/config/config.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 4 years ago
haroon amjad c50530734d added my appointments in medical file page 4 years ago
Mohammad Aljammal 5cee1cef4e fix merge issues 4 years ago
Mohammad Aljammal 2e0afdb49c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
4 years ago
hussam al-habibeh 492cfa084b insurance card and insurance update and insurance approval 4 years ago