Commit Graph

89 Commits (fbe124f6ee76c8df0b6667cc4c11b166315468c0)

Author SHA1 Message Date
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
10 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 11 months ago
haroon amjad ca47315b2c Merge branch 'master' into haroon_dev 11 months ago
aamir-csol f91f8e63d7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/medical_file/widgets/lab_rad_card.dart
11 months ago
aamir-csol d256eec392 medical file changes 11 months 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
11 months ago
aamir-csol 19365375f6 medical file changes 11 months ago
haroon amjad 3185d1e9e7 Allergies list implemented 11 months ago
haroon amjad 36bf63dcde Incoming call updates 11 months ago
haroon amjad 1e5744cf44 Updates & enhancements 11 months ago
faizatflutter 757ace2ba1 Added Organ Selector 11 months ago
haroon amjad f142ff90be updates 11 months ago
haroon amjad 07a3052b8e appointment prescription implemented 11 months ago
haroon amjad 63d844a5e9 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/features/radiology/radiology_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
#	lib/presentation/emergency_services/history/widget/rrt_item.dart
11 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 11 months ago
haroon amjad ffca4317aa updates 11 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 11 months ago
haroon amjad f9f17f3a76 LiveChat implemented 11 months ago
faizatflutter 617b68021a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/appointments/appointment_payment_page.dart
11 months ago
haroon amjad 14f57027f4 Eye measurements done 11 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 11 months ago
haroon amjad d3a8d545b2 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
12 months ago
haroon amjad 8dcc8dfbe3 updates 12 months ago
faizatflutter f96f3e563c Fixed App CustomChip 12 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
12 months ago
haroon amjad 2160f87c59 updates 12 months ago
faizatflutter b698b74eb5 Design Updates 12 months ago
faizatflutter 8c956fc052 Design changes 1 year ago
faizatflutter 72d765e508 Design Updates 1 year ago
faizatflutter 462f4eba14 Design Updates 1 year ago
faizatflutter eabfaf8182 Design Updates 1 year ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 1 year ago
haroon amjad 663eda0076 updates & fixes 1 year ago
haroon amjad b27e3268b1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
1 year ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 1 year ago
aamir-csol 24362f67cb family screen & widgets 1 year ago
aamir-csol aaa8222b1a Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/features/medical_file/medical_file_repo.dart
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
1 year ago
aamir-csol d918b6e464 family screen & widgets 1 year ago
haroon amjad db979977ca Tamara implementation & enhancements 1 year ago
haroon amjad 5e000db556 updates 1 year ago
haroon amjad 1d22e53f63 Merge branch 'master' into haroon_dev
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/presentation/medical_file/medical_file_page.dart
1 year ago
haroon amjad 093e645f60 request medical report implementation completed. 1 year ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 1 year ago
aamir-csol e5488299b8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
#	lib/widgets/common_bottom_sheet.dart
1 year ago
aamir-csol 1335d3a7c8 family screen & widgets 1 year ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
1 year ago
aamir-csol 288a0018ce family screen & widgets 1 year ago
haroon amjad 6b28b57307 empty state implementation contd. 1 year ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 1 year ago
faizatflutter 94313b8870 Improved Error Handling 1 year ago