diff --git a/src/lib/server/booking/rideShare/getRideShareInfo.ts b/src/lib/server/booking/rideShare/getRideShareInfo.ts index 91f7549f..e9f314e1 100644 --- a/src/lib/server/booking/rideShare/getRideShareInfo.ts +++ b/src/lib/server/booking/rideShare/getRideShareInfo.ts @@ -19,6 +19,7 @@ export async function getRideShareInfo(tourId: number, extended: boolean) { 'rideShareVehicle.licensePlate', 'rideShareVehicle.color', 'rideShareVehicle.picture', + 'rideShareRequest.passengers', eb .selectFrom('rideShareRating') .innerJoin('request', 'rideShareRating.request', 'request.id') diff --git a/src/lib/server/booking/rideShare/getRideShareToursAsItinerary.ts b/src/lib/server/booking/rideShare/getRideShareToursAsItinerary.ts index cb223781..c90d9300 100644 --- a/src/lib/server/booking/rideShare/getRideShareToursAsItinerary.ts +++ b/src/lib/server/booking/rideShare/getRideShareToursAsItinerary.ts @@ -29,6 +29,7 @@ export async function getRideshareToursAsItinerary( id: number; averageRatingCustomer: string | number | null; requestCancelled: boolean; + passengers: number; }[]; licensePlate: string | undefined | null; }[]; @@ -59,6 +60,7 @@ export async function getRideshareToursAsItinerary( 'user.email', 'user.profilePicture', 'request.cancelled as requestCancelled', + 'request.passengers', jsonArrayFrom( eb .selectFrom('event') @@ -163,7 +165,8 @@ export async function getRideshareToursAsItinerary( pending: r.pending, id: r.id, averageRatingCustomer: r.averageRatingCustomer, - requestCancelled: r.requestCancelled + requestCancelled: r.requestCancelled, + passengers: r.passengers }; }); const events = journey.requests diff --git a/src/lib/ui/ProfileBadge.svelte b/src/lib/ui/ProfileBadge.svelte index 447aafe2..2919b9d1 100644 --- a/src/lib/ui/ProfileBadge.svelte +++ b/src/lib/ui/ProfileBadge.svelte @@ -9,7 +9,8 @@ profilePicture, gender, smokingAllowed, - averageRating + averageRating, + numberPassengers }: { isCustomer: boolean; firstName: string; @@ -18,6 +19,7 @@ gender: string | null; smokingAllowed: boolean | undefined; averageRating: string | number | null; + numberPassengers: number | null; } = $props(); @@ -33,6 +35,9 @@ {firstName || name} {t.account.genderShort(gender || 'n')} + {#if numberPassengers !== null} +

{t.booking.passengerNumber + ': ' + numberPassengers}

+ {/if}
{#if smokingAllowed} diff --git a/src/routes/(customer)/ride-offers/[slug]/+page.svelte b/src/routes/(customer)/ride-offers/[slug]/+page.svelte index 5e987b09..fb9bc4c1 100644 --- a/src/routes/(customer)/ride-offers/[slug]/+page.svelte +++ b/src/routes/(customer)/ride-offers/[slug]/+page.svelte @@ -126,6 +126,7 @@ profilePicture={n.profilePicture} smokingAllowed={undefined} averageRating={n.averageRatingCustomer} + numberPassengers={n.passengers} />
{t.account.email}:{n.email} diff --git a/src/routes/(customer)/routing/ConnectionDetail.svelte b/src/routes/(customer)/routing/ConnectionDetail.svelte index 71d6534f..96f39aef 100644 --- a/src/routes/(customer)/routing/ConnectionDetail.svelte +++ b/src/routes/(customer)/routing/ConnectionDetail.svelte @@ -136,6 +136,7 @@ profilePicture={tourInfo.profilePicture} smokingAllowed={tourInfo.smokingAllowed} averageRating={tourInfo.averageRatingProvider} + numberPassengers={tourInfo.passengers} /> {#if tourInfo.picture || tourInfo.color} diff --git a/vite.config.ts b/vite.config.ts index ee947f79..809e4398 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -5,8 +5,8 @@ export default defineConfig({ plugins: [sveltekit()], test: { - include: ['src/**/*.{test,spec}.{js,ts}'], testTimeout: 70_000, + include: ['src/**/*.{test,spec}.{js,ts}'], poolOptions: { threads: { maxThreads: 1,