Commit Graph

692 Commits (2e1f4e87e0a93b6381b6fb1bc13306ea71b49db3)

Author SHA1 Message Date
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 2 months ago
Fatimah.Alshammari c9de23347a fix error 2 months ago
Fatimah.Alshammari 190492a191 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/routes/app_routes.dart
2 months ago
Sultan khan d28c94606b 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
  updates
  updates & fixes
2 months ago
Sultan khan 68e1b116f9 last rated updated. 2 months ago
haroon amjad fe294ae8f6 updates 2 months ago
haroon amjad bee4aafc44 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 3060c57201 updates 2 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
2 months ago
Sultan khan 70d5b06987 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: (45 commits)
  Health Calculators
  Smartwatch integration started
  refactor
  Complete UserInfo Selection Module
  Complete UserInfo Selection Module
  update
  Complete USerInfo Selectoiun
  Ancillary order fixes, QLine API integrated & other enhancements
  Added user_info module IAP
  Medical File page updates
  Master merged
  Services Page Revamp
  loading view added
  graph shaded region added from horizontal spaces
  Refactoring
  Appointment Queue implemented, Blood Donation implementation contd.
  Integrated the API for Symptoms Checker
  Queueing system screen implementation contd.
  medical file changes
  Added symptoms selector
  ...

# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/my_appointments/my_appointments_repo.dart
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/home/landing_page.dart
2 months ago
Fatimah.Alshammari 0b3fea230f monthly report 2 months ago
haroon amjad f1004f39af Merge branch 'master' into haroon_dev 2 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
2 months ago
aamir-csol 335e6a6649 Health Calculators 2 months ago
haroon amjad eff6cbbaad updates & fixes 2 months ago
haroon amjad d202aa8423 Smartwatch integration started 2 months ago
Sultan khan 1d49308cc7 last appointment rated. 2 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
2 months ago
Sultan khan f28762a5c5 last appointment rated done. 2 months ago
faizatflutter 449c338c46 refactor 2 months ago
faizatflutter 5fd1905d8c Complete UserInfo Selection Module 2 months ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
2 months ago
faizatflutter fbe124f6ee Complete UserInfo Selection Module 2 months ago
faizatflutter cf26e71645 Complete USerInfo Selectoiun 2 months ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 2 months ago
faizatflutter c7c0a0ac09 Added user_info module IAP 2 months ago
haroon amjad c97a492244 Medical File page updates 2 months ago
haroon amjad 818534e9f6 Master merged 2 months ago
haroon amjad 7cdb30a364 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad a83a35a284 Services Page Revamp 2 months ago
tahaalam 2d2380851e loading view added 2 months ago
tahaalam 2125e30c23 Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
2 months ago
tahaalam 95243c250f graph shaded region added from horizontal spaces 2 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
2 months ago
faizatflutter 9410ad9b60 Refactoring 2 months ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 2 months ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 2 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 2 months ago
haroon amjad ca47315b2c Merge branch 'master' into haroon_dev 2 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
2 months ago
aamir-csol d256eec392 medical file changes 2 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
2 months ago
faizatflutter 2173d091ed Added symptoms selector 2 months ago
aamir-csol 19365375f6 medical file changes 2 months ago
tahaalam ac15ab26f5 graph changes for high and low 2 months ago
haroon amjad 3185d1e9e7 Allergies list implemented 2 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
2 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
2 months ago
haroon amjad 581a4a5a74 WalkIn Appointment implementation done 2 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
2 months ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 2 months ago
haroon amjad 36bf63dcde Incoming call updates 2 months ago
faizatflutter ac84d268e9 triage design 2 months ago
Sultan khan ddac155a6a silent login case handled. 3 months ago
tahaalam 393eaad2c7 Merge remote-tracking branch 'origin/master' 3 months ago
tahaalam e200479332 old calender util deleted 3 months ago
tahaalam e0e41d1900 calender reminder added on appointment and pescription 3 months ago
haroon amjad 5a1c58e6b2 Merge branch 'master' into haroon_dev 3 months ago
haroon amjad 1e5744cf44 Updates & enhancements 3 months ago
faizatflutter acb6d31ff3 Added possible conditions screen 3 months ago
tahaalam fc0f98da1d calender reminder added 3 months ago
Fatimah.Alshammari 86a91ab383 Merge branch 'refs/heads/master' into fatima 3 months ago
Sultan khan 9e0336687c virtual tour. 3 months ago
faizatflutter 757ace2ba1 Added Organ Selector 3 months ago
Sultan khan 2532b494f7 e-referral done. 3 months ago
Sultan khan a4d3bb3533 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 3 months ago
Sultan khan fb69723a65 e-referral done. 3 months ago
haroon amjad f142ff90be updates 3 months ago
haroon amjad 32adf754ce prescription delivery implemented 3 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 3 months ago
faizatflutter 8068de70cb Completed the HHC and CMC 3 months ago
faizatflutter 5e437e42a9 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/location/location_view_model.dart
3 months ago
faizatflutter c84564dafd minor changes 3 months ago
Haroon Amjad bad76059c0 prescription delivery implementation contd. 3 months ago
haroon amjad b90883a596 prescription order implementation contd. 3 months ago
haroon amjad 1be430aa76 Merge branch 'master' into haroon_dev 3 months ago
haroon amjad fee84a2928 Nearest appointment implemented 3 months ago
tahaalam 5983caf83a single map screen added to the project for multiple place usage 3 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
3 months ago
Sultan khan d8a9d8443a e-referral work done search-referral in progress. 3 months ago
haroon amjad eb9c38729b Prescription delivery implementation contd. 3 months ago
haroon amjad 07a3052b8e appointment prescription implemented 3 months ago
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
3 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
3 months ago
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
3 months ago
tahaalam 0e1a643c93 padding added to rrt screen 3 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 3 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
3 months ago
faizatflutter fe00447483 HHC in Progress 3 months ago
tahaalam 8f46dddbd6 terms and condition added to the rrt module. 3 months ago
haroon amjad ffca4317aa updates 3 months ago
faizatflutter 95bd2a2a7e CMC Tweaks Completed 3 months ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 3 months ago
haroon amjad b13adde9d2 send feedback implementation done 3 months ago
faizatflutter da579dfd09 CMC Module Completed 3 months ago
faizatflutter 3331edc10d Comprehensive checkup Completed 3 months ago
haroon amjad a4e55cb6df fixes 3 months ago
haroon amjad 938463aabc Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/date_util.dart
3 months ago
haroon amjad 9f845f1de8 Feedback page implementation contd. 3 months ago
tahaalam 31261092a8 rrt request creation and history listing 3 months ago
Sultan khan 9a04974db3 Merge branch 'faiz_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
3 months ago
Sultan khan c43f96c619 e-referral work in progress 3 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 3 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
3 months ago
Fatimah.Alshammari e17d3cde87 fix toggle 3 months ago
Fatimah.Alshammari 77242825bb fix toggle 3 months ago
Haroon Amjad 73b05276f6 Feedback page implementation contd. 3 months ago
Haroon Amjad c88bff8cf2 todo update 3 months ago
Haroon Amjad 37a0692be4 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev 3 months ago
haroon amjad f9f17f3a76 LiveChat implemented 3 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
3 months ago
Sultan khan 171bd644d1 e-referral work in progress. 3 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
3 months ago
Fatimah.Alshammari eae16eec44 active medication 3 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
3 months ago
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 3 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
3 months ago
faizatflutter 16b5ff1b62 Ancillary Orders Flow Completed 3 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
3 months ago
tahaalam 1f852f63cf penguin sdk added 3 months ago
haroon amjad 096b2b7cbf livechat implementation contd. 3 months ago
haroon amjad 2a6c7fc0a1 Find us implemented 3 months ago
tahaalam 5b0a8ad898 cancel and listing request added 3 months ago
haroon amjad 14f57027f4 Eye measurements done 3 months ago
haroon amjad c600b0ee7a Ask doctor implemented 3 months ago
haroon amjad 21b7b32013 Ask doctor implementation contd. 3 months ago
haroon amjad 9a48421271 ER Online Check-In implemented 3 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 3 months ago
Haroon Amjad cc1e073f6d ER Online CheckIn implementation contd. 3 months ago
haroon amjad 60bd9ee55a ER Online CheckIn implementation contd. 3 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 3 months ago
Sultan khan c701572dde radiology search 3 months ago
Sultan khan 028e03a97b filter radiology 3 months ago
haroon amjad f280d4a28a todo page implementation started 3 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
3 months ago
haroon amjad 8dcc8dfbe3 updates 3 months ago
faizatflutter f96f3e563c Fixed App CustomChip 3 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
3 months ago
haroon amjad 2160f87c59 updates 3 months ago
faizatflutter b698b74eb5 Design Updates 3 months ago
aamir-csol e113c4c1ee updates & fixes & RRT Flow 4 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
4 months ago
faizatflutter dc5eba7d12 refactored code 4 months ago
faizatflutter 28f8aec60f resolved fSize issue 4 months ago
aamir-csol 3e5c3a3a27 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
4 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
4 months ago
faizatflutter 8c956fc052 Design changes 4 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
4 months ago
Fatimah.Alshammari de8c7bc605 active medication 4 months ago
aamir-csol 8123981092 Merge branch 'master' into dev_aamir 4 months ago
aamir-csol 987fe73128 family screen add fixes & remove & switch & widgets 4 months ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 4 months ago
aamir-csol 6f01f92dd0 Merge remote-tracking branch 'origin/faiz_dev' into dev_aamir 4 months ago
aamir-csol 02ae79c458 Merge branch 'refs/heads/master' into dev_aamir 4 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
4 months ago
tahaalam 90128a812b call ambulance module design added. 4 months ago
faizatflutter 3e61df218b Some Minor design updated 4 months ago
haroon amjad 65220270c2 Size utils & fixes 4 months ago
haroon amjad 3c81cffa75 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 8a6f94cc1d updates 4 months ago
faizatflutter 72d765e508 Design Updates 4 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
4 months ago
faizatflutter 462f4eba14 Design Updates 4 months ago
faizatflutter eabfaf8182 Design Updates 4 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
4 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 4 months ago
tahaalam 47d158c1e2 Merge remote-tracking branch 'origin/master' 4 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 4 months ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
4 months ago
haroon amjad d755eb0df8 contd. 4 months ago
haroon amjad 0441d072fa Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart
4 months ago
haroon amjad d693850ef4 ER services implementation contd. 4 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 4 months ago
tahaalam a7bd5f61cb Merge remote-tracking branch 'origin/master' into feature/lab_result 4 months ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 4 months ago
aamir-csol 58e65e7a64 Merge branch 'master' into dev_aamir 4 months ago
aamir-csol cd81372fc6 family screen add fixes & remove & switch & widgets 4 months ago
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
Haroon6138 5227fa6b58 Merge pull request 'family screen add fixes & remove & switch & widgets' (#79) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/79
4 months ago
haroon amjad 5e1a7652be lab report download implemented 4 months ago
tahaalam 773cc9229b Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
4 months ago
tahaalam cc458b2ec7 files and packages renamed 4 months ago
tahaalam 81a6c7d034 files and packages renamed 4 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 4 months ago
Haroon6138 51d225e206 Merge pull request 'laser appointment screen added' (#78) from laser_appointment into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/78
4 months ago
Haroon6138 084efb7d32 Merge pull request 'lab severity values handled and size of lab description fixed' (#80) from feature/lab_result into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/80
4 months ago
tahaalam ab74a61969 lab severity values handled and size of lab description fixed 4 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 4 months ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 4 months ago
tahaalam ea92a0c75c laser appointment screen added 4 months ago
haroon amjad a2310e1447 prescription instructions PDF implemented 4 months ago
haroon amjad 663eda0076 updates & fixes 4 months ago
Fatimah.Alshammari cb56503622 Merge remote-tracking branch 'refs/remotes/origin/master' into fatima 4 months ago
Fatimah.Alshammari e8319a0d3f active medication 4 months ago
haroon amjad fe5b6c35ac insurance approval implementation done 4 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
4 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 4 months ago
aamir-csol 24362f67cb family screen & widgets 4 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
4 months ago
aamir-csol d918b6e464 family screen & widgets 4 months ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad f1a60a9dfb updates 4 months ago
tahaalam e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR 4 months ago
haroon amjad d220be7283 Tamara payment flow done 4 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 4 months ago
haroon amjad c0606fb530 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/lab/lab_orders_page.dart
4 months ago
haroon amjad b05e4e2a15 Dental appointment booking flow implementation contd. 4 months ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 4 months 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
4 months ago
tahaalam 6cf08c04d2 appointment filters added. 4 months ago
Haroon6138 156d7b4834 Merge pull request 'id selection from the appropiate list' (#70) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/70
4 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 4 months ago
tahaalam 35e145ddf9 id selection from the appropiate list 4 months ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
4 months ago
haroon amjad 903248133e Lab order & results enhancements 4 months ago
Haroon6138 7e92cad55b Merge pull request 'bottom handled when dental and laser clinic is selected from clinic page' (#69) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/69
4 months ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 4 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 4 months ago
haroon amjad db979977ca Tamara implementation & enhancements 4 months 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
4 months ago
tahaalam 2e9a462a1c listing resizing if the data is in small numbers. 4 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
4 months ago
haroon amjad 5e000db556 updates 4 months ago
tahaalam 786aa05b19 doctor list handled to be cleared when going back 4 months ago
tahaalam a4a32cca44 doctor filter icon removed from the doctor listing from clininc 4 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
4 months ago
haroon amjad 8a7f46441c updates 4 months ago
tahaalam 6ef9ae813d doctors search filter added 4 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 4 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 4 months ago
tahaalam da89c41925 lab result by hospital and translations are added 5 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 5 months ago
haroon amjad 093e645f60 request medical report implementation completed. 5 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 5 months ago
haroon amjad 2de02102c2 profile settings update 5 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
5 months ago
aamir-csol 1335d3a7c8 family screen & widgets 5 months ago
faizatflutter 4cc4a7b0d9 merged main 5 months ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
5 months ago
haroon amjad 6565ba719d Merge branch 'master' into haroon_dev 5 months ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 5 months ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
5 months ago
tahaalam 048f0bb459 graph design change 5 months ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 5 months ago
aamir-csol 288a0018ce family screen & widgets 5 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
5 months ago
haroon amjad 6b28b57307 empty state implementation contd. 5 months ago
tahaalam b05b03a6f6 divider changed 5 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 5 months ago
aamir-csol 36193d349c Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/medical_file/medical_file_view_model.dart
5 months ago