Commit Graph

418 Commits (symtomcheckers)

Author SHA1 Message Date
tahaalam d137e1166d watch integration ui added. 6 months ago
aamir-csol a105d87241 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
6 months ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 6 months ago
Haroon Amjad a4573c8710 arabic fixes 6 months ago
Haroon Amjad 4ce1e912ce Vital sign data connected to Symptom checker 6 months ago
haroon amjad 9ed016ad8b updates & fixes 6 months ago
Sikander Saleem b9350afead ui improvements 7 months ago
faizatflutter 9c7cfde5f4 ui improvements 7 months ago
Sikander Saleem 6e1eb0d0bb ui improvements 7 months ago
Sikander Saleem 6e4d7519fb Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/widgets/habib_wallet_card.dart
7 months ago
Sikander Saleem 2648f304f6 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/data/landing_page_data.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
7 months ago
haroon amjad b0708d85d9 updates & fixes 7 months ago
haroon amjad 3e9a381ed7 Merge branch 'master' into haroon_dev 7 months ago
faizatflutter 14f3c6cb81 Added Arabic Support for symptoms checker 7 months ago
haroon amjad 10a5a6f558 Ask Doctor implemented 7 months ago
haroon amjad f48eb631ab Merge branch 'master' into haroon_dev 7 months ago
haroon amjad f54ce71177 translation changes 7 months ago
faizatflutter 07447e148b Symptoms Checker flow is completed 7 months ago
haroon amjad 6faca94b89 updates 7 months ago
Sikander Saleem e38892ff2d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/insurance/insurance_home_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
7 months ago
haroon amjad 5feacfaf27 Translation updates 7 months ago
haroon amjad 39af08ddc3 Translation updates 7 months ago
Sikander Saleem 0b9df1f22b collapsing toolbar behaviour changed as like barq 7 months ago
Sikander Saleem 45b013a048 UI/UX improvements - insurance update. 7 months ago
Sikander Saleem 1599cfed4e UI/UX improvements-1. 7 months ago
Sikander Saleem 77a04e637e UI/UX improvements. 7 months ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 7 months ago
Sultan khan 0ddaa6899d Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  fixed parking qr
  added parking part
  added monthly report
  added monthly report
  added monthly report
  fix error
  monthly report
  fix toggle
  fix toggle
  active medication
  active medication
  active medication
7 months ago
Sultan khan 42222804fd fix graph dot and bp graph. 7 months ago
haroon amjad 344adf23c0 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
7 months ago
haroon amjad 44ce353dac updates 7 months ago
Fatimah.Alshammari 250af1506c Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/services/dialog_service.dart
#	lib/theme/colors.dart
7 months ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
7 months ago
faizatflutter ff2bcbae3f Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/main.dart
7 months ago
faizatflutter 3f5bd0a759 Completed the health Tracker Module, Only the email part is left. 7 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 7 months ago
Fatimah.Alshammari 20e4f82df3 Merge branch 'master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
7 months ago
haroon amjad ede8844f19 Monthly Reports implemented 7 months ago
haroon amjad 255353dd21 Bottom nav updates 7 months ago
haroon amjad b10d715d55 App updates 8 months ago
haroon amjad 05e5b41dc6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
8 months ago
haroon amjad 6f067d92d6 My invoices implemented 8 months ago
Sultan khan dc8031bb41 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  updates
  fixed the suggested design changes. (Not reminder ones)
  fixed the suggested design changes. (Not reminder ones)
8 months ago
Sultan khan f7021f685a no message 8 months ago
faizatflutter a29c0dd6bc fixed the suggested design changes. (Not reminder ones) 8 months ago
faizatflutter f8fdd7570e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
8 months ago
Fatimah.Alshammari 11de01e079 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
8 months ago
faizatflutter d4dd475e0b Added Graph 8 months ago
faizatflutter 333046951c Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/routes/app_routes.dart
8 months ago
Sultan khan 6ceee6973f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  sickleave fix
  Health calculators & converters
  updates
  updates
  updates
  updates
  Nearest Appointment selected

# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
8 months ago
Sultan khan 873b2a1591 sorting done, covid inprogress 8 months ago
faizatflutter a1aaa041d1 Water Intake Final Touches 8 months ago
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
8 months ago
aamir-csol 135b05e561 Health calculators & converters 8 months ago
Fatimah.Alshammari f3674ba06f Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
8 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 8 months ago
haroon amjad 5581346a2d updates 8 months ago
Sikander Saleem edcab9d26d collapsing_list_view improvement 8 months ago
Sikander Saleem 5191ffeb2c Merge branch 'refs/heads/master' into dev_sikander 8 months ago
Sikander Saleem a78769df67 collapsing_list_view improvement 8 months ago
faizatflutter 94668997aa Updated design for HHC 8 months ago
haroon amjad 450f07d39d updates & fixes 8 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
8 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
8 months ago
aamir-csol 335e6a6649 Health Calculators 8 months ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
8 months ago
faizatflutter cf26e71645 Complete USerInfo Selectoiun 8 months ago
faizatflutter c7c0a0ac09 Added user_info module IAP 8 months ago
tahaalam 2125e30c23 Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
8 months ago
tahaalam 95243c250f graph shaded region added from horizontal spaces 8 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
8 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 8 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
8 months ago
aamir-csol d256eec392 medical file changes 8 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
8 months ago
faizatflutter 2173d091ed Added symptoms selector 8 months ago
aamir-csol 19365375f6 medical file changes 8 months ago
tahaalam ac15ab26f5 graph changes for high and low 8 months ago
haroon amjad b37804d012 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/prescriptions/prescriptions_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
8 months ago
Haroon6138 88039534e2 Merge pull request 'Calendar reminder added for both prescription and appointment.' (#105) from calender_reminder into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/105
8 months ago
aamir-csol 0f17a655ed Merge branch 'master' into dev_aamir
# Conflicts:
#	ios/Runner/AppDelegate.swift
#	lib/core/dependencies.dart
#	lib/core/utils/utils.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/authentication/quick_login.dart
#	lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/appbar/collapsing_list_view.dart
#	lib/widgets/common_bottom_sheet.dart
8 months ago
haroon amjad 36bf63dcde Incoming call updates 9 months ago
faizatflutter ac84d268e9 triage design 9 months ago
tahaalam e200479332 old calender util deleted 9 months ago
haroon amjad 5a1c58e6b2 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 1e5744cf44 Updates & enhancements 9 months ago
Fatimah.Alshammari 86a91ab383 Merge branch 'refs/heads/master' into fatima 9 months ago
faizatflutter 757ace2ba1 Added Organ Selector 9 months ago
Sultan khan a4d3bb3533 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 9 months ago
Sultan khan fb69723a65 e-referral done. 9 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 9 months ago
faizatflutter 8068de70cb Completed the HHC and CMC 9 months ago
haroon amjad b90883a596 prescription order implementation contd. 9 months ago
tahaalam cbaea9d5e6 screen documentation added. 9 months ago
tahaalam 5983caf83a single map screen added to the project for multiple place usage 9 months ago
Sultan khan 5f047e1b6f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/hmg_services/hmg_services_repo.dart
#	lib/features/hmg_services/hmg_services_view_model.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/pickup_location.dart
9 months ago
Sultan khan d8a9d8443a e-referral work done search-referral in progress. 9 months ago
haroon amjad eb9c38729b Prescription delivery implementation contd. 9 months ago
haroon amjad 07a3052b8e appointment prescription implemented 9 months ago
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
9 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
9 months ago
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
9 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
9 months ago
faizatflutter fe00447483 HHC in Progress 9 months ago
faizatflutter 95bd2a2a7e CMC Tweaks Completed 9 months ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 9 months ago
faizatflutter da579dfd09 CMC Module Completed 9 months ago
faizatflutter 3331edc10d Comprehensive checkup Completed 9 months ago
haroon amjad 938463aabc Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/date_util.dart
9 months ago
haroon amjad 9f845f1de8 Feedback page implementation contd. 9 months ago
tahaalam 31261092a8 rrt request creation and history listing 9 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 9 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
9 months ago
Haroon Amjad 73b05276f6 Feedback page implementation contd. 9 months ago
Haroon Amjad 37a0692be4 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev 9 months ago
haroon amjad f9f17f3a76 LiveChat implemented 9 months ago
Sultan khan 8e132e964f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
9 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
9 months ago
tahaalam 525504265c issue resolution 9 months ago
tahaalam 53be50b40c Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/appointments/widgets/appointment_doctor_card.dart
#	lib/widgets/common_bottom_sheet.dart
9 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
9 months ago
faizatflutter 16b5ff1b62 Ancillary Orders Flow Completed 9 months ago
tahaalam a669265076 Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart
#	lib/main.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/type_selection_widget.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/widgets/input_widget.dart
9 months ago
haroon amjad 2a6c7fc0a1 Find us implemented 9 months ago
tahaalam 5b0a8ad898 cancel and listing request added 9 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 9 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 9 months ago
Sultan khan c701572dde radiology search 10 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
10 months ago
haroon amjad 8dcc8dfbe3 updates 10 months ago
faizatflutter f96f3e563c Fixed App CustomChip 10 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
10 months ago
faizatflutter b698b74eb5 Design Updates 10 months ago
aamir-csol e113c4c1ee updates & fixes & RRT Flow 10 months ago
Haroon Amjad 2e16622cc3 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/size_utils.dart
#	lib/presentation/home/widgets/large_service_card.dart
10 months ago
Haroon6138 622851a1a0 Merge pull request 'Design Fixes for Responsiveness (faiz_dev)' (#88) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/88
10 months ago
faizatflutter 8c956fc052 Design changes 10 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
10 months ago
Fatimah.Alshammari de8c7bc605 active medication 10 months ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 10 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
10 months ago
tahaalam 90128a812b call ambulance module design added. 10 months ago
haroon amjad 65220270c2 Size utils & fixes 10 months ago
faizatflutter 72d765e508 Design Updates 10 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
10 months ago
faizatflutter 462f4eba14 Design Updates 10 months ago
haroon amjad 4b52862ba0 updates 10 months ago
faizatflutter eabfaf8182 Design Updates 10 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
10 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 10 months ago