Skip to content

SANC-87 Modify getAll bookings to allow drivers #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JustinTan-1 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

SANC-87 Modify getAll bookings to allow drivers #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c71207b
Modify getAll bookings to allow drivers
JustinTan-1 Mar 4, 2026
9a7b6ae
Remove client side survey filter for driver
JustinTan-1 Mar 5, 2026
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
2 changes: 1 addition & 1 deletion src/app/_components/drivercomponents/driver-dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const DriverDashboard = () => {

let driverTrips = [{}] as Booking[];

const tripQuery = api.bookings.getDriverTrip.useQuery(
const tripQuery = api.bookings.getAll.useQuery(
{
startDate: dateJSON.startDate,
endDate: dateJSON.endDate,
Expand Down
2 changes: 2 additions & 0 deletions src/app/_components/drivercomponents/surveyButtons/surveyButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Group, Stack } from "@mantine/core";
import { useState } from "react";
import Button from "@/app/_components/common/button/Button";
import SurveyNotification from "@/app/_components/drivercomponents/surveyNotification/surveyNotification";
import { authClient } from "@/lib/auth-client";
import { api } from "@/trpc/react";
import type { Booking, Survey } from "@/types/types";

Expand All @@ -19,6 +20,7 @@ export default function SurveyViewToggle({
initialSurveys,
}: SurveyViewToggleProps) {
const [activeView, setActiveView] = useState<View>("pending");
const { data: session } = authClient.useSession();

// will update every 60 seconds
const { data: surveys = [] } = api.surveys.getAll.useQuery(undefined, {
Expand Down
2 changes: 1 addition & 1 deletion src/server/api/routers/bookings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const bookingsRouter = createTRPCRouter({
conditions.push(eq(bookings.surveyCompleted, input.surveyCompleted));
}

if (role === "admin") {
if (role === "admin" || role === "driver") {
return ctx.db
.select()
.from(bookings)
Expand Down