Commit Graph

109 Commits (91876f2b6bdde08fbc2bf125bbfc5c3e6dc80780)

Author SHA1 Message Date
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 6 months ago
faizatflutter 757ace2ba1 Added Organ Selector 7 months ago
Fatimah.Alshammari 89ff10f506 Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/theme/colors.dart
7 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 7 months ago
Fatimah.Alshammari 8191852f4d Merge branch 'refs/heads/master' into fatima
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
7 months ago
Fatimah.Alshammari eae16eec44 active medication 7 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
7 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
7 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
7 months ago
haroon amjad 2a6c7fc0a1 Find us implemented 7 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 7 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 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 eabfaf8182 Design Updates 8 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 8 months ago
haroon amjad f1a60a9dfb updates 9 months ago
tahaalam 6cf08c04d2 appointment filters added. 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
tahaalam 6ef9ae813d doctors search filter added 9 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 9 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 9 months ago
taha.alam 7093a26cb8 selection region arabic handling 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
aamir-csol fbd6ef0cf8 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart
9 months ago
aamir-csol 4e17ff9c82 otp screen & register Uae & resend Activation Code. 9 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 9 months ago
Sikander Saleem a25f42a43d Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	pubspec.yaml
9 months ago
Sikander Saleem e17d207ce5 swiper carousal view added in profile settings 9 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 9 months ago
Haroon Amjad b240293064 medical file implementation contd. 9 months ago
haroon amjad ccd29f0cf9 updates 9 months ago
Sultan khan 384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart
9 months ago
Sultan khan ba2c8327fe login flow inprogress 9 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 9 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 10 months ago
faizatflutter db50bd8f23 Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart
10 months ago
faizatflutter 84804a59a7 completed till otp receiving 10 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 10 months ago
faizatflutter 3e50a3c89d Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart
10 months ago
faizatflutter 32fadb8ad9 completed login function 10 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 10 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 10 months ago
Haroon Amjad a77fc49c68 lab result changes 10 months ago
haroon amjad e044fc8c5e lab implementation contd. 10 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 10 months ago
faizatflutter 89e9323d9e merged master and updated structure 10 months ago
faizatflutter e2b0930dd1 Merge branch 'master' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/core/app_state.dart
#	lib/main.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/home/landing_page.dart
#	pubspec.yaml
10 months ago
Haroon Amjad 0a39a00df5 Landing page updates 10 months ago
Sultan khan d3aff9f93d updating structure 10 months ago
Sultan khan cbfb381615 Merge branch 'faiz_dev' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/main.dart
#	lib/routes/app_routes.dart
#	pubspec.lock
10 months ago
Faiz Hashmi 357cf4392e Updated architecture 10 months ago
aamir-csol 4e3ba99280 widgets & fixes 10 months ago
Faiz Hashmi d65dc4ea89 initial commit 10 months ago
Haroon Amjad c65d44ae4d updates 10 months ago
Haroon Amjad 2293db00ea updates 10 months ago
Haroon Amjad b6766654e0 initial commit 10 months ago