Commit Graph

152 Commits (7a4e28bbeaa507c8c76a09a2b16a07bc0bc7aef4)

Author SHA1 Message Date
haroon amjad d8c7503c56 QLine API implementation enhancements 6 months ago
Fatimah.Alshammari 190492a191 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/routes/app_routes.dart
6 months ago
haroon amjad 3060c57201 updates 6 months ago
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
6 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
6 months ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 6 months ago
haroon amjad c97a492244 Medical File page updates 6 months 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
7 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 7 months ago
haroon amjad ca47315b2c Merge branch 'master' into haroon_dev 7 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
7 months ago
aamir-csol d256eec392 medical file changes 7 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
7 months ago
aamir-csol 19365375f6 medical file changes 7 months ago
haroon amjad 3185d1e9e7 Allergies list implemented 7 months ago
haroon amjad 36bf63dcde Incoming call updates 7 months ago
haroon amjad 1e5744cf44 Updates & enhancements 7 months ago
Fatimah.Alshammari 86a91ab383 Merge branch 'refs/heads/master' into fatima 7 months ago
faizatflutter 757ace2ba1 Added Organ Selector 7 months ago
haroon amjad f142ff90be updates 7 months ago
haroon amjad 07a3052b8e appointment prescription implemented 7 months ago
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
7 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
7 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 7 months ago
haroon amjad ffca4317aa updates 7 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 7 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
7 months ago
haroon amjad f9f17f3a76 LiveChat implemented 7 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
7 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
7 months ago
haroon amjad 14f57027f4 Eye measurements done 7 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 8 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
8 months ago
haroon amjad 8dcc8dfbe3 updates 8 months ago
faizatflutter f96f3e563c Fixed App CustomChip 8 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
8 months ago
haroon amjad 2160f87c59 updates 8 months ago
faizatflutter b698b74eb5 Design Updates 8 months ago
faizatflutter 8c956fc052 Design changes 8 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
8 months ago
Fatimah.Alshammari de8c7bc605 active medication 8 months ago
faizatflutter 72d765e508 Design Updates 8 months ago
faizatflutter 462f4eba14 Design Updates 8 months ago
faizatflutter eabfaf8182 Design Updates 8 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 9 months ago
haroon amjad 663eda0076 updates & fixes 9 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
9 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 9 months ago
aamir-csol 24362f67cb family screen & widgets 9 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
9 months ago
aamir-csol d918b6e464 family screen & widgets 9 months ago
haroon amjad db979977ca Tamara implementation & enhancements 9 months ago
haroon amjad 5e000db556 updates 9 months ago
haroon amjad 1d22e53f63 Merge branch 'master' into haroon_dev
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
haroon amjad 093e645f60 request medical report implementation completed. 9 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 9 months 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
9 months ago
aamir-csol 1335d3a7c8 family screen & widgets 9 months ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
9 months ago
aamir-csol 288a0018ce family screen & widgets 9 months ago
haroon amjad 6b28b57307 empty state implementation contd. 9 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 9 months ago
faizatflutter 94313b8870 Improved Error Handling 9 months ago
haroon amjad a07369165d Updates 9 months ago
aamir-csol 1b652f877d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
9 months ago
aamir-csol 192d617350 family screen & widgets 9 months ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
haroon amjad 836a72ec22 App directionality changes 9 months ago
Haroon Amjad 1c2564a1e2 updates 9 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 9 months ago
aamir-csol a79dcad221 family screen & widgets 9 months ago
Sultan khan 4d52987c83 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
Haroon Amjad c9206f1ab8 Radiology report implemented 9 months ago
haroon amjad 3b5d2d27a4 Updates 9 months ago
Sultan khan eafb52ab86 family file work in-progress 9 months ago
haroon amjad 5de5fc8be9 updates 9 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 9 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 9 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 9 months ago
Haroon Amjad 14725616c6 medical report implementation contd. 9 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 9 months ago
Haroon Amjad b240293064 medical file implementation contd. 9 months ago
haroon amjad 151351c0bf medical file updates 10 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 10 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 10 months ago
Haroon Amjad 003a161b52 custom chips implemented 10 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 10 months ago
haroon amjad bafeb68950 medical file changes 10 months ago
Sikander Saleem d385d0362f merge changes 10 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
10 months ago
aamir-csol da035650c0 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
10 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 10 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 10 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
10 months ago
haroon amjad e044fc8c5e lab implementation contd. 10 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 10 months ago
aamir-csol d1e1154bdb changes 10 months ago
haroon amjad 9b1c3fe920 medical file updates 10 months ago