Commit Graph

126 Commits (a2fde1ddebbdf07c006ba40faabbec3769b0e47a)

Author SHA1 Message Date
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
tahaalam 5b0a8ad898 cancel and listing request added 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
haroon amjad 9a48421271 ER Online Check-In implemented 2 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 2 months ago
Haroon Amjad cc1e073f6d ER Online CheckIn implementation contd. 2 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 2 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
2 months ago
haroon amjad 8dcc8dfbe3 updates 2 months ago
faizatflutter f96f3e563c Fixed App CustomChip 2 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
2 months ago
faizatflutter b698b74eb5 Design Updates 2 months ago
Haroon Amjad 2e16622cc3 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/size_utils.dart
#	lib/presentation/home/widgets/large_service_card.dart
3 months ago
faizatflutter 8c956fc052 Design changes 3 months ago
haroon amjad 65220270c2 Size utils & fixes 3 months ago
faizatflutter 72d765e508 Design Updates 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 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 3 months ago
haroon amjad f1a60a9dfb updates 3 months ago
haroon amjad d220be7283 Tamara payment flow done 3 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 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
tahaalam 35e145ddf9 id selection from the appropiate list 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 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
3 months ago
tahaalam 6ef9ae813d doctors search filter added 4 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 4 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 4 months ago
haroon amjad 093e645f60 request medical report implementation completed. 4 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 4 months ago
haroon amjad 6b28b57307 empty state implementation contd. 4 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 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
taha.alam 27a0632d6d directional padding and alignment 4 months ago
haroon amjad 836a72ec22 App directionality changes 4 months ago
haroon amjad 97038f1a25 advance payment implementation done for self & other file number 4 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 4 months ago
Haroon Amjad bdde6c224d Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 3b5d2d27a4 Updates 4 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. 4 months ago
haroon amjad 5e81ba1ed8 updates 4 months ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 4 months ago
taha.alam de6e0e3704 data from MyAppointmentViewmodel and MyAppointmentRepo migrated to bookappointment viewmodel and repo 4 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
4 months ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 4 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 4 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 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 9fbb8c3418 updates 4 months ago
haroon amjad 41ca0e27d9 updates 4 months ago
haroon amjad 28da6e0a2c updates 4 months ago
haroon amjad 4269e99be9 updates 4 months ago
haroon amjad ccd29f0cf9 updates 4 months ago
Haroon Amjad 6b2ec5aa2c updates, fixes & service privileges 4 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 4 months ago
haroon amjad 851bd569b4 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/presentation/prescriptions/prescription_detail_page.dart
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 003a161b52 custom chips implemented 4 months ago
haroon amjad f8be788a60 updates & fixes 4 months ago
Sultan khan 7d5b941df3 merged conflict 4 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 4 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 4 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 4 months ago