Commit Graph

661 Commits (b8ecb70aa24ce8d2666bf955a7f805ccd0ed925b)
 

Author SHA1 Message Date
haroon amjad b8ecb70aa2 Merge branch 'master' into haroon_dev 1 month ago
Haroon6138 cf51b95f84 Merge pull request 'dev_aamir' (#126) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/126
1 month ago
aamir-csol ada169f83f Health calculators & converters 1 month ago
aamir-csol c921228ad9 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/health_calculators/health_calculator_result.dart
1 month ago
aamir-csol f509a09b34 Health calculators & converters 1 month ago
Haroon6138 89d684d600 Merge pull request 'dev_sikander' (#125) from dev_sikander into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/125
1 month ago
Sikander Saleem 60f6fcfecb Merge branch 'refs/heads/master' into dev_sikander 1 month ago
Sikander Saleem edcab9d26d collapsing_list_view improvement 1 month ago
Haroon6138 4690537462 Merge pull request 'dev_sikander' (#124) from dev_sikander into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/124
1 month ago
Sikander Saleem 5191ffeb2c Merge branch 'refs/heads/master' into dev_sikander 1 month ago
Sikander Saleem a78769df67 collapsing_list_view improvement 1 month ago
haroon amjad 15f5eaf8e5 updates 1 month ago
haroon amjad 87fd9a42b7 Nearest Appointment selected 1 month ago
Haroon6138 3044b901c2 Merge pull request 'Updated design for HHC and few symptoms checker changes (faiz_dev)' (#123) from faiz_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/123
2 months ago
faizatflutter 94668997aa Updated design for HHC 2 months 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
2 months ago
haroon amjad 450f07d39d updates & fixes 2 months ago
haroon amjad d8c7503c56 QLine API implementation enhancements 2 months ago
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 2 months 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
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
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
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
haroon amjad f1004f39af Merge branch 'master' into haroon_dev 2 months 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
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
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
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
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
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
haroon amjad 2f26e12fd3 update 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
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
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
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
2 months ago