Commit Graph

99 Commits (3d8daeb58dd73ae0d256da54fd7dd8c3feba1301)

Author SHA1 Message Date
Fatimah.Alshammari 3d8daeb58d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/core/utils/calendar_utils.dart
#	lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
#	pubspec.yaml
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
haroon amjad c97a492244 Medical File page updates 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
haroon amjad 634a138c7f Queueing system screen implementation contd. 1 month ago
haroon amjad ca47315b2c Merge branch 'master' into haroon_dev 1 month 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
1 month ago
aamir-csol d256eec392 medical file changes 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
aamir-csol 19365375f6 medical file changes 1 month ago
haroon amjad 3185d1e9e7 Allergies list implemented 1 month ago
haroon amjad 36bf63dcde Incoming call updates 1 month ago
haroon amjad 1e5744cf44 Updates & enhancements 2 months ago
Fatimah.Alshammari 86a91ab383 Merge branch 'refs/heads/master' into fatima 2 months ago
faizatflutter 757ace2ba1 Added Organ Selector 2 months ago
haroon amjad f142ff90be updates 2 months ago
haroon amjad 07a3052b8e appointment prescription implemented 2 months ago
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
2 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
2 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 2 months ago
haroon amjad ffca4317aa updates 2 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
2 months ago
haroon amjad f9f17f3a76 LiveChat implemented 2 months ago
Fatimah.Alshammari 27ad4e0764 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/home/landing_page.dart
2 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
2 months ago
haroon amjad 14f57027f4 Eye measurements done 2 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 2 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
2 months ago
haroon amjad 8dcc8dfbe3 updates 2 months ago
faizatflutter f96f3e563c Fixed App CustomChip 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
haroon amjad 2160f87c59 updates 2 months ago
faizatflutter b698b74eb5 Design Updates 2 months ago
faizatflutter 8c956fc052 Design changes 3 months ago
Fatimah.Alshammari 3f123d12d6 Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/utils/utils.dart
#	lib/main.dart
3 months ago
Fatimah.Alshammari de8c7bc605 active medication 3 months ago
faizatflutter 72d765e508 Design Updates 3 months ago
faizatflutter 462f4eba14 Design Updates 3 months ago
faizatflutter eabfaf8182 Design Updates 3 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 3 months ago
haroon amjad 663eda0076 updates & fixes 3 months 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
3 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 3 months ago
aamir-csol 24362f67cb family screen & widgets 3 months 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
3 months ago
aamir-csol d918b6e464 family screen & widgets 3 months ago
haroon amjad db979977ca Tamara implementation & enhancements 3 months ago
haroon amjad 5e000db556 updates 3 months ago