Commit Graph

510 Commits (072e6cffef6a8ff8529305317b448d03c966333c)

Author SHA1 Message Date
Mohammad Aljammal e7cf452a79 Merge branch 'insurance' into 'master'
files import fix

See merge request Cloud_Solution/diplomatic-quarter!66
5 years ago
Mohammad Aljammal a31796322b fix icons issue 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
Mohammad Aljammal 53bbafdc2b fix Authenticated User Object 5 years ago
Sultan Khan d0d262f139 robot icon updates 5 years ago
hussam al-habibeh cd36749e4e files import fix 5 years ago
Elham Rababah c0a54c8cbc remove commit 5 years ago
Sultan Khan 8095e56b32 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3ad928902b voice command 5 years ago
Elham Rababah a359a6cd1a fix the loader issue 5 years ago
Mohammad Aljammal b0fa7811e5 Merge branch 'insurance' into 'master'
women health

See merge request Cloud_Solution/diplomatic-quarter!65
5 years ago
Mohammad Aljammal 39a4020b69 Merge branch 'child_vaccines' into 'master'
Child vaccines

See merge request Cloud_Solution/diplomatic-quarter!64
5 years ago
hussam al-habibeh c6a9b66538 women health 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
haroon amjad 41d50e23e3 covid drivethru implemented 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 8ddec0ad99 child Vaccines add new child modified 5 years ago
Amjad amireh 67e3a13a95 child Vaccines add new child modified 5 years ago
Elham Rababah da7131015e remove print statements 5 years ago
Mohammad Aljammal 847ccb9c07 Merge branch 'child_vaccines' into 'master'
Child vaccines

See merge request Cloud_Solution/diplomatic-quarter!62
5 years ago
Amjad amireh cb2a78e2ee child Vaccines 5 years ago
Sultan Khan 7b6135a6c7 voice search 5 years ago
Sultan Khan 83bc2cddce Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8f18d1025a voice search 5 years ago
Amjad amireh 24795e808f child Vaccines 5 years ago
hussam al-habibeh 84f429e559 merge 5 years ago
hussam al-habibeh bafcc4331e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
 Conflicts:
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	pubspec.yaml
5 years ago
hussam al-habibeh dbda69baa1 health Calculator'General Health' 5 years ago
Amjad amireh dcb93bf5cc child Vaccines 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
Mohammad Aljammal 1ce55e687f Ambulance Service second step 5 years ago
Amjad amireh 6830996f9c child Vaccines 5 years ago
Amjad amireh 8a6511404f child Vaccines 5 years ago
Amjad amireh 42554ffa67 child Vaccines 5 years ago
haroon amjad 063eebfc74 covid drivethru implemented 5 years ago
Elham Rababah 31b217aa19 First step from CMC 5 years ago
Amjad amireh 4009aed000 child Vaccines 5 years ago
Sultan Khan 227731f8f8 Merge 5 years ago
Amjad amireh e14d619edd child Vaccines 5 years ago
Amjad amireh 37b817e0c8 child Vaccines 5 years ago
Amjad amireh 0e4ff1f804 child Vaccines 5 years ago
Elham Rababah 0b9a834673 Finish cancel order 5 years ago
Amjad amireh 9ab0d66888 child Vaccines 5 years ago
Elham Rababah 293c557b54 First step from Home health care service 5 years ago
Sultan Khan ea86e88e2e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 3d6eafe473 Ambulance Service first step 5 years ago
Amjad amireh db19eec35f Blood Denote 5 years ago
Sultan Khan 5c859034d6 voice search 5 years ago
Amjad amireh 42fd2e0eee Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into child_vaccines
 Conflicts:
	lib/core/viewModels/base_view_model.dart
5 years ago
Amjad amireh 20ef255ee6 Blood Denote 5 years ago
Amjad amireh 98947d5f6b Blood Denote 5 years ago
Mohammad Aljammal 0d12210116 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers 5 years ago
Mohammad Aljammal c7d396875e Ambulance Service steps 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 b658e7be4d Blood Denote 5 years ago
Elham Rababah dd76ae05a7 fix H2O page issue 5 years ago
Amjad amireh a00b3a133c Blood Denote 5 years ago
Amjad amireh 675d544514 Blood Denote 5 years ago
haroon amjad 7fdc0da9dc livecare scheduling implemented 5 years ago
Amjad amireh 0ec39920f0 Blood Denote 5 years ago
Amjad amireh 5e50c0dc32 Blood Denote 5 years ago
Mohammad Aljammal 020d10fccc Merge branch 'insurance' into 'master'
Health Converter

See merge request Cloud_Solution/diplomatic-quarter!56
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 3fab844ac9 improve E-referral 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 d6a27a8e28 change medical profile icons 5 years ago
haroon amjad c9256a654a LiveCare Scheduling updates 5 years ago
Mohammad Aljammal 3ffff9686d Done allergies service 5 years ago
Elham Rababah c994c39c6b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral 5 years ago
Elham Rababah a00bc8268e improve E-referral 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
hussam al-habibeh 3e184f43db Health Converter 5 years ago
Elham Rababah b853bede68 first step from h2o 5 years ago
Amjad amireh 43689d19ce Contact us , virtual tout ,News 5 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 5 years ago
Amjad amireh 9a6eadc3fb Contact us and virtual tout 5 years ago
Sultan Khan 79502de682 update 5 years ago
Sultan Khan 03ff56f2de Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 986a2e92f6 Merge branch 'find_us' into 'master'
Find us

See merge request Cloud_Solution/diplomatic-quarter!54
5 years ago
Amjad amireh 7c48a6f16a Contact us 5 years ago
Amjad amireh 5ce252d296 Contact us 5 years ago
Amjad amireh 50d862b076 Contact us 5 years ago
Amjad amireh 97d0c439c7 Contact us 5 years ago
Amjad amireh 5f981c9248 Contact us 5 years ago
haroon amjad 06798ef327 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/ContactUs/findus/pharmacies_page.dart
5 years ago
haroon amjad f25d18353f icons updated 5 years ago
Sultan Khan 591e9e9a4c updated 5 years ago
Elham Rababah ae147b5988 first step from search referrals 5 years ago
Mohammad Aljammal 82226e62e1 Merge branch 'insurance' into 'master'
HMG Service layout

See merge request Cloud_Solution/diplomatic-quarter!52
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 aa66e427b1 Contact us 5 years ago
Amjad amireh 24456895ee Contact us 5 years ago
Amjad amireh 24693f2992 Contact us 5 years ago
Amjad amireh de5633d58b Contact us 5 years ago
hussam al-habibeh 3c5adc0a1d HMG Service layout 5 years ago
Elham Rababah f582eee991 make index page of add new referral as page controller 5 years ago
Amjad amireh 6aa6b85f4b Contact us 5 years ago
Amjad amireh c2cfea7360 Contact us 5 years ago
Amjad amireh 571023e521 Contact us 5 years ago
Mohammad Aljammal 9f06ce7d1d done EyeMeasurements service 5 years ago
Amjad amireh c2b7507005 Contact us 5 years ago
Amjad amireh dd3608e9ee Contact us 5 years ago
Elham Rababah a4905783ad refactor dialogs structure 5 years ago
Elham Rababah 7840ec4c3b finish activation process until step 2 5 years ago
Mohammad Aljammal c01e6095f2 done my trackers 5 years ago
Amjad amireh a4ea5f8e3e Contact us 5 years ago
Elham Rababah f1f3b6bd56 first step from e-referral 5 years ago
haroon amjad b9a0438ebb Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad a5fd9f53ab Payment flow implemented in advance payment 5 years ago
Mohammad Aljammal 14f3e08077 Merge branch 'amjad_amireh' into 'master'
edit card_position.dart

See merge request Cloud_Solution/diplomatic-quarter!47
5 years ago
haroon amjad 478917b240 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
Mohammad Aljammal b4a7408962 Merge branch 'payment_service' into 'master'
add payment service page and translations

See merge request Cloud_Solution/diplomatic-quarter!49
5 years ago
Mohammad Aljammal 4ac77593ad add payment service page and translations 5 years ago
haroon amjad 38c980be81 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 5400d534db updates for push notifications 5 years ago
Mohammad Aljammal b6db1d1fd8 Merge branch 'my_balance' into 'master'
done My balance

See merge request Cloud_Solution/diplomatic-quarter!48
5 years ago
Mohammad Aljammal a0300738e8 done My balance 5 years ago
Amjad amireh 368db03ab8 edit card_position.dart 5 years ago
Amjad amireh a41dd736c4 edit card_position.dart 5 years ago
Amjad amireh d1a01f5afa edit card_position.dart 5 years ago
Sultan Khan 92efbcbd2f my family 5 years ago
Sultan Khan da7fa1038a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 0a2cb22042 design issues fixed 5 years ago
Amjad amireh 6fb063bf48 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh 5 years ago
Amjad amireh dc10f883db Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh 5 years ago
Mohammad Aljammal 4dd3f9ad01 done Patient Sick Leave 5 years ago
Amjad amireh 525080c09e edit card_position.dart 5 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
5 years ago
Mohammad Aljammal 11f9daa3ff add PatientSickLeave 5 years ago
Sultan Khan 63e6d06e74 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 5e252d21d2 voice search added more medical option 5 years ago
Mohammad Aljammal ea02622977 fix merge issues 5 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
5 years ago
Mohammad Aljammal 8e96c79d05 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 33bd972984 add my vaccines item screen 5 years ago
Amjad amireh 62d96a3f1c edit card_position.dart 5 years ago
Sultan Khan f5d6864291 voice search coc 5 years ago
Sultan Khan 3dc54230be Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 5d34398998 insurance updated 5 years ago
Mohammad Aljammal 9159928e27 edit on vaccine service 5 years ago
Sultan Khan a535543863 more pages added on the voice search 5 years ago
Amjad amireh e638464657 edit card_position.dart 5 years ago
Mohammad Aljammal ddf53ce999 ER 5 years ago
Mohammad Aljammal 50d1e50df4 ER 5 years ago
Mohammad Aljammal ed1c04ab25 ER 5 years ago
Sultan Khan 7908506d5f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 294a752338 ER 5 years ago
Sultan Khan 77f6dd94ef search page change 5 years ago
haroon amjad 8387af844a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 0628aef62a applied dental change in SearchByClinic 5 years ago
Mohammad Aljammal 629251d216 ER 5 years ago
Mohammad Aljammal b7f73bf397 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into monthly_reports 5 years ago
Mohammad Aljammal 153335538a done monthly reports 5 years ago
Sultan Khan a2b3878a27 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan a98bc226e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 5485cbab36 ER 5 years ago
Mohammad Aljammal 2ef36d3d8a ER 5 years ago
Mohammad Aljammal f534f8a348 ER 5 years ago
Sultan Khan 0f63b922d1 speech to text 5 years ago
Mohammad Aljammal 20f9f6f06c ER 5 years ago
haroon amjad cbf19f0cd1 Merge branch 'master' into 'Haroon'
# Conflicts:
#   lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 5 years ago
haroon amjad c5794e5c70 Dental flow in my appointments 5 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
5 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 5 years ago
Mohammad Aljammal db79f299b6 ER 5 years ago
Mohammad Aljammal e254261ef9 ER 5 years ago
Sultan Khan f6a3f0e615 family file 5 years ago
Mohammad Aljammal 02ce04a397 medical_profile_page.dart 5 years ago
Mohammad Aljammal e909c16b80 ER 5 years ago
haroon amjad 3e5ef26b29 my appointment sorting implemented 5 years ago
haroon amjad ce9903fd13 nearest appointment flow implemented 5 years ago
haroon amjad 51078227ab Dental appointment flow implemented 5 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
5 years ago
Mohammad Aljammal 1b3a780a29 add ar lan for medical profile 5 years ago
hussam al-habibeh 3a79ddb488 vaccine service 5 years ago
Sultan Khan 826c50ebf1 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 20a17c0070 clinic search 5 years ago
haroon amjad 1886f3a763 implementing Dental Appointment flow 5 years ago
Sultan Khan 4a75215a19 search 5 years ago
Sultan Khan 6b2f1a86df Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3a4c016f4e search 5 years ago
Mohammad Aljammal 4ffbb80f3d ER 5 years ago