Commit Graph

54 Commits (2ffd4cc1aec8f9c6a592d2e22f80dca056dda71b)

Author SHA1 Message Date
haroon amjad 581a4a5a74 WalkIn Appointment implementation done 1 month ago
faizatflutter 95bd2a2a7e CMC Tweaks Completed 2 months ago
tahaalam 53be50b40c Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/appointments/widgets/appointment_doctor_card.dart
#	lib/widgets/common_bottom_sheet.dart
2 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
2 months ago
tahaalam a669265076 Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart
#	lib/main.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/type_selection_widget.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/widgets/input_widget.dart
2 months ago
haroon amjad 14f57027f4 Eye measurements done 2 months ago
haroon amjad c600b0ee7a Ask doctor implemented 2 months ago
haroon amjad 21b7b32013 Ask doctor implementation contd. 2 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 2 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 2 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
3 months ago
faizatflutter 462f4eba14 Design Updates 3 months ago
haroon amjad 4b52862ba0 updates 3 months ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
3 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 3 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 3 months ago
tahaalam ea92a0c75c laser appointment screen added 3 months ago
haroon amjad 663eda0076 updates & fixes 3 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
3 months ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 3 months ago
haroon amjad f1a60a9dfb updates 3 months ago
tahaalam 61007302c9 appointment date filter handled 3 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
3 months ago
tahaalam 6cf08c04d2 appointment filters added. 3 months ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
3 months ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 3 months ago
haroon amjad db979977ca Tamara implementation & enhancements 3 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 4 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 4 months ago
haroon amjad 918eb18b5f Region flow in select clinic implemented 4 months ago
haroon amjad a07369165d Updates 4 months ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 4 months ago
taha.alam 7093a26cb8 selection region arabic handling 4 months ago
haroon amjad 3b5d2d27a4 Updates 4 months ago
taha.alam 55c51f5742 Merge remote-tracking branch 'origin/master' into feature/search_by_region 4 months ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 4 months ago
haroon amjad 3ab2546d10 merge fixes 4 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
4 months ago
haroon amjad 5de5fc8be9 updates 4 months ago
taha.alam de6e0e3704 data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo 4 months ago
taha.alam ea2d2bf40f retaining the old data. 4 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 4 months ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 4 months ago
Haroon Amjad b240293064 medical file implementation contd. 4 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 4 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 4 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 4 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 4 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 4 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 4 months ago