Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib/server/booking/rideShare/getRideShareInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export async function getRideshareToursAsItinerary(
id: number;
averageRatingCustomer: string | number | null;
requestCancelled: boolean;
passengers: number;
}[];
licensePlate: string | undefined | null;
}[];
Expand Down Expand Up @@ -59,6 +60,7 @@ export async function getRideshareToursAsItinerary(
'user.email',
'user.profilePicture',
'request.cancelled as requestCancelled',
'request.passengers',
jsonArrayFrom(
eb
.selectFrom('event')
Expand Down Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion src/lib/ui/ProfileBadge.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
profilePicture,
gender,
smokingAllowed,
averageRating
averageRating,
numberPassengers
}: {
isCustomer: boolean;
firstName: string;
Expand All @@ -18,6 +19,7 @@
gender: string | null;
smokingAllowed: boolean | undefined;
averageRating: string | number | null;
numberPassengers: number | null;
} = $props();
</script>

Expand All @@ -33,6 +35,9 @@
{firstName || name}
{t.account.genderShort(gender || 'n')}
</h3>
{#if numberPassengers !== null}
<h2>{t.booking.passengerNumber + ': ' + numberPassengers}</h2>
{/if}
<div class="flex flex-row items-center gap-1">
{#if smokingAllowed}
<CigaretteIcon class="mr-4" />
Expand Down
1 change: 1 addition & 0 deletions src/routes/(customer)/ride-offers/[slug]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
profilePicture={n.profilePicture}
smokingAllowed={undefined}
averageRating={n.averageRatingCustomer}
numberPassengers={n.passengers}
/>
<div class="grid grid-cols-[max-content_auto] gap-x-2">
<span>{t.account.email}:</span><span><a href="mailto:{n.email}">{n.email}</a></span>
Expand Down
1 change: 1 addition & 0 deletions src/routes/(customer)/routing/ConnectionDetail.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
profilePicture={tourInfo.profilePicture}
smokingAllowed={tourInfo.smokingAllowed}
averageRating={tourInfo.averageRatingProvider}
numberPassengers={tourInfo.passengers}
/>

{#if tourInfo.picture || tourInfo.color}
Expand Down
2 changes: 1 addition & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading