Commit Graph

198 Commits (0ae2b6c1a0b4fc3fbae32ff21763a1b02a3dbadd)

Author SHA1 Message Date
haroon amjad 8f428297cb Arabic translations added 6 months ago
haroon amjad a0008c9104 Nearest Appointment sorting fixed 6 months ago
haroon amjad 475a9b9acb Merge branch 'master' into haroon_dev 6 months ago
aamir-csol 6725ab028d doctor search filter design update & switch user bug fix. 6 months ago
haroon amjad e454c9c991 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
6 months ago
aamir-csol c11e859df1 search doctor by name filter. 6 months ago
haroon amjad 91c16f13d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
6 months ago
haroon amjad 1c0842ab95 updates 6 months ago
aamir-csol 83f04bc0e6 search filter on select doctor page. 6 months ago
aamir-csol c7e4018ddc Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
6 months ago
aamir-csol b815affe5c blood group 6 months ago
haroon amjad ede8844f19 Monthly Reports implemented 6 months ago
haroon amjad e9dd2f0648 updates 6 months ago
tahaalam f19d06512a filters changed in region selection bottom sheet 6 months ago
Sultan khan 449c693fdb Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
#	lib/presentation/book_appointment/laser/laser_appointment.dart
6 months ago
haroon amjad 162337b317 Added appointment nearest gate & floor 6 months ago
Sultan khan d55fe5e527 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 6 months ago
Sultan khan 0e26505692 covid page inprogress 6 months ago
aamir-csol 6c1707128b Merge branch 'master' into dev_aamir 6 months ago
aamir-csol 3601e39a29 Health calculators & converters 6 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
6 months ago
Sultan khan 873b2a1591 sorting done, covid inprogress 6 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
6 months ago
aamir-csol 135b05e561 Health calculators & converters 6 months ago
haroon amjad f886357bcd updates 6 months ago
haroon amjad b8ecb70aa2 Merge branch 'master' into haroon_dev 6 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
6 months ago
aamir-csol f509a09b34 Health calculators & converters 6 months ago
haroon amjad 15f5eaf8e5 updates 6 months ago
haroon amjad 87fd9a42b7 Nearest Appointment selected 6 months ago
haroon amjad 450f07d39d updates & fixes 6 months ago
haroon amjad a80410d64b LiveCare flow from clinic selection implemented 6 months ago
haroon amjad 3060c57201 updates 6 months ago
haroon amjad d202aa8423 Smartwatch integration started 7 months ago
haroon amjad ff98262cf7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
7 months ago
haroon amjad 796aeb03d3 Ancillary order fixes, QLine API integrated & other enhancements 7 months ago
faizatflutter c7c0a0ac09 Added user_info module IAP 7 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
7 months ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 7 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 7 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
7 months ago
haroon amjad 581a4a5a74 WalkIn Appointment implementation done 7 months ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 7 months ago
haroon amjad 36bf63dcde Incoming call updates 7 months ago
haroon amjad 1e5744cf44 Updates & enhancements 7 months ago
faizatflutter 757ace2ba1 Added Organ Selector 7 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 7 months ago
haroon amjad fee84a2928 Nearest appointment implemented 7 months ago
Haroon Amjad 73b05276f6 Feedback page implementation contd. 7 months ago
haroon amjad f9f17f3a76 LiveChat implemented 7 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 8 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
8 months ago
faizatflutter b698b74eb5 Design Updates 8 months ago
haroon amjad 65220270c2 Size utils & fixes 9 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
9 months ago
faizatflutter eabfaf8182 Design Updates 9 months ago
haroon amjad d693850ef4 ER services implementation contd. 9 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 9 months ago
tahaalam ea92a0c75c laser appointment screen added 9 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 9 months ago
haroon amjad d220be7283 Tamara payment flow done 9 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 9 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
9 months ago
haroon amjad b05e4e2a15 Dental appointment booking flow implementation contd. 9 months ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 9 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 9 months ago
tahaalam 35e145ddf9 id selection from the appropiate list 9 months ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
9 months ago
haroon amjad 903248133e Lab order & results enhancements 9 months ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 9 months ago
haroon amjad db979977ca Tamara implementation & enhancements 9 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
9 months ago
haroon amjad 5e000db556 updates 9 months ago
tahaalam 786aa05b19 doctor list handled to be cleared when going back 9 months ago
tahaalam a4a32cca44 doctor filter icon removed from the doctor listing from clininc 9 months ago
tahaalam 6ef9ae813d doctors search filter added 9 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 9 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 9 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 9 months ago
haroon amjad 6b28b57307 empty state implementation contd. 9 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 9 months ago
haroon amjad 918eb18b5f Region flow in select clinic implemented 9 months ago
haroon amjad a07369165d Updates 9 months ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 9 months ago
haroon amjad a711d3a6dd LiveCare shcedule implementation contd. 9 months ago
taha.alam 7093a26cb8 selection region arabic handling 9 months ago
haroon amjad 836a72ec22 App directionality changes 9 months ago
Haroon Amjad bdde6c224d Merge branch 'master' into haroon_dev 9 months ago
haroon amjad 3b5d2d27a4 Updates 9 months ago
taha.alam 3fdd17ccaa code added to get the location for gms hms and iphone. fallback added if the last known location is null. 9 months ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 9 months ago
taha.alam 788887a7f1 Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart
9 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 9 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 9 months ago
Haroon Amjad 2aa84e0334 book appointment implementation contd. 9 months ago
haroon amjad 6f745f3666 calendar implementation contd. 10 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 10 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 10 months ago