Commit Graph

110 Commits (c84564dafd92fb4e21ecfeb6fe3123f368f0394b)

Author SHA1 Message Date
faizatflutter 8ddfdeeac4 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/core/utils/date_util.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/widgets/common_bottom_sheet.dart
11 months ago
faizatflutter da579dfd09 CMC Module Completed 11 months ago
tahaalam 31261092a8 rrt request creation and history listing 11 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 11 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
11 months ago
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 11 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
11 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
11 months ago
tahaalam 5b0a8ad898 cancel and listing request added 11 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 11 months ago
haroon amjad 60bd9ee55a ER Online CheckIn implementation contd. 11 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 11 months ago
faizatflutter b698b74eb5 Design Updates 11 months ago
faizatflutter 8c956fc052 Design changes 12 months ago
faizatflutter 3e61df218b Some Minor design updated 12 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
12 months ago
faizatflutter 462f4eba14 Design Updates 12 months ago
faizatflutter eabfaf8182 Design Updates 12 months ago
tahaalam d480798053 location dennied forever handled and error builder added to the image network 12 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 12 months ago
aamir-csol aaa8222b1a Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/features/medical_file/medical_file_repo.dart
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
1 year ago
aamir-csol d918b6e464 family screen & widgets 1 year ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 1 year ago
haroon amjad f1a60a9dfb updates 1 year ago
tahaalam 61007302c9 appointment date filter handled 1 year ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 1 year ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 1 year ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 1 year ago
aamir-csol e5488299b8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
#	lib/widgets/common_bottom_sheet.dart
1 year ago
haroon amjad 6b28b57307 empty state implementation contd. 1 year ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 1 year ago
haroon amjad a07369165d Updates 1 year ago
aamir-csol 45a1ce9254 Merge branch 'master' into dev_aamir 1 year ago
Sikander Saleem 604e503e52 flow improvement & translation added. 1 year ago
aamir-csol 192d617350 family screen & widgets 1 year ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 year ago
aamir-csol 1125437a56 family screen & widgets 1 year ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 year ago
aamir-csol f9bfc131a8 family screen & widgets 1 year ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 1 year ago
aamir-csol a79dcad221 family screen & widgets 1 year ago
haroon amjad 3b5d2d27a4 Updates 1 year ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 1 year ago
Haroon6138 bfdc9752ae Merge pull request 'dev_aamir' (#45) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/45
1 year ago
Sikander Saleem 57827549b8 language switch added in drawer, and ui improvements 1 year ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 1 year ago
taha.alam 265d979b48 drilled the lat and lng parameter form viewmodel to the mapper 1 year ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 1 year ago
Sikander Saleem c00e69ef0c profile wallet linked with view model. 1 year 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
1 year ago