Commit Graph

87 Commits (1656ca58c1a1e9f1d4d223308d8c815bc3ea7d31)

Author SHA1 Message Date
haroon amjad ede8844f19 Monthly Reports implemented 7 months ago
haroon amjad e9dd2f0648 updates 7 months ago
tahaalam f19d06512a filters changed in region selection bottom sheet 7 months ago
Sultan khan 449c693fdb Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
#	lib/presentation/book_appointment/laser/laser_appointment.dart
7 months ago
haroon amjad 162337b317 Added appointment nearest gate & floor 7 months ago
Sultan khan d55fe5e527 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 7 months ago
Sultan khan 0e26505692 covid page inprogress 7 months ago
aamir-csol 6c1707128b Merge branch 'master' into dev_aamir 7 months ago
aamir-csol 3601e39a29 Health calculators & converters 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
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
aamir-csol 135b05e561 Health calculators & converters 7 months ago
haroon amjad f886357bcd updates 7 months ago
haroon amjad b8ecb70aa2 Merge branch 'master' into haroon_dev 8 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
8 months ago
aamir-csol f509a09b34 Health calculators & converters 8 months ago
haroon amjad 15f5eaf8e5 updates 8 months ago
haroon amjad 87fd9a42b7 Nearest Appointment selected 8 months ago
haroon amjad 450f07d39d updates & fixes 8 months ago
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 8 months ago
haroon amjad 3060c57201 updates 8 months ago
haroon amjad d202aa8423 Smartwatch integration started 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
faizatflutter c7c0a0ac09 Added user_info module IAP 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
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 8 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 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
haroon amjad 581a4a5a74 WalkIn Appointment implementation done 8 months ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 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 9fd7f71a34 prescription delivery implementation contd 8 months ago
haroon amjad fee84a2928 Nearest appointment implemented 8 months ago
Haroon Amjad 73b05276f6 Feedback page implementation contd. 9 months ago
haroon amjad f9f17f3a76 LiveChat implemented 9 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 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
faizatflutter b698b74eb5 Design Updates 9 months ago
haroon amjad 65220270c2 Size utils & fixes 10 months ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
10 months ago
faizatflutter eabfaf8182 Design Updates 10 months ago
haroon amjad d693850ef4 ER services implementation contd. 10 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 10 months ago
tahaalam ea92a0c75c laser appointment screen added 10 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 10 months ago
haroon amjad d220be7283 Tamara payment flow done 10 months ago