Commit Graph

65 Commits (e3f5bb69accf1bdbd6f88645c68254f989d4a53c)

Author SHA1 Message Date
haroon amjad e3f5bb69ac Updates 1 day ago
haroon amjad 081dfce480 Merge branch 'master' into haroon_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/widgets/location_input_bottom_sheet.dart
#	lib/widgets/input_widget.dart
2 days ago
Sultan khan 0d4563542a WD:map issues resolved:
1. map type added to the screen along with the translation
2. null shown for the arabic name of the fixed to show the actual name.
3. if the user opens the locationBottomsheet and close it without input of the area the screen freezes with no action on the location.
4. Gms And Hms Maps handled.
5. theme handled inside the maps screen.
2 days ago
haroon amjad 89a1da4407 Updates 2 days ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 2 days ago
haroon amjad 1fa03fff5e updates 3 days ago
haroon amjad 3d39190c62 updates & fixes 3 days ago
haroon amjad 04cbb3db40 no message 4 days ago
tahaalam 7135800552 should flip value changed 4 days ago
tahaalam a2fa661db4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
4 days ago
tahaalam 8a11cc03cb pickup direction bottom sheet added and previous radio bottom sheet removed 4 days ago
haroon amjad 93af246700 updates 5 days ago
haroon amjad a13d0cf0e4 updates 7 days ago
haroon amjad 837a934d0d updates 1 week ago
haroon amjad 841fca027c updates 1 week ago
haroon amjad 4a3d66f01a Updates 2 weeks ago
haroon amjad 29447cc9fa updates 4 weeks ago
haroon amjad f46b3f745f Dark mode enabled 1 month ago
haroon amjad dc0e4e5eb6 Updates & fixes, Filter issues fixed for lab & rad 2 months ago
haroon amjad 05b6d02e4c Updates & fixes 2 months ago
haroon amjad 5015747580 LiveCare changes 2 months ago
haroon amjad 85ccf41d04 Updates & fixes for Habib Wallet, Insurance update, Immediate LiveCare 2 months ago
haroon amjad 5c684a6a0d Doctor Rating details implemented 2 months ago
haroon amjad cfd0c16738 updates & fixes 2 months ago
haroon amjad 87422e8e05 translation updates 3 months ago
haroon amjad 169215fd7b translation changes 3 months ago
aamir-csol 135b05e561 Health calculators & converters 3 months ago
faizatflutter c7c0a0ac09 Added user_info module IAP 4 months ago
faizatflutter e35fe9ac05 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
4 months ago
faizatflutter 757ace2ba1 Added Organ Selector 4 months ago
Sultan khan a4d3bb3533 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan fb69723a65 e-referral done. 4 months ago
tahaalam 5983caf83a single map screen added to the project for multiple place usage 5 months ago
haroon amjad eb9c38729b Prescription delivery implementation contd. 5 months ago
haroon amjad 63d844a5e9 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/features/radiology/radiology_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
#	lib/presentation/emergency_services/history/widget/rrt_item.dart
5 months ago
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
5 months ago
tahaalam 0e1a643c93 padding added to rrt screen 5 months ago
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
5 months ago
tahaalam 8f46dddbd6 terms and condition added to the rrt module. 5 months ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 5 months ago
faizatflutter da579dfd09 CMC Module Completed 5 months ago
faizatflutter 3331edc10d Comprehensive checkup Completed 5 months ago
haroon amjad a4e55cb6df fixes 5 months ago
tahaalam 31261092a8 rrt request creation and history listing 5 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 5 months ago
tahaalam fbe5d35013 merge issues resolve for the ambulance request. 5 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
5 months ago
tahaalam 5b0a8ad898 cancel and listing request added 5 months ago
haroon amjad 9a48421271 ER Online Check-In implemented 5 months ago
Haroon Amjad cc1e073f6d ER Online CheckIn implementation contd. 5 months ago