Commit Graph

479 Commits (01512e633278d17bf5c065100ec90d0efd9beb24)

Author SHA1 Message Date
Elham Rababah 5bd3c7d9ce finish step from notifications_page and create notification_details_page 5 years ago
Sultan Khan d939b2ec9b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan f8e05fc447 regiter issue 5 years ago
Mohammad Aljmma 747cffacfc fix lab result 5 years ago
haroon amjad 4f53d058d4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Elham Rababah 9f2beceb22 First step from notifications_page 5 years ago
Mohammad Aljmma e42f953bd1 fix prescription report issues 5 years ago
haroon amjad ff3368eefb Login check implemented for appointment & ToDo 5 years ago
Mohammad Aljmma 54a7f98eff fix login issues 5 years ago
Mohammad Aljmma a796e0392b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_login
 Conflicts:
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
5 years ago
Mohammad Aljmma f79d8eb8f9 fix login issues 5 years ago
haroon amjad af780bca76 registration fixes 5 years ago
haroon amjad dbb53e7821 fixed forgot password issue, Implemented new loader in login flow 5 years ago
Mohammad Aljmma 59d592778b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page 5 years ago
Mohammad Aljmma e7e32a414b fix barcode 5 years ago
Mohammad Aljammal 1775766a08 Merge branch 'loader_fix' into 'diplomatic-quarter-live'
Fix loader issue.

See merge request Cloud_Solution/diplomatic-quarter!90
5 years ago
Elham Rababah fa88e9055f make loader center 5 years ago
haroon amjad aeab57beab Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/main.dart
#	lib/pages/landing/home_page.dart
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 Aljmma 479aea4df8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljmma d4be20b07b add icons 5 years ago
Mohammad Aljmma e10a0a4d54 add splash page fix language issues 5 years ago
haroon amjad 1553e71e7d New loading dialog added into appointment flow 5 years ago
Mohammad Aljmma d5afb50ed3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljmma 856ab52439 fix ui issues 5 years ago
haroon amjad 6fd7a3fa3d updates 5 years ago
Mohammad Aljmma 89cfcd3cad fix design issues 5 years ago
Mohammad Aljmma 0b90d3c687 fix issues 5 years ago
Mohammad Aljmma 894494ec4e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	ios/Flutter/.last_build_id
	lib/main.dart
	lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljmma 874de15040 change the home page design 5 years ago
Mohammad Aljammal 94c25d2188 Merge branch 'loader' into 'diplomatic-quarter-live'
Loader

See merge request Cloud_Solution/diplomatic-quarter!84
5 years ago
Elham Rababah 6f5b5ed0c2 move gif loader utils 5 years ago
Elham Rababah bf412e1edf Finish loader as Gif image in all cases where the network is busy 5 years ago
haroon amjad d5118bda11 Login / Register UI fixes 5 years ago
haroon amjad 3354058738 Branding updated according to DQ 5 years ago
haroon amjad 3ae6df1dcb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-live 5 years ago
haroon amjad 6a630f6d33 logo & colors changed for login & registration flow 5 years ago
Sultan Khan deb828b4dd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljmma 26cf849f2b hot fixing 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 0b6cd845f1 implementing Smart Watch Integration 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
jammal 57f938aa09 fix ios issues 5 years ago
jammal 0fceca8f3e fix ios issues 5 years ago
haroon amjad 68b0e3857a updates 5 years ago
Sultan Khan f03a711dff symptom checker gender page updated 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
haroon amjad 7edb6fd179 UI Fixes in LiveCare 5 years ago
Mohammad Aljammal e025321c71 fix issues 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 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
hussam al-habibeh cd36749e4e files import fix 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
Mohammad Aljammal 1ce55e687f Ambulance Service second step 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
Elham Rababah 0b9a834673 Finish cancel order 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 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