Commit Graph

17 Commits (a1aaa041d14c09b72e5fa66e2c854d52d9f1e30f)

Author SHA1 Message Date
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
1 month ago
Sultan khan f28762a5c5 last appointment rated done. 1 month ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 1 month ago
haroon amjad 581a4a5a74 WalkIn Appointment implementation done 1 month ago
faizatflutter 95bd2a2a7e CMC Tweaks Completed 2 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
2 months ago
haroon amjad 14f57027f4 Eye measurements done 2 months ago
haroon amjad c600b0ee7a Ask doctor implemented 2 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 2 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
3 months ago
tahaalam 6cf08c04d2 appointment filters added. 3 months ago
haroon amjad db979977ca Tamara implementation & enhancements 3 months ago
haroon amjad a07369165d Updates 4 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 4 months ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 4 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 4 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 4 months ago