Commit Graph

49 Commits (7d64f782462cb429faebd93f4389588bde51b78f)

Author SHA1 Message Date
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
7 months ago
haroon amjad 14f57027f4 Eye measurements done 7 months ago
haroon amjad c600b0ee7a Ask doctor implemented 7 months ago
haroon amjad 21b7b32013 Ask doctor implementation contd. 7 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 7 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
8 months ago
faizatflutter 462f4eba14 Design Updates 8 months ago
haroon amjad 4b52862ba0 updates 8 months ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
8 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 8 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 8 months ago
tahaalam ea92a0c75c laser appointment screen added 8 months ago
haroon amjad 663eda0076 updates & fixes 8 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
9 months ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 9 months ago
haroon amjad f1a60a9dfb updates 9 months ago
tahaalam 61007302c9 appointment date filter handled 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
tahaalam 6cf08c04d2 appointment filters added. 9 months ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
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 8bb0e495cc request medical report 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
taha.alam 7093a26cb8 selection region arabic handling 9 months ago
haroon amjad 3b5d2d27a4 Updates 9 months ago
taha.alam 55c51f5742 Merge remote-tracking branch 'origin/master' into feature/search_by_region 9 months ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 9 months ago
haroon amjad 3ab2546d10 merge fixes 9 months ago
haroon amjad 05cf451181 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New
# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
9 months ago
haroon amjad 5de5fc8be9 updates 9 months ago
taha.alam de6e0e3704 data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo 9 months ago
taha.alam ea2d2bf40f retaining the old data. 9 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 9 months ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 9 months ago
Haroon Amjad b240293064 medical file implementation contd. 9 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 9 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 9 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 9 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 9 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 9 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 9 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 10 months ago
Sultan khan d3aff9f93d updating structure 10 months ago
Faiz Hashmi 357cf4392e Updated architecture 10 months ago
Faiz Hashmi d65dc4ea89 initial commit 10 months ago