Commit Graph

100 Commits (597579e6778d98de2b1a2edc11493e94868d3bc8)

Author SHA1 Message Date
haroon amjad b353de3cf8 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_doctor_page.dart
#	lib/presentation/book_appointment/widgets/doctor_card.dart
7 months ago
haroon amjad dcdd17f0e9 sickleave fix 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
haroon amjad 450f07d39d updates & fixes 8 months ago
haroon amjad d8c7503c56 QLine API implementation enhancements 8 months ago
haroon amjad 3060c57201 updates 8 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
8 months ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 8 months ago
haroon amjad c97a492244 Medical File page updates 8 months 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
8 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 8 months ago
haroon amjad ca47315b2c Merge branch 'master' into haroon_dev 8 months 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
8 months ago
aamir-csol d256eec392 medical file changes 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
aamir-csol 19365375f6 medical file changes 8 months ago
haroon amjad 3185d1e9e7 Allergies list implemented 8 months ago
haroon amjad 36bf63dcde Incoming call updates 8 months ago
haroon amjad 1e5744cf44 Updates & enhancements 8 months ago
faizatflutter 757ace2ba1 Added Organ Selector 8 months ago
haroon amjad f142ff90be updates 8 months ago
haroon amjad 07a3052b8e appointment prescription implemented 9 months ago
haroon amjad 63d844a5e9 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/features/radiology/radiology_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
#	lib/presentation/emergency_services/history/widget/rrt_item.dart
9 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 9 months ago
haroon amjad ffca4317aa updates 9 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 9 months ago
haroon amjad f9f17f3a76 LiveChat implemented 9 months ago
faizatflutter 617b68021a Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/appointments/appointment_payment_page.dart
9 months ago
haroon amjad 14f57027f4 Eye measurements done 9 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 9 months ago
haroon amjad d3a8d545b2 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
9 months ago
haroon amjad 8dcc8dfbe3 updates 9 months ago
faizatflutter f96f3e563c Fixed App CustomChip 9 months ago
haroon amjad 8976f4db9d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/medical_file/medical_file_page.dart
9 months ago
haroon amjad 2160f87c59 updates 9 months ago
faizatflutter b698b74eb5 Design Updates 9 months ago
faizatflutter 8c956fc052 Design changes 10 months ago
faizatflutter 72d765e508 Design Updates 10 months ago
faizatflutter 462f4eba14 Design Updates 10 months ago
faizatflutter eabfaf8182 Design Updates 10 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 10 months ago
haroon amjad 663eda0076 updates & fixes 10 months ago
haroon amjad b27e3268b1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
10 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 10 months ago
aamir-csol 24362f67cb family screen & widgets 10 months ago
aamir-csol aaa8222b1a Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/features/medical_file/medical_file_repo.dart
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
10 months ago
aamir-csol d918b6e464 family screen & widgets 10 months ago
haroon amjad db979977ca Tamara implementation & enhancements 10 months ago