Commit Graph

142 Commits (edcab9d26d60c433f741c84a484b047fb70b3d77)

Author SHA1 Message Date
haroon amjad 450f07d39d updates & fixes 10 months ago
aamir-csol 7d71d994ea Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/enums.dart
#	lib/core/utils/calender_utils_new.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/routes/app_routes.dart
10 months ago
aamir-csol 335e6a6649 Health Calculators 10 months ago
haroon amjad d202aa8423 Smartwatch integration started 10 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
10 months ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
10 months ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 10 months ago
faizatflutter c7c0a0ac09 Added user_info module IAP 10 months ago
haroon amjad c97a492244 Medical File page updates 10 months ago
haroon amjad a83a35a284 Services Page Revamp 10 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
10 months ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 10 months ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 10 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 10 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
10 months ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 10 months ago
haroon amjad 36bf63dcde Incoming call updates 10 months ago
faizatflutter acb6d31ff3 Added possible conditions screen 10 months ago
faizatflutter 757ace2ba1 Added Organ Selector 10 months ago
faizatflutter 8ddfdeeac4 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/core/utils/date_util.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/widgets/common_bottom_sheet.dart
11 months ago
tahaalam 31261092a8 rrt request creation and history listing 11 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 11 months ago
tahaalam 5b0a8ad898 cancel and listing request added 11 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 11 months ago
tahaalam 90128a812b call ambulance module design added. 12 months ago
haroon amjad 1c3ed8f2e1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
12 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 12 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 12 months ago
haroon amjad d693850ef4 ER services implementation contd. 1 year ago
tahaalam ea92a0c75c laser appointment screen added 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
tahaalam 483a1571d9 Merge remote-tracking branch 'origin/master' into appointment_filter
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
1 year ago
tahaalam 6cf08c04d2 appointment filters added. 1 year ago
tahaalam 641df8b51b logs removed 1 year ago
tahaalam 36bf229787 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
1 year ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
1 year ago
haroon amjad 8a7f46441c updates 1 year ago
tahaalam 6ef9ae813d doctors search filter added 1 year ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 1 year ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 1 year ago
tahaalam da89c41925 lab result by hospital and translations are added 1 year ago
haroon amjad 2f4d6f5553 immediate livecare consultation 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
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 1 year ago
aamir-csol 288a0018ce family screen & widgets 1 year ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
1 year ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 1 year ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 1 year ago