Merge pull request #92 from UWB-ACM/rmgeorge/judge-feedback-show-client-side

Made it so that the feedback box shows the feedback that judges previ…

Author: Makaar212

src/app/judging/[id]/ProjectScoringPage.tsx

@@ -17,19 +17,24 @@ export default function ProjectScoringPage({
     project,
     questions,
     existingScores,
+    existingFeedback,
 }: {
     project: Project;
     questions: JudgingQuestion[];
     existingScores: JudgingScore[];
+    existingFeedback: string | null;
 }) {
     const router = useRouter();
 
     // Seed state from any scores already in the DB so revisiting the page pre-fills inputs.
     const [scores, setScores] = useState<Record<number, number>>(
         Object.fromEntries(existingScores.map((s) => [s.questionId, s.score])),
     );
+    const [feedback, setFeedback] = useState<string>(
+        existingFeedback === null ? "" : existingFeedback,
+    );
+
     const [completing, setCompleting] = useState(false);
-    const [feedback, setFeedback] = useState<string>("");
 
     // All questions must have a defined score before the judge can mark complete.
     const allScored =

src/app/judging/[id]/page.tsx

@@ -4,6 +4,7 @@ import {
     getProject,
     getJudgingQuestions,
     getScoresForProject,
+    getFeedback,
 } from "@/src/util/db/judge";
 import ProjectScoringPage from "./ProjectScoringPage";
 import { ensureJudgePermission } from "@/src/util/judge";
@@ -28,11 +29,14 @@ export default async function Page({
         getScoresForProject(session.user!.id, projectId),
     ]);
 
+    const existingFeedback = await getFeedback(projectId, session.user!.id);
+
     return (
         <ProjectScoringPage
             project={project}
             questions={questions}
             existingScores={existingScores}
+            existingFeedback={existingFeedback}
         />
     );
 }

src/util/db/judge.ts

@@ -161,6 +161,29 @@ export async function getTrack(trackId: number): Promise<Track | null> {
     };
 }
 
+/**
+ * This function returns the feedback that a specific judge left on a specific project
+ *
+ * @param projectId This is the id of the project
+ * @param judgeId This is the id of the judge
+ * @returns String that is the feedback
+ */
+export async function getFeedback(
+    projectId: number,
+    judgeId: number,
+): Promise<string | null> {
+    const data =
+        await sql`SELECT feedback FROM judge_assignments WHERE project_id = ${projectId} and judge_id = ${judgeId}`;
+
+    if (data.length === 0) {
+        return null;
+    }
+
+    const row = data[0];
+
+    return row.feedback;
+}
+
 /**
  * Returns all tracks.
  */