Commit Graph

76 Commits (d4dd475e0b9b000333c8d9c7f381ccc2d5d643b6)

Author SHA1 Message Date
haroon amjad b353de3cf8 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_doctor_page.dart
#	lib/presentation/book_appointment/widgets/doctor_card.dart
3 weeks ago
aamir-csol 135b05e561 Health calculators & converters 3 weeks ago
haroon amjad f886357bcd updates 3 weeks ago
haroon amjad b8ecb70aa2 Merge branch 'master' into haroon_dev 4 weeks ago
aamir-csol c921228ad9 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/health_calculators/health_calculator_result.dart
4 weeks ago
aamir-csol f509a09b34 Health calculators & converters 4 weeks ago
haroon amjad 15f5eaf8e5 updates 4 weeks ago
haroon amjad 87fd9a42b7 Nearest Appointment selected 4 weeks ago
haroon amjad 450f07d39d updates & fixes 1 month ago
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 1 month ago
haroon amjad 3060c57201 updates 1 month ago
haroon amjad d202aa8423 Smartwatch integration started 1 month ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
1 month ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 1 month ago
faizatflutter c7c0a0ac09 Added user_info module IAP 1 month ago
faizatflutter 34f4cd4f91 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
1 month ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 1 month ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 1 month ago
faizatflutter e35fe9ac05 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
1 month ago
haroon amjad 581a4a5a74 WalkIn Appointment implementation done 1 month ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 1 month ago
haroon amjad 36bf63dcde Incoming call updates 1 month ago
haroon amjad 1e5744cf44 Updates & enhancements 2 months ago
faizatflutter 757ace2ba1 Added Organ Selector 2 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 2 months ago
haroon amjad fee84a2928 Nearest appointment implemented 2 months ago
Haroon Amjad 73b05276f6 Feedback page implementation contd. 2 months ago
haroon amjad f9f17f3a76 LiveChat implemented 2 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 2 months ago
haroon amjad 8976f4db9d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/medical_file/medical_file_page.dart
2 months ago
faizatflutter b698b74eb5 Design Updates 2 months ago
haroon amjad 65220270c2 Size utils & fixes 3 months ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
3 months ago
faizatflutter eabfaf8182 Design Updates 3 months ago
haroon amjad d693850ef4 ER services implementation contd. 3 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 3 months ago
tahaalam ea92a0c75c laser appointment screen added 3 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 3 months ago
haroon amjad d220be7283 Tamara payment flow done 3 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 3 months ago
haroon amjad c0606fb530 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/lab/lab_orders_page.dart
3 months ago
haroon amjad b05e4e2a15 Dental appointment booking flow implementation contd. 3 months ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 3 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 3 months ago
tahaalam 35e145ddf9 id selection from the appropiate list 3 months ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
3 months ago
haroon amjad 903248133e Lab order & results enhancements 3 months ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 3 months ago
haroon amjad db979977ca Tamara implementation & enhancements 3 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
3 months ago