Commit Graph

77 Commits (main)

Author SHA1 Message Date
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
tahaalam 773cc9229b Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
10 months ago
tahaalam cc458b2ec7 files and packages renamed 10 months ago
tahaalam 81a6c7d034 files and packages renamed 10 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 10 months ago
Haroon6138 084efb7d32 Merge pull request 'lab severity values handled and size of lab description fixed' (#80) from feature/lab_result into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/80
10 months ago
tahaalam ab74a61969 lab severity values handled and size of lab description fixed 10 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 10 months ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad f1a60a9dfb updates 10 months ago
tahaalam e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR 10 months ago
haroon amjad c0606fb530 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/lab/lab_orders_page.dart
10 months ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 10 months ago
tahaalam 483a1571d9 Merge remote-tracking branch 'origin/master' into appointment_filter
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
10 months ago
tahaalam 6cf08c04d2 appointment filters added. 10 months ago
haroon amjad 903248133e Lab order & results enhancements 10 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 10 months ago
haroon amjad db979977ca Tamara implementation & enhancements 10 months ago
tahaalam 36bf229787 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
10 months ago
tahaalam 2e9a462a1c listing resizing if the data is in small numbers. 10 months ago
tahaalam da89c41925 lab result by hospital and translations are added 10 months ago
faizatflutter 4cc4a7b0d9 merged main 10 months ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
10 months ago
tahaalam 048f0bb459 graph design change 10 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
10 months ago
tahaalam b05b03a6f6 divider changed 10 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 10 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 11 months ago