Commit Graph

296 Commits (8f18d1025ac4a043157a073edc942a23c08c201d)

Author SHA1 Message Date
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
Mohammad Aljammal 5ec3935c68 ER 5 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 5 years ago
haroon amjad a7f5dfab5c fixes 5 years ago
haroon amjad 35cd02494c implemented search by doctor list 5 years ago
haroon amjad 13adb46319 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/config/shared_pref_kay.dart
5 years ago
haroon amjad e29c6a892e updates 5 years ago
haroon amjad f669adcb9d Location service implemented 5 years ago
Sultan Khan badb4e52df Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 91e5a20fd0 fix merge issues 5 years ago
Mohammad Aljammal 54b766de81 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal d16ea676cf done parking service ,fix design issues in home page and add new icon 5 years ago
Mohammad Aljammal 01a011a03d done dashboard page 5 years ago
Sultan Khan e7a3d1a4ab speech search 5 years ago
Sultan Khan f52e73477a Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan f1e0bcf86e speech to tex 5 years ago
haroon amjad 84e92cb040 updates & fixes 5 years ago
haroon amjad 96b7d00b4b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 823eda0d5c updates 5 years ago
Mohammad Aljammal 4bc806671a Merge branch 'amjad_amireh' into 'master'
filter doctor by department

See merge request Cloud_Solution/diplomatic-quarter!33
5 years ago
Mohammad Aljammal 9e47dc19f9 filter doctor by department 5 years ago
Sultan Khan 130fb53a65 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3247378c02 search 5 years ago
haroon amjad 30e08b4417 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/pages/login/login.dart
5 years ago
haroon amjad 7a8392a97e updates 5 years ago
Mohammad Aljammal c0c6376f55 filter doctor by department 5 years ago
Mohammad Aljammal dc9b9e21ad filter doctor by department 5 years ago
Mohammad Aljammal 895c09efa4 parking service 5 years ago
Sultan Khan 1974e51602 merge 5 years ago
Sultan Khan 5d112b5464 merge 5 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 9b55309d53 text to speech 5 years ago
Mohammad Aljammal 4adc2916b4 fix merge issues 5 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
5 years ago
Mohammad Aljammal 8989fbc9b7 done design dashboard 5 years ago
haroon amjad 61dba06236 Twilio implemented in LiveCare 5 years ago
Sultan Khan 2f9885ecf8 family file changes 5 years ago
Sultan Khan 8887ba85fe family file 5 years ago
haroon amjad 732ab90b2f Book Appointment check login 5 years ago
Sultan Khan cb99b2a7a7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 327c4585a6 family file change 5 years ago
haroon amjad 760db6a873 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/locator.dart
5 years ago
haroon amjad cc4f5c0615 updates 5 years ago
haroon amjad 5f1413a2ac implementing Twilio in LiveCare 5 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 5 years ago
Mohammad Aljammal f5b16734c6 add time line 5 years ago
Mohammad Aljammal f6d30178bf done medical report 5 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
5 years ago
Mohammad Aljammal 75fdf28036 fix lab Result 5 years ago
Mohammad Aljammal 8495260c5a fix issues in feedback 5 years ago
haroon amjad db30fbdfd2 implementing livecare 5 years ago
haroon amjad 59c279998c working on vital signs integration 5 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 913729fc58 speech search 5 years ago
Mohammad Aljammal 5619b8c06f fix issues in feedback 5 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 5 years ago
haroon amjad 73cf37a3a5 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/core/service/client/base_app_client.dart
5 years ago
haroon amjad b9d913e6a5 Merge fixes & updates 5 years ago
Sultan Khan 03b34115c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 3b2f9251dc search 5 years ago
Mohammad Aljammal a5e63817f2 done vital sign 5 years ago
Sultan Khan 4c1a8dc38f new changes 5 years ago
Sultan Khan 9afeecf9fa new 5 years ago
Mohammad Aljammal 32e2732c43 feedback service 5 years ago
haroon amjad 3b881f1ab3 appointment details scenarios handled 5 years ago
Amjad Amireh 97dbe62f93 done report service 5 years ago
haroon amjad 7972d01dff Insurance Approval implemented 5 years ago
haroon amjad fde47a5c2c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/core/service/client/base_app_client.dart
5 years ago
haroon amjad 206f9a4371 fixes 5 years ago
haroon amjad 750746aabe updates & fixes 5 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
5 years ago
Mohammad Aljammal f229958e1c add ions 5 years ago
Mohammad Aljammal 22de043892 fix merge issues 5 years ago
Mohammad Aljammal b4b33be3e9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
 Conflicts:
	lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal 37b874fe3f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan 3f0c60aea5 sessionID 5 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 5 years ago
Sultan Khan da6f238c89 family files changes 5 years ago
haroon amjad c50530734d added my appointments in medical file page 5 years ago
Sultan Khan adbdd2dd0d Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 621870eca1 family file changes 5 years ago
haroon amjad 7d0efda1c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
5 years ago
hussam al-habibeh f77d4fac66 insurance translation 5 years ago
Haroon Amjad 8ad2941836 Appointment payment finalised, Ask Doc implemeted & other updates 5 years ago
Haroon Amjad 41c922bfeb Appointment payment implemented, Book Success implemented, Appointment flow implemented 5 years ago
haroon amjad 3a9fa97c91 updates 5 years ago
Mohammad Aljammal 716482bc4d Merge branch 'sultan' into 'master'
login changes

See merge request Cloud_Solution/diplomatic-quarter!17
5 years ago
Mohammad Aljammal 5cee1cef4e fix merge issues 5 years ago
Sultan Khan 6af7ac54ba login changes 5 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
5 years ago
Sultan Khan d1871bb71f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8ee3b3b557 family files. 5 years ago
hussam al-habibeh 492cfa084b insurance card and insurance update and insurance approval 5 years ago
Mohammad Aljammal 125360ced7 fix merge issues 5 years ago
Mohammad Aljammal 002efe3b45 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal a84341af58 fix merge issues 5 years ago
Mohammad Aljammal 5ea0df9f1e Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
#	lib/uitl/date_uitl.dart
5 years ago
Mohammad Aljammal 7d230ea14c fix issues 5 years ago
Mohammad Aljammal cfd5b2ccff feedback Service done 5 years ago
Sultan Khan 8e3fb6831d registration changes 5 years ago
Sultan Khan e735855c33 registration done. 5 years ago
haroon amjad 28fde5c500 My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates 5 years ago
Mohammad Aljammal 29768feefd merge master 5 years ago
Mohammad Aljammal 05222207da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal a12197fe70 labs result done add some file to git ignore for ios 5 years ago
haroon amjad 00d9214460 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Sultan Khan ecfa1756d3 login changes 5 years ago
Sultan Khan 0bc529f420 login changes 5 years ago
haroon amjad 192a3835d6 implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment. 5 years ago
Mohammad Aljammal 1bbbd18373 labs services 5 years ago
Sultan Khan 9d0a2e1e43 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 8d0834ff3e login inprogress 5 years ago
haroon amjad b3e5047820 Payment method selection page created, Appointment details functions implemented 5 years ago
Mohammad Aljammal 940b327561 done Prescriptions 5 years ago
haroon amjad 06f95c5379 Appointment Details implementation continued 5 years ago