Commit Graph

1143 Commits (2d7aa5d80db53fba809bd4e341f5b4dce42e12de)
 

Author SHA1 Message Date
haroon amjad 3cc2610d30 updates 10 months ago
haroon amjad f886357bcd updates 10 months ago
Fatimah.Alshammari f3674ba06f Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/routes/app_routes.dart
10 months ago
Fatimah.Alshammari a53602dc8c added monthly report 10 months ago
Fatimah.Alshammari 7a03242396 added monthly report 10 months ago
Sultan khan 40638cfec4 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:
  collapsing_list_view improvement
  Updated design for HHC
  updates & fixes
  QLine API implementation enhancements
  LiveCare flow from clinic selection implemented

# Conflicts:
#	lib/presentation/home/landing_page.dart
10 months ago
Fatimah.Alshammari 68f044de52 added monthly report 10 months ago
faizatflutter fd2abbbc7b Water Intake Design completed 10 months ago
haroon amjad 5581346a2d updates 10 months ago
haroon amjad b8ecb70aa2 Merge branch 'master' into haroon_dev 10 months 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
10 months ago
haroon amjad 575a534f5e PenguinIn fixes 10 months ago
aamir-csol ada169f83f Health calculators & converters 10 months 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
10 months ago
aamir-csol f509a09b34 Health calculators & converters 10 months 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
10 months ago
Sikander Saleem 60f6fcfecb Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem edcab9d26d collapsing_list_view improvement 10 months 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
10 months ago
Sikander Saleem 5191ffeb2c Merge branch 'refs/heads/master' into dev_sikander 10 months ago
Sikander Saleem a78769df67 collapsing_list_view improvement 10 months ago
haroon amjad 15f5eaf8e5 updates 10 months ago
haroon amjad 87fd9a42b7 Nearest Appointment selected 10 months 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
10 months ago
faizatflutter 94668997aa Updated design for HHC 10 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
10 months ago
haroon amjad 450f07d39d updates & fixes 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
Fatimah.Alshammari c9de23347a fix error 10 months ago
Fatimah.Alshammari 190492a191 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/routes/app_routes.dart
10 months ago
Sultan khan d28c94606b 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:
  updates
  updates
  updates & fixes
10 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
10 months ago
Sultan khan 68e1b116f9 last rated updated. 10 months ago
haroon amjad fe294ae8f6 updates 10 months ago
haroon amjad bee4aafc44 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 3060c57201 updates 10 months ago
Fatimah.Alshammari 3d8daeb58d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/core/utils/calendar_utils.dart
#	lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
#	lib/main.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/hmg_services/services_view.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/theme/colors.dart
#	pubspec.yaml
10 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
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
Fatimah.Alshammari 0b3fea230f monthly report 10 months ago
haroon amjad f1004f39af Merge branch 'master' into haroon_dev 10 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
10 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
10 months ago
aamir-csol 335e6a6649 Health Calculators 10 months ago
haroon amjad eff6cbbaad updates & fixes 10 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
10 months ago
haroon amjad d202aa8423 Smartwatch integration started 10 months ago
Sultan khan 1d49308cc7 last appointment rated. 10 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
10 months ago