Commit Graph

162 Commits (7654dbb4f6854a7141438c182248e1d11002120b)

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
4 months ago
Sultan khan f28762a5c5 last appointment rated done. 4 months ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 4 months ago
haroon amjad ca47315b2c Merge branch 'master' into haroon_dev 4 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
4 months ago
haroon amjad 3185d1e9e7 Allergies list implemented 4 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
4 months ago
Sultan khan ddac155a6a silent login case handled. 5 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
5 months ago
tahaalam 5b0a8ad898 cancel and listing request added 5 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 5 months ago
aamir-csol e113c4c1ee updates & fixes & RRT Flow 6 months ago
faizatflutter eabfaf8182 Design Updates 6 months ago
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
6 months ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 6 months ago
haroon amjad 663eda0076 updates & fixes 6 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
6 months ago
aamir-csol 24362f67cb family screen & widgets 6 months ago
aamir-csol d918b6e464 family screen & widgets 6 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
7 months ago
aamir-csol 1335d3a7c8 family screen & widgets 7 months ago
aamir-csol 288a0018ce family screen & widgets 7 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
7 months ago
aamir-csol 02433e1bef family screen & widgets 7 months ago
Sultan khan e2188b5a69 switch family member with super user 7 months ago
faizatflutter 94313b8870 Improved Error Handling 7 months ago
Sultan khan 3642523fdf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
7 months ago
aamir-csol 9e8011c34c family screen & widgets 7 months ago
aamir-csol 47ce5022d3 family screen & widgets 7 months ago
aamir-csol 192d617350 family screen & widgets 7 months ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
7 months ago
aamir-csol 1125437a56 family screen & widgets 7 months ago
haroon amjad 3e95999bf3 Merge branch 'master' into haroon_dev 7 months ago
aamir-csol f9bfc131a8 family screen & widgets 7 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 7 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 7 months ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 7 months ago
aamir-csol 3ddd7781cd Merge branch 'master' into dev_aamir 7 months ago
haroon amjad c191fd0be1 updates 7 months ago
aamir-csol 3b1b51ef6f otp screen & register Uae & resend Activation Code. 7 months ago
Sultan khan cd5da116f9 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/authentication/widgets/otp_verification_screen.dart
7 months ago
Sultan khan fe36c2a1c1 auto sms 7 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 7 months ago
aamir-csol 15c07cb4e2 otp screen & register Uae & resend Activation Code. 7 months ago
Sultan khan 6b766e558d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/navigation_screen.dart
7 months ago
Sultan khan 286dfaa376 no message 7 months ago
aamir-csol fbd6ef0cf8 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart
7 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 7 months ago
Sultan khan 009fa1859e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 7 months ago
Sultan khan fdd5d4cf6d fixes 7 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 7 months ago
haroon amjad 6f745f3666 calendar implementation contd. 7 months ago
aamir-csol 87830e17ab otp screen 7 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 7 months ago
aamir-csol 7c8d7b67a9 signup finalize 7 months ago
aamir-csol b7e19a0af8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
7 months ago
aamir-csol 0c58c22ea5 sign 7 months ago
haroon amjad d87562caf5 updates 7 months ago
haroon amjad 3a649bca35 Merge branch 'master' into haroon_dev 7 months ago
aamir-csol 6f011880bd Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/authentication/authentication_view_model.dart
7 months ago
aamir-csol 70810fa14c signup completed 7 months ago
aamir-csol 8c55064158 signup completed 7 months ago
haroon amjad 1de551e799 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/features/authentication/authentication_view_model.dart
7 months ago
haroon amjad 28da6e0a2c updates 7 months ago
Sultan khan a5f64798e0 login fixes 7 months ago
Sultan khan 299c0b0e29 login flow complete 7 months ago
Sultan khan 58d33e2dae Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
7 months ago
Sultan khan 1466b6b71a no message 7 months ago
aamir-csol 7dcc827721 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
7 months ago
aamir-csol cd48d83c07 signup 7 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 7 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
7 months ago
Sultan khan 2a081e30b5 saved login done. 7 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 7 months ago
Sultan khan 9f0fb27baf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
7 months ago
aamir-csol c129eb2c2f Merge branch 'master' into dev_aamir 7 months ago
Sultan khan b4667f5c94 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
7 months ago
aamir-csol ffb399c704 fixes for signup 7 months ago
Sultan khan 075578602e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
7 months ago
Sultan khan a199ca040b quick login inprogress 7 months ago
aamir-csol 9b063ba764 fixes for signup 7 months ago
Haroon Amjad 003a161b52 custom chips implemented 7 months ago
haroon amjad 542de41a82 updates & fixes 7 months ago
haroon amjad 2d0fc11f05 updates 7 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
7 months ago
aamir-csol 484ab56a8e fixes for signup 7 months ago
Sultan khan ba2c8327fe login flow inprogress 7 months ago
aamir-csol 4e1912048d login flow completion 7 months ago
aamir-csol 52fddc5323 login flow completion 7 months ago
haroon amjad d794787459 updates 7 months ago
faizatflutter b15ddd1713 completed till otp receiving 7 months ago
faizatflutter 26f0ffda2c completed till otp receiving 7 months ago
faizatflutter db50bd8f23 Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart
7 months ago
faizatflutter 923f7d7781 completed till otp receiving 8 months ago
faizatflutter 84804a59a7 completed till otp receiving 8 months ago
aamir-csol 3855ba276f calender & signup fixes. 8 months ago
aamir-csol e41ffd583d changes 8 months ago
faizatflutter 3e50a3c89d Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart
8 months ago
faizatflutter 6e05ca15cf adding the login function 8 months ago
aamir-csol 85fac13314 changes 8 months ago