Commit Graph

209 Commits (c82f01cd1ab4d80ad16cb4a2f5d3630c19dfed9a)

Author SHA1 Message Date
hussam al-habibeh 7815005e21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
hussam al-habibeh 69a6bc2812 offers page 5 years ago
Elham Rababah 5bd3c7d9ce finish step from notifications_page and create notification_details_page 5 years ago
mosazaid 11ff27bae3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
	pubspec.yaml
5 years ago
mosazaid 9a169ff77b finish home page and start working on order preview page 5 years ago
Elham Rababah 9f2beceb22 First step from notifications_page 5 years ago
enadhilal 778e9fd8da Merge branch 'pharmacy_module_feature_home_page' into enad_pharmacy2
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/home_page.dart
5 years ago
hussam al-habibeh e74e168e88 Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
 Conflicts:
	android/app/build.gradle
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/locator.dart
5 years ago
hussam al-habibeh f7cee8f484 pharmacy module app && category home page 5 years ago
mosazaid d1ac4080ca working on pharmacy home page 5 years ago
haroon amjad f5a2870fac Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
Implemented Badge count on ToDo list & my appointments
5 years ago
Mohammad Aljammal 50dffe9af9 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!74
5 years ago
Mohammad Aljmma d0ed776ff6 new home health service 5 years ago
haroon amjad dfa7e0e02f updates & fixes 5 years ago
haroon amjad 22ef24c4ff Merge branch 'master' into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
5 years ago
jammal 9328f942ba done ER service 5 years ago
jammal 7dc55f3378 Merge branch 'home_health_care' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ios_issues
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
	lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
jammal bd2254491c done ER service 5 years ago
enadhilal 613206f9d3 Merge branch 'enad_pharmacy2' into pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
enadhilal 5445cced89 Merge branch 'master' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
enadhilal bf88d84022 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy
# Conflicts:
#	lib/config/config.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
enadhilal 068382e76f add call for backend service 5 years ago
haroon amjad 6b316bf262 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/config.dart
#	lib/pages/AlHabibMedicalService/​ health_calculators.dart
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
5 years ago
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
5 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
5 years ago
Mohammad Aljammal 15ac74fadb Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
 Conflicts:
	lib/pages/AlHabibMedicalService/​ health_calculators.dart
5 years ago
Sultan Khan 8095e56b32 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Amjad amireh 83735ab68d modified Child vaccintion note 5 years ago
haroon amjad a8ee7db62b fixes
# Conflicts:
#	lib/config/config.dart
5 years ago
Mohammad Aljammal 84bb68789d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
 Conflicts:
	lib/config/config.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
	lib/pages/ContactUs/findus/hospitrals_page.dart
	lib/pages/ContactUs/findus/pharmacies_page.dart
5 years ago
Mohammad Aljammal 06416b4934 add Not authenticated Page 5 years ago
haroon amjad 5f36c900a4 fixes 5 years ago
haroon amjad 0daa0dc683 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
Sultan Khan da317431ba Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Elham Rababah 83ab1b4d61 fix issues in the services logic and add some translation 5 years ago
Amjad amireh 67e3a13a95 child Vaccines add new child modified 5 years ago
Elham Rababah 9ebc6980dd change the checkup item based on service 5 years ago
Amjad amireh 1d29aa36a2 child Vaccines 5 years ago
Amjad amireh fe17c20bdf child Vaccines 5 years ago
Elham Rababah 31b217aa19 First step from CMC 5 years ago
Sultan Khan 227731f8f8 Merge 5 years ago
Amjad amireh e14d619edd child Vaccines 5 years ago
Elham Rababah 0b9a834673 Finish cancel order 5 years ago
Elham Rababah 293c557b54 First step from Home health care service 5 years ago
Mohammad Aljammal 0d12210116 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers 5 years ago
Elham Rababah fdc8ef36ef Refactor today page 5 years ago
Elham Rababah 0a60b27ab4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/locator.dart
5 years ago
Mohammad Aljammal ac871bb416 Merge branch 'Blood_Donation' into 'master'
Blood donation

See merge request Cloud_Solution/diplomatic-quarter!58
5 years ago
Mohammad Aljammal f543126152 Ambulance Service 5 years ago
haroon amjad 6c0bb12c84 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/ContactUs/findus/pharmacies_page.dart
5 years ago
haroon amjad 929e289a6f started implementing Covid-19 DriveThru Test Module 5 years ago
Amjad amireh a00b3a133c Blood Denote 5 years ago
haroon amjad 7fdc0da9dc livecare scheduling implemented 5 years ago
Amjad amireh 5e50c0dc32 Blood Denote 5 years ago
Elham Rababah bf6a8cecc6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/landing/landing_page.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal bae6fe4ad6 fix marge issues 5 years ago
Elham Rababah 37d9eae9ea improve E-referral 5 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
5 years ago
Mohammad Aljammal 3ffff9686d Done allergies service 5 years ago
Elham Rababah 91a8b94382 Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/landing/landing_page.dart
5 years ago
Elham Rababah b1b6c77d62 Finish H2O Services 5 years ago
Elham Rababah b853bede68 first step from h2o 5 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 5 years ago
Elham Rababah ae147b5988 first step from search referrals 5 years ago
Mohammad Aljammal 2952fd56ab Done Active Medications Service 5 years ago
Elham Rababah 1e3ff89dbd finish new e-referral except calling the service 5 years ago
Amjad amireh 24693f2992 Contact us 5 years ago
Elham Rababah f582eee991 make index page of add new referral as page controller 5 years ago
Amjad amireh c2b7507005 Contact us 5 years ago
Elham Rababah 7840ec4c3b finish activation process until step 2 5 years ago
Mohammad Aljammal c01e6095f2 done my trackers 5 years ago
Elham Rababah f1f3b6bd56 first step from e-referral 5 years ago
Mohammad Aljammal 14f3e08077 Merge branch 'amjad_amireh' into 'master'
edit card_position.dart

See merge request Cloud_Solution/diplomatic-quarter!47
6 years ago
Mohammad Aljammal a0300738e8 done My balance 6 years ago
Amjad amireh 368db03ab8 edit card_position.dart 6 years ago
Mohammad Aljammal 57ed83a139 Merge branch 'vaccine' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into patient_sick_leave
 Conflicts:
	lib/config/config.dart
6 years ago
Mohammad Aljammal 11f9daa3ff add PatientSickLeave 6 years ago
Mohammad Aljammal fbb4b326a8 Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/locator.dart
	pubspec.yaml
6 years ago
Mohammad Aljammal 33bd972984 add my vaccines item screen 6 years ago
Mohammad Aljammal ed1c04ab25 ER 6 years ago
Mohammad Aljammal 153335538a done monthly reports 6 years ago
Mohammad Aljammal 20f9f6f06c ER 6 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 6 years ago
Mohammad Aljammal 68466c8d03 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/models/Appointments/DoctorListResponse.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
6 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 6 years ago
Mohammad Aljammal 02ce04a397 medical_profile_page.dart 6 years ago
haroon amjad 51078227ab Dental appointment flow implemented 6 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
6 years ago
hussam al-habibeh 3a79ddb488 vaccine service 6 years ago
haroon amjad 1886f3a763 implementing Dental Appointment flow 6 years ago
Mohammad Aljammal 91e5a20fd0 fix merge issues 6 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 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
6 years ago
Mohammad Aljammal 8989fbc9b7 done design dashboard 6 years ago
Sultan Khan cb99b2a7a7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 327c4585a6 family file change 6 years ago
haroon amjad 760db6a873 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/locator.dart
6 years ago
haroon amjad cc4f5c0615 updates 6 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 6 years ago
Mohammad Aljammal f6d30178bf done medical report 6 years ago