Merge pull request #113 from HackDavis/ui-fixes

Added comments to admin panel
HackDavis · Apr 28, 2024 · 6051b8c · 6051b8c
2 parents 8e92449 + 1479699
commit 6051b8c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/app/(api)/_utils/scoring/rankTeams.ts b/app/(api)/_utils/scoring/rankTeams.ts
@@ -55,7 +55,12 @@ function calculateScores(team: Team, submissions: Submission[]) {
     score: isNaN(res / submissionsCount) ? 0 : res / submissionsCount,
   }));
 
-  return { number: team.number, name: team.name, scores: finalScores };
+  return {
+    number: team.number,
+    name: team.name,
+    scores: finalScores,
+    comments: submissions.map((submission) => submission.comments),
+  };
 }
 
 async function computeAllTeams(teams: Team[]) {
@@ -98,6 +103,7 @@ export default async function rankTeams(teams: Team[]) {
         number: team.number,
         name: team.name,
         score: foundScore.score,
+        comments: team.comments,
       });
     }
 

diff --git a/app/(pages)/judges/admin/_components/JudgeTeamGrouping/JudgeTeamGrouping.module.scss b/app/(pages)/judges/admin/_components/JudgeTeamGrouping/JudgeTeamGrouping.module.scss
@@ -3,6 +3,15 @@
   flex-direction: column;
 }
 
+.score {
+  margin-bottom: 8px;
+  border: none;
+  border-radius: 4px;
+  padding: 20px;
+  background-color: var(--background-tertiary);
+  box-shadow: 0 3.874px 61.987px 0 rgba(255, 197, 61, .16);
+}
+
 .delete {
   display: flex;
   flex-direction: column;

diff --git a/app/(pages)/judges/admin/_components/JudgeTeamGrouping/JudgeTeamGrouping.tsx b/app/(pages)/judges/admin/_components/JudgeTeamGrouping/JudgeTeamGrouping.tsx
@@ -35,12 +35,20 @@ export default function JudgeTeamGrouping() {
           ? trackResults!.map((result) => (
               <>
                 <h4>{result.track}</h4>
-                {result.topEntries.map((entry) => (
-                  <>
+                {result.topEntries.map((entry, i) => (
+                  <div key={i} className={styles.score}>
                     <p>
                       Team No. {entry.number}, {entry.name}, {entry.score}
                     </p>
-                  </>
+                    <p>Comments:</p>
+                    <ul>
+                      {entry.comments.map((comment, i) => {
+                        if (comment !== undefined) {
+                          return <li key={i}>{comment}</li>;
+                        }
+                      })}
+                    </ul>
+                  </div>
                 ))}
               </>
             ))