Commit Graph

82 Commits (f19d06512aae7a8d8ddc2290b8a79f6dfdbeb413)

Author SHA1 Message Date
tahaalam f19d06512a filters changed in region selection bottom sheet 9 months ago
haroon amjad 213662e718 updates 9 months ago
haroon amjad 162337b317 Added appointment nearest gate & floor 9 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
9 months ago
aamir-csol 54f8391066 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
9 months ago
aamir-csol 135b05e561 Health calculators & converters 9 months ago
haroon amjad 510d82b592 Merge branch 'master' into haroon_dev 9 months ago
Sultan khan 366429f083 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:
  Health calculators & converters
  Health calculators & converters
  collapsing_list_view improvement

# Conflicts:
#	lib/widgets/appbar/collapsing_list_view.dart
9 months ago
haroon amjad f886357bcd updates 10 months ago
haroon amjad d8c7503c56 QLine API implementation enhancements 10 months ago
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 10 months ago
haroon amjad bee4aafc44 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 3060c57201 updates 10 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
10 months ago
haroon amjad eff6cbbaad updates & fixes 10 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
10 months ago
Sultan khan f28762a5c5 last appointment rated done. 10 months ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 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
haroon amjad 36bf63dcde Incoming call updates 10 months ago
haroon amjad 1e5744cf44 Updates & enhancements 10 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 11 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
11 months ago
haroon amjad b13adde9d2 send feedback implementation done 11 months ago
faizatflutter 3331edc10d Comprehensive checkup Completed 11 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
11 months ago
tahaalam 5b0a8ad898 cancel and listing request added 11 months ago
haroon amjad 14f57027f4 Eye measurements done 11 months ago
haroon amjad c600b0ee7a Ask doctor implemented 11 months ago
haroon amjad 21b7b32013 Ask doctor implementation contd. 11 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 11 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
11 months ago
faizatflutter f96f3e563c Fixed App CustomChip 11 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
11 months ago
faizatflutter b698b74eb5 Design Updates 11 months ago
haroon amjad 65220270c2 Size utils & fixes 12 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 1 year ago
tahaalam ea92a0c75c laser appointment screen added 1 year ago
haroon amjad 663eda0076 updates & fixes 1 year ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 1 year ago
haroon amjad d220be7283 Tamara payment flow done 1 year ago
haroon amjad 30eb8bf5de dental booking flow implemented 1 year 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
1 year ago
tahaalam 6cf08c04d2 appointment filters added. 1 year ago
tahaalam 35e145ddf9 id selection from the appropiate list 1 year ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
1 year ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 1 year ago