Commit Graph

649 Commits (a1aaa041d14c09b72e5fa66e2c854d52d9f1e30f)
 

Author SHA1 Message Date
faizatflutter a1aaa041d1 Water Intake Final Touches 3 weeks ago
faizatflutter fd2abbbc7b Water Intake Design completed 3 weeks ago
faizatflutter 94668997aa Updated design for HHC 1 month ago
Haroon6138 7d0a42fd32 Merge pull request 'haroon_dev' (#122) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/122
1 month ago
haroon amjad 450f07d39d updates & fixes 1 month ago
haroon amjad d8c7503c56 QLine API implementation enhancements 1 month ago
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 1 month ago
Haroon6138 345e2a1fca Merge pull request 'haroon_dev' (#120) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/120
1 month ago
haroon amjad fe294ae8f6 updates 1 month ago
haroon amjad bee4aafc44 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 3060c57201 updates 1 month ago
Haroon6138 ceeeea59e3 Merge pull request 'dev_sultan' (#119) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/119
1 month 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
1 month ago
haroon amjad f1004f39af Merge branch 'master' into haroon_dev 1 month ago
Haroon6138 4d745a3d15 Merge pull request 'dev_aamir' (#118) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/118
1 month 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
1 month ago
aamir-csol 335e6a6649 Health Calculators 1 month ago
haroon amjad eff6cbbaad updates & fixes 1 month ago
Haroon6138 c156d7f0aa Merge pull request 'haroon_dev' (#116) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/116
1 month ago
haroon amjad d202aa8423 Smartwatch integration started 1 month ago
Sultan khan 1d49308cc7 last appointment rated. 1 month ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
1 month ago
Haroon6138 79beaf6fb7 Merge pull request 'Completed User Info Selection and Symptoms Checker till getSymptomsByOrgans (faiz_dev)' (#114) from faiz_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/114
1 month ago
Sultan khan f28762a5c5 last appointment rated done. 1 month ago
faizatflutter 449c338c46 refactor 1 month ago
faizatflutter 5fd1905d8c Complete UserInfo Selection Module 1 month ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
1 month ago
faizatflutter fbe124f6ee Complete UserInfo Selection Module 1 month ago
haroon amjad 2f26e12fd3 update 1 month ago
faizatflutter cf26e71645 Complete USerInfo Selectoiun 1 month ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 1 month ago
faizatflutter c7c0a0ac09 Added user_info module IAP 1 month ago
haroon amjad c97a492244 Medical File page updates 1 month ago
Haroon6138 dd8f3b95a7 Merge pull request 'haroon_dev' (#112) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/112
1 month ago
haroon amjad 818534e9f6 Master merged 1 month ago
haroon amjad 7cdb30a364 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad a83a35a284 Services Page Revamp 1 month ago
Haroon6138 95325dad02 Merge pull request 'lab result added along with the available characters scroll bar' (#111) from lab-result-changes into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/111
1 month ago
tahaalam 2d2380851e loading view added 1 month ago
tahaalam 2125e30c23 Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
1 month ago
tahaalam 95243c250f graph shaded region added from horizontal spaces 1 month 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
1 month ago
Haroon6138 2061ace278 Merge pull request 'haroon_dev' (#110) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/110
1 month ago
faizatflutter 9410ad9b60 Refactoring 1 month ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 1 month ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 1 month ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 1 month ago
haroon amjad ca47315b2c Merge branch 'master' into haroon_dev 1 month ago
Haroon6138 df3b3bc26b Merge pull request 'dev_aamir' (#109) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/109
1 month 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
1 month ago