From f03b920c01036ad10f2eedb15e2ccf7760c72fd1 Mon Sep 17 00:00:00 2001
From: Jenin <jenin@hackclub.com>
Date: Sun, 4 Jan 2026 20:33:26 -0500
Subject: [PATCH] see who claimed what projs

---
 src/routes/dashboard/admin/print/+page.server.ts | 16 ++++++++++++++--
 src/routes/dashboard/admin/print/+page.svelte    | 10 ++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/routes/dashboard/admin/print/+page.server.ts b/src/routes/dashboard/admin/print/+page.server.ts
index 3b91488..43b70e2 100644
--- a/src/routes/dashboard/admin/print/+page.server.ts
+++ b/src/routes/dashboard/admin/print/+page.server.ts
@@ -2,6 +2,7 @@ import { db } from '$lib/server/db/index.js';
 import { project, user, devlog } from '$lib/server/db/schema.js';
 import { error } from '@sveltejs/kit';
 import { eq, and, sql, ne, inArray } from 'drizzle-orm';
+import { alias } from 'drizzle-orm/pg-core';
 import type { Actions } from './$types';
 import { getCurrentlyPrinting } from './utils.server';
 
@@ -83,6 +84,8 @@ async function getProjects(
 	projectFilter: number[],
 	userFilter: number[]
 ) {
+	const printer = alias(user, 'printer');
+
 	return await db
 		.select({
 			project: {
@@ -91,18 +94,24 @@ async function getProjects(
 				description: project.description,
 				url: project.url,
 				createdAt: project.createdAt,
-				status: project.status
+				status: project.status,
+				claimedAt: project.claimedAt
 			},
 			user: {
 				id: user.id,
 				name: user.name
 			},
+			printer: {
+				id: printer.id,
+				name: printer.name
+			},
 			timeSpent: sql<number>`COALESCE(SUM(${devlog.timeSpent}), 0)`,
 			devlogCount: sql<number>`COALESCE(COUNT(${devlog.id}), 0)`
 		})
 		.from(project)
 		.leftJoin(devlog, and(eq(project.id, devlog.projectId), eq(devlog.deleted, false)))
 		.leftJoin(user, eq(user.id, project.userId))
+		.leftJoin(printer, eq(printer.id, project.printedBy))
 		.where(
 			and(
 				eq(project.deleted, false),
@@ -118,7 +127,10 @@ async function getProjects(
 			project.url,
 			project.createdAt,
 			project.status,
+			project.claimedAt,
 			user.id,
-			user.name
+			user.name,
+			printer.id,
+			printer.name
 		);
 }
diff --git a/src/routes/dashboard/admin/print/+page.svelte b/src/routes/dashboard/admin/print/+page.svelte
index fc8301f..b8d2b8c 100644
--- a/src/routes/dashboard/admin/print/+page.svelte
+++ b/src/routes/dashboard/admin/print/+page.svelte
@@ -204,6 +204,16 @@
 						</p>
 						<p class="text-sm">{projectStatuses[project.project.status]}</p>
 					</div>
+					{#if project.project.status === 'printing' && project.printer?.name}
+						<p class="mt-1 text-sm text-primary-400">
+							Claimed by <span class="font-medium">{project.printer.name}</span>
+							{#if project.project.claimedAt}
+								<abbr title={project.project.claimedAt.toUTCString()}>
+									{relativeDate(project.project.claimedAt)}
+								</abbr>
+							{/if}
+						</p>
+					{/if}
 				</div>
 			{/each}
 		</div>