Filter & Sort
diff --git a/src/routes/dashboard/admin/print/[id]/+page.server.ts b/src/routes/dashboard/admin/print/[id]/+page.server.ts
index 4058e7e..8eb27a6 100644
--- a/src/routes/dashboard/admin/print/[id]/+page.server.ts
+++ b/src/routes/dashboard/admin/print/[id]/+page.server.ts
@@ -1,8 +1,11 @@
import { db } from '$lib/server/db/index.js';
-import { project, user, devlog, t1Review } from '$lib/server/db/schema.js';
-import { error, redirect } from '@sveltejs/kit';
+import { project, user, devlog, legionReview } from '$lib/server/db/schema.js';
+import { error } from '@sveltejs/kit';
import { eq, and, asc, sql } from 'drizzle-orm';
import type { Actions } from './$types';
+import { sendSlackDM } from '$lib/server/slack.js';
+import { getReviewHistory } from '../../getReviewHistory.server';
+import { getCurrentlyPrinting } from '../utils.server';
export async function load({ locals, params }) {
if (!locals.user) {
@@ -20,7 +23,15 @@ export async function load({ locals, params }) {
id: project.id,
name: project.name,
description: project.description,
+
url: project.url,
+ editorFileType: project.editorFileType,
+ editorUrl: project.editorUrl,
+ uploadedFileUrl: project.uploadedFileUrl,
+ modelFile: project.modelFile,
+
+ printedBy: project.printedBy,
+
createdAt: project.createdAt,
updatedAt: project.updatedAt,
status: project.status
@@ -44,6 +55,11 @@ export async function load({ locals, params }) {
project.name,
project.description,
project.url,
+ project.editorFileType,
+ project.editorUrl,
+ project.uploadedFileUrl,
+ project.modelFile,
+ project.printedBy,
project.createdAt,
project.status,
user.id,
@@ -64,32 +80,18 @@ export async function load({ locals, params }) {
.where(and(eq(devlog.projectId, queriedProject.project.id), eq(devlog.deleted, false)))
.orderBy(asc(devlog.createdAt));
- const t1Reviews = await db
- .select({
- user: {
- id: user.id,
- name: user.name
- },
- action: t1Review.action,
- notes: t1Review.notes,
- feedback: t1Review.feedback,
- timestamp: t1Review.timestamp
- })
- .from(t1Review)
- .innerJoin(user, eq(user.id, t1Review.userId))
- .where(eq(t1Review.projectId, queriedProject.project.id))
- // .groupBy(t1Review.userId, t1Review.notes, t1Review.feedback, t1Review.timestamp)
- .orderBy(asc(t1Review.timestamp));
+ const currentlyPrinting = await getCurrentlyPrinting(locals.user);
return {
project: queriedProject,
devlogs,
- t1Reviews
+ reviews: await getReviewHistory(id),
+ currentlyPrinting
};
}
export const actions = {
- default: async ({ locals, request, params }) => {
+ markForPrint: async ({ locals, params }) => {
if (!locals.user) {
throw error(500);
}
@@ -97,53 +99,231 @@ export const actions = {
throw error(403, { message: 'get out, peasant' });
}
+ const currentlyPrinting = await getCurrentlyPrinting(locals.user);
+
const id: number = parseInt(params.id);
+ if (currentlyPrinting && currentlyPrinting.id !== id) {
+ return error(400, {
+ message: 'you are already printing something else right now'
+ });
+ }
+
const [queriedProject] = await db
.select({
- id: project.id
+ id: project.id,
+ status: project.status
})
.from(project)
- .where(and(eq(project.deleted, false), eq(project.id, id)));
+ .where(and(eq(project.id, id), eq(project.deleted, false)))
+ .limit(1);
if (!queriedProject) {
return error(404, { message: 'project not found' });
}
+ if (queriedProject.status !== 't1_approved') {
+ return error(403, { message: 'project is not marked as on print queue' });
+ }
+
+ await db.insert(legionReview).values({
+ projectId: id,
+ userId: locals.user.id,
+ action: 'mark_for_printing'
+ });
+
+ await db
+ .update(project)
+ .set({
+ status: 'printing',
+ printedBy: locals.user.id
+ })
+ .where(eq(project.id, id));
+
+ return {};
+ },
+
+ unmarkForPrint: async ({ locals, params }) => {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.isPrinter) {
+ throw error(403, { message: 'get out, peasant' });
+ }
+
+ const id: number = parseInt(params.id);
+
+ const [queriedProject] = await db
+ .select({
+ id: project.id,
+ status: project.status,
+ printedBy: project.printedBy
+ })
+ .from(project)
+ .where(and(eq(project.id, id), eq(project.deleted, false)))
+ .limit(1);
+
+ if (!queriedProject) {
+ return error(404, { message: 'project not found' });
+ }
+
+ if (queriedProject.status !== 'printing') {
+ return error(403, { message: 'project is not marked as printing' });
+ }
+
+ await db.insert(legionReview).values({
+ projectId: id,
+ userId: locals.user.id,
+ action: 'unmark_for_printing'
+ });
+
+ await db
+ .update(project)
+ .set({
+ status: 't1_approved',
+ printedBy: null
+ })
+ .where(eq(project.id, id));
+
+ return {};
+ },
+
+ print: async ({ locals, request, params }) => {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.isPrinter) {
+ throw error(403, { message: 'get out, peasant' });
+ }
+
+ const currentlyPrinting = await getCurrentlyPrinting(locals.user);
+
+ const id: number = parseInt(params.id);
+
+ if (!currentlyPrinting || currentlyPrinting.id !== id) {
+ return error(400, {
+ message: "you can only print a project if you've marked it as you're printing it"
+ });
+ }
+
+ const [queriedProject] = await db
+ .select({
+ id: project.id,
+ status: project.status
+ })
+ .from(project)
+ .where(and(eq(project.id, id), eq(project.deleted, false)))
+ .limit(1);
+
+ if (!queriedProject) {
+ return error(404, { message: 'project not found' });
+ }
+
+ if (queriedProject.status !== 'printing') {
+ return error(403, { message: 'project is not marked as currently printing' });
+ }
+
const data = await request.formData();
- const action = data.get('action') as typeof t1Review.action._.data;
+ const filamentUsed = data.get('filament');
const notes = data.get('notes')?.toString();
const feedback = data.get('feedback')?.toString();
- if (action === null || notes === null || feedback === null) {
+ if (notes === null || feedback === null) {
return error(400);
}
- await db.insert(t1Review).values({
+ if (
+ !filamentUsed ||
+ isNaN(parseFloat(filamentUsed.toString())) ||
+ parseFloat(filamentUsed.toString()) < 0
+ ) {
+ return error(400, { message: 'invalid filament used' });
+ }
+
+ await db.insert(legionReview).values({
projectId: id,
userId: locals.user.id,
- action,
+ filamentUsed: parseFloat(filamentUsed.toString()),
notes,
- feedback
+ feedback,
+ action: 'print'
});
- let status: typeof project.status._.data | undefined = undefined;
+ await db
+ .update(project)
+ .set({
+ status: 'printed'
+ })
+ .where(eq(project.id, id));
+
+ // if (queriedProject.user) {
+ // const feedbackText = feedback ? `\n\nHere's what they said:\n${feedback}` : '';
+
+ // await sendSlackDM(
+ // queriedProject.user.slackId,
+ // `Your project
has been ${statusMessage}${feedbackText}`
+ // );
+ // }
+
+ return {};
+ },
+
+ action: async ({ locals, request, params }) => {
+ if (!locals.user) {
+ throw error(500);
+ }
+ if (!locals.user.isPrinter) {
+ throw error(403, { message: 'get out, peasant' });
+ }
+
+ const id: number = parseInt(params.id);
+
+ const [queriedProject] = await db
+ .select({
+ id: project.id,
+ status: project.status
+ })
+ .from(project)
+ .where(and(eq(project.id, id), eq(project.deleted, false)))
+ .limit(1);
+
+ if (!queriedProject) {
+ return error(404, { message: 'project not found' });
+ }
+
+ if (!['t1_approved', 'printing', 'printed'].includes(queriedProject.status)) {
+ return error(403, { message: 'project is not in the print stage' });
+ }
+
+ const data = await request.formData();
+ const action = data.get('action')?.toString() as typeof legionReview.action._.data | undefined;
+ const notes = data.get('notes')?.toString();
+ const feedback = data.get('feedback')?.toString();
+
+ if (notes === null || feedback === null || action === null || action === undefined) {
+ return error(400);
+ }
+
+ let status: typeof project.status._.data;
- switch (action) {
- case 'approve':
- status = 't1_approved';
- break;
- case 'approve_no_print':
- status = 'printed';
- break;
- case 'reject':
- status = 'rejected';
- break;
- case 'reject_lock':
- status = 'rejected_locked';
- break;
+ if (action === 'already_printed') {
+ status = 'printed';
+ } else if (action === 'add_comment') {
+ status = queriedProject.status;
+ } else if (action === 'reject') {
+ status = 'submitted';
+ } else {
+ return error(400);
}
+ await db.insert(legionReview).values({
+ projectId: id,
+ userId: locals.user.id,
+ notes,
+ feedback,
+ action
+ });
+
await db
.update(project)
.set({
@@ -151,6 +331,6 @@ export const actions = {
})
.where(eq(project.id, id));
- return redirect(302, '/dashboard/admin/print');
+ return {};
}
} satisfies Actions;
diff --git a/src/routes/dashboard/admin/print/[id]/+page.svelte b/src/routes/dashboard/admin/print/[id]/+page.svelte
index 98e0a20..cf8ad38 100644
--- a/src/routes/dashboard/admin/print/[id]/+page.svelte
+++ b/src/routes/dashboard/admin/print/[id]/+page.svelte
@@ -2,18 +2,26 @@
import relativeDate from 'tiny-relative-date';
import Devlog from '$lib/components/Devlog.svelte';
import Head from '$lib/components/Head.svelte';
- import { ExternalLink } from '@lucide/svelte';
import { enhance } from '$app/forms';
import { projectStatuses } from '$lib/utils.js';
+ import ProjectLinks from '$lib/components/ProjectLinks.svelte';
+ import Spinny3DPreview from '$lib/components/Spinny3DPreview.svelte';
+ import { Download } from '@lucide/svelte';
+ import ReviewHistory from '../../ReviewHistory.svelte';
- let { data } = $props();
+ let { data, form } = $props();
- let formPending = $state(false);
+ let actionsFormPending = $state(false);
+ let printFormPending = $state(false);
+ let markForPrintPending = $state(false);
+ let unmarkForPrintPending = $state(false);
-
+
-
diff --git a/src/routes/dashboard/admin/print/utils.server.ts b/src/routes/dashboard/admin/print/utils.server.ts
new file mode 100644
index 0000000..ac78a1a
--- /dev/null
+++ b/src/routes/dashboard/admin/print/utils.server.ts
@@ -0,0 +1,22 @@
+import { db } from '$lib/server/db';
+import { project } from '$lib/server/db/schema';
+import { and, eq, type SQLWrapper } from 'drizzle-orm';
+
+export async function getCurrentlyPrinting(user: { id: number | SQLWrapper }) {
+ const [currentlyPrinting] = await db
+ .select({
+ id: project.id,
+ name: project.name
+ })
+ .from(project)
+ .where(
+ and(
+ eq(project.printedBy, user.id),
+ eq(project.status, 'printing'),
+ eq(project.deleted, false)
+ )
+ )
+ .limit(1);
+
+ return currentlyPrinting;
+}
diff --git a/src/routes/dashboard/admin/print/utils.ts b/src/routes/dashboard/admin/print/utils.ts
deleted file mode 100644
index f17b090..0000000
--- a/src/routes/dashboard/admin/print/utils.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { db } from "$lib/server/db";
-import { project } from "$lib/server/db/schema";
-import { and, eq, type SQLWrapper } from "drizzle-orm";
-
-export async function getCurrentlyPrinting(user: { id: number | SQLWrapper; }) {
- const [currentlyPrinting] = await db
- .select()
- .from(project)
- .where(
- and(
- eq(project.printedBy, user.id),
- eq(project.status, 'printing'),
- eq(project.deleted, false)
- )
- )
- .limit(1);
-
- return currentlyPrinting;
-}
\ No newline at end of file
diff --git a/src/routes/dashboard/admin/review/[id]/+page.server.ts b/src/routes/dashboard/admin/review/[id]/+page.server.ts
index 64bfa2c..78d4594 100644
--- a/src/routes/dashboard/admin/review/[id]/+page.server.ts
+++ b/src/routes/dashboard/admin/review/[id]/+page.server.ts
@@ -4,6 +4,7 @@ import { error, redirect } from '@sveltejs/kit';
import { eq, and, asc, sql } from 'drizzle-orm';
import type { Actions } from './$types';
import { sendSlackDM } from '$lib/server/slack.js';
+import { getReviewHistory } from '../../getReviewHistory.server';
export async function load({ locals, params }) {
if (!locals.user) {
@@ -75,27 +76,10 @@ export async function load({ locals, params }) {
.where(and(eq(devlog.projectId, queriedProject.project.id), eq(devlog.deleted, false)))
.orderBy(asc(devlog.createdAt));
- const t1Reviews = await db
- .select({
- user: {
- id: user.id,
- name: user.name
- },
- action: t1Review.action,
- notes: t1Review.notes,
- feedback: t1Review.feedback,
- timestamp: t1Review.timestamp
- })
- .from(t1Review)
- .innerJoin(user, eq(user.id, t1Review.userId))
- .where(eq(t1Review.projectId, queriedProject.project.id))
- // .groupBy(t1Review.userId, t1Review.notes, t1Review.feedback, t1Review.timestamp)
- .orderBy(asc(t1Review.timestamp));
-
return {
project: queriedProject,
devlogs,
- t1Reviews
+ reviews: await getReviewHistory(id)
};
}
diff --git a/src/routes/dashboard/admin/review/[id]/+page.svelte b/src/routes/dashboard/admin/review/[id]/+page.svelte
index 065311e..e7206f5 100644
--- a/src/routes/dashboard/admin/review/[id]/+page.svelte
+++ b/src/routes/dashboard/admin/review/[id]/+page.svelte
@@ -7,6 +7,7 @@
import ProjectLinks from '$lib/components/ProjectLinks.svelte';
import Spinny3DPreview from '$lib/components/Spinny3DPreview.svelte';
import { Download } from '@lucide/svelte';
+ import ReviewHistory from '../../ReviewHistory.svelte';
let { data } = $props();
@@ -142,8 +143,8 @@
@@ -163,20 +164,6 @@