Commit Graph

104 Commits (reminer)

Author SHA1 Message Date
tahaalam 2babda2d63 Merge remote-tracking branch 'origin/master' into labs_graph_pdf 4 months ago
haroon amjad d4ed2b47bc updates 4 months ago
tahaalam 1d1c756412 graph values fix and comparision with the pdf 4 months ago
haroon amjad 1709b80e84 Updates 4 months ago
haroon amjad 4a3d66f01a Updates 4 months ago
haroon amjad d053f58b7d Updates 4 months ago
Haroon Amjad 55b8bc162c Updates 5 months ago
haroon amjad 08928ddd28 Habib Wallet updates 5 months ago
Haroon Amjad 657f886391 Changes for AI Lab analysis 5 months ago
haroon amjad 1a68ffd500 Updates 5 months ago
haroon amjad 47b50e35a1 updates 5 months ago
haroon amjad 29447cc9fa updates 5 months ago
haroon amjad 5b04a5a3ea lab test description update 5 months ago
haroon amjad f46b3f745f Dark mode enabled 5 months ago
Haroon Amjad c2028841c5 test description issue in lab results fixed 6 months ago
haroon amjad dc0e4e5eb6 Updates & fixes, Filter issues fixed for lab & rad 6 months ago
haroon amjad 05b6d02e4c Updates & fixes 6 months ago
haroon amjad 2e1f4e87e0 AI Lab Analysis updates 6 months ago
haroon amjad 01c21377aa Updates & fixes 6 months ago
aamir-csol a105d87241 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
6 months ago
aamir-csol 2c7f4ddc48 Ai Analysis & PMA-(1078,1079) 6 months ago
haroon amjad b309342cdc lab fixes 6 months ago
Sikander Saleem 2648f304f6 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/data/landing_page_data.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
7 months ago
haroon amjad f54ce71177 translation changes 7 months ago
Sikander Saleem e38892ff2d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/habib_wallet_page.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/habib_wallet_card.dart
#	lib/presentation/insurance/insurance_home_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/appbar/collapsing_list_view.dart
7 months ago
haroon amjad 3ff9628cd3 Translation updates 7 months ago
Sikander Saleem 77a04e637e UI/UX improvements. 7 months ago
haroon amjad e9590a15d3 updates & fixes 7 months ago
Sultan khan 6ceee6973f 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:
  sickleave fix
  Health calculators & converters
  updates
  updates
  updates
  updates
  Nearest Appointment selected

# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
7 months ago
Sultan khan 873b2a1591 sorting done, covid inprogress 7 months ago
aamir-csol 54f8391066 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
7 months ago
aamir-csol 135b05e561 Health calculators & converters 7 months ago
Sultan khan 366429f083 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:
  Health calculators & converters
  Health calculators & converters
  collapsing_list_view improvement

# Conflicts:
#	lib/widgets/appbar/collapsing_list_view.dart
7 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
8 months ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
8 months ago
haroon amjad 818534e9f6 Master merged 8 months ago
tahaalam 2d2380851e loading view added 8 months ago
tahaalam 2125e30c23 Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
8 months ago
tahaalam 95243c250f graph shaded region added from horizontal spaces 8 months ago
faizatflutter e35fe9ac05 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
8 months ago
tahaalam ac15ab26f5 graph changes for high and low 8 months ago
haroon amjad 36bf63dcde Incoming call updates 8 months ago
haroon amjad 1e5744cf44 Updates & enhancements 8 months ago
faizatflutter acb6d31ff3 Added possible conditions screen 8 months ago
haroon amjad ffca4317aa updates 9 months ago
haroon amjad f9f17f3a76 LiveChat implemented 9 months ago
faizatflutter eabfaf8182 Design Updates 10 months ago
haroon amjad 0441d072fa Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart
10 months ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 10 months ago
haroon amjad 5e1a7652be lab report download implemented 10 months ago