Skip to content

see who claimed what projs #96

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
jeninh wants to merge 1 commit into
base: staging
Choose a base branch
from
+24 −2
Open

see who claimed what projs #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions src/routes/dashboard/admin/print/+page.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -83,6 +84,8 @@ async function getProjects(
projectFilter: number[],
userFilter: number[]
) {
const printer = alias(user, 'printer');

return await db
.select({
project: {
Expand All @@ -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),
Expand All @@ -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
);
}
10 changes: 10 additions & 0 deletions src/routes/dashboard/admin/print/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down