Merge pull request #115 from HackDavis/feat/form-autofill

doggo ai pt 3
HackDavis · Apr 28, 2024 · ee33075 · ee33075
2 parents 15855c2 + a29c9e4
commit ee33075
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/app/(pages)/judges/scoring/_components/ScoringForm/ScoringForm.tsx b/app/(pages)/judges/scoring/_components/ScoringForm/ScoringForm.tsx
@@ -30,14 +30,26 @@ export default function ScoringForm({
   team: TeamInt;
   submission: SubmissionInt;
 }) {
+  const scores = submission.scores ?? generalScoreNames.map((_) => -1);
+  const corrs = (
+    submission.correlations ??
+    team.tracks.map((track: string) => {
+      return { track, score: -1 };
+    })
+  ).map((corr: any) => corr.score);
+
+  const already_done =
+    (submission.correlations ? team.tracks.length : 0) +
+    (submission.scores ? generalScoreNames.length : 0);
+
   const router = useRouter();
   const [updateState, UpdateSubmission] = useFormState(updateSubmission, {
     ok: false,
     body: null,
     error: null,
   });
 
-  const [ready, setReady] = useState(5 + team.tracks.length);
+  const [ready, setReady] = useState(5 + team.tracks.length - already_done);
 
   useEffect(() => {
     if (updateState.ok === true) {
@@ -59,14 +71,16 @@ export default function ScoringForm({
           inputNameHeader="Overall Scoring"
           inputScoreNames={generalScoreNames}
           setReady={setReady}
+          submission={scores}
         />
         <ScoringInput
           inputNameHeader="Specific Tracks"
           inputScoreNames={team.tracks}
           setReady={setReady}
+          submission={corrs}
         />
         <div>
-          <Comments _={submission} />
+          <Comments submission={submission.comments ?? ''} />
           <Submission canSubmit={ready <= 0} error={updateState.error} />
         </div>
       </form>

diff --git a/app/(pages)/judges/scoring/_components/ScoringForm/ScoringSubComponents/Comments.tsx b/app/(pages)/judges/scoring/_components/ScoringForm/ScoringSubComponents/Comments.tsx
@@ -1,10 +1,9 @@
 'use client';
 import { useState } from 'react';
-import SubmissionInt from '@typeDefs/submissions';
 import styles from './Comments.module.scss';
 
-export default function Comments({ _ }: { _: SubmissionInt }) {
-  const [commentText, setCommentText] = useState('');
+export default function Comments({ submission }: { submission: string }) {
+  const [commentText, setCommentText] = useState(submission);
 
   const onCommentType = (e: any) => {
     setCommentText(e.target.value);

diff --git a/app/(pages)/judges/scoring/_components/ScoringForm/ScoringSubComponents/ScoreInput.tsx b/app/(pages)/judges/scoring/_components/ScoringForm/ScoringSubComponents/ScoreInput.tsx
@@ -5,12 +5,14 @@ interface ScoringInputProps {
   inputNameHeader: string;
   inputScoreNames: string[];
   setReady: (prev: any) => void;
+  submission: number[];
 }
 
 export default function ScoringInput({
   inputNameHeader,
   inputScoreNames,
   setReady,
+  submission,
 }: ScoringInputProps) {
   return (
     <div className={styles.inputContainer}>
@@ -21,6 +23,7 @@ export default function ScoringInput({
           index={index + 1}
           key={index}
           setReady={setReady}
+          initVal={submission[index]}
         />
       ))}
     </div>

diff --git a/...)/judges/scoring/_components/ScoringForm/ScoringSubComponents/ScoringCard/ScoringCard.tsx b/...)/judges/scoring/_components/ScoringForm/ScoringSubComponents/ScoringCard/ScoringCard.tsx
@@ -6,15 +6,17 @@ interface ScoringCardProps {
   categoryName: string;
   index: number;
   setReady: (prev: any) => void;
+  initVal: number;
 }
 export default function ScoringCard({
   categoryName,
   index,
   setReady,
+  initVal,
 }: ScoringCardProps) {
   const scores = [1, 2, 3, 4, 5];
 
-  const [pickedScore, setPickedScore] = useState(-1);
+  const [pickedScore, setPickedScore] = useState(initVal);
 
   const enterChoice = (index: number) => {
     return () => {