diff --git a/src/lib/utils/member.ts b/src/lib/utils/member.ts index 348a0ac9a..4f515d76c 100644 --- a/src/lib/utils/member.ts +++ b/src/lib/utils/member.ts @@ -41,6 +41,7 @@ export const getCustomAuthorOptions = async ( export type MemberDoorPolicies = Array<{ name: string; + verboseName: string | undefined; roles: string[]; startDate: Date | null; endDate: Date | null; @@ -132,6 +133,8 @@ export const getCurrentDoorPoliciesForMember = async ( throw error(500, "Could not fetch door access"); }); + const doors = await prisma.door.findMany(); + const policiesByDoor: MemberDoorPolicies = userDoorPolicies.reduce( (acc, policy) => { const role = policy.role ?? "Du"; @@ -147,6 +150,8 @@ export const getCurrentDoorPoliciesForMember = async ( } acc.push({ name: policy.doorName, + verboseName: doors.find((door) => door.name == policy.doorName) + ?.verboseName, roles: [role], startDate: policy.startDatetime, endDate: policy.endDatetime, diff --git a/src/routes/(app)/members/[studentId]/+page.server.ts b/src/routes/(app)/members/[studentId]/+page.server.ts index 9987abe07..9858662a3 100644 --- a/src/routes/(app)/members/[studentId]/+page.server.ts +++ b/src/routes/(app)/members/[studentId]/+page.server.ts @@ -76,7 +76,6 @@ export const load: PageServerLoad = async ({ locals, params }) => { ? await keycloak.getEmail(member.studentId) : undefined; - try { return { form: await superValidate(member, memberSchema), diff --git a/src/routes/(app)/members/[studentId]/+page.svelte b/src/routes/(app)/members/[studentId]/+page.svelte index 7172b526f..2eedb44ed 100644 --- a/src/routes/(app)/members/[studentId]/+page.svelte +++ b/src/routes/(app)/members/[studentId]/+page.svelte @@ -136,7 +136,7 @@
{#if data.doorAccess.length > 0} diff --git a/src/routes/(app)/members/[studentId]/DoorAccess.svelte b/src/routes/(app)/members/[studentId]/DoorAccess.svelte index dd1eebb55..df9c3fd81 100644 --- a/src/routes/(app)/members/[studentId]/DoorAccess.svelte +++ b/src/routes/(app)/members/[studentId]/DoorAccess.svelte @@ -9,7 +9,7 @@ class="my-2 flex items-center justify-between gap-4 rounded-lg bg-base-200 p-3" >
- {doorPolicy.name} + {doorPolicy.verboseName} {#if doorPolicy.startDate != null || doorPolicy.endDate != null} {doorPolicy.startDate?.toLocaleDateString("sv-SE") ?? ""}