From 3b93f86524a125bf545a28062be18b964e4f83d3 Mon Sep 17 00:00:00 2001
From: Yi Xhan <yl9431@rit.edu>
Date: Fri, 14 Nov 2025 13:38:40 -0500
Subject: [PATCH 1/6] can't submit training without answering all questions,
 might change display of error and account for other errors

---
 client/src/pages/maker/take_quiz/QuizTaker.tsx | 17 ++++++++++-------
 server/src/resolvers/trainingModuleResolver.ts |  6 ++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/client/src/pages/maker/take_quiz/QuizTaker.tsx b/client/src/pages/maker/take_quiz/QuizTaker.tsx
index 8edcc6f9..69b9b561 100644
--- a/client/src/pages/maker/take_quiz/QuizTaker.tsx
+++ b/client/src/pages/maker/take_quiz/QuizTaker.tsx
@@ -72,10 +72,7 @@ export default function QuizTaker({ module }: QuizTakerProps) {
 
   const [answerSheet, setAnswerSheet] = useImmer<AnswerSheet>(initialAnswerSheet);
 
-  const [submitModule, result] = useMutation(SUBMIT_MODULE, {
-    variables: { moduleID: module.id, answerSheet },
-    refetchQueries: [{ query: GET_CURRENT_USER }, { query: GET_TRAINING_MODULES }],
-  });
+  const [submitModule, result] = useMutation(SUBMIT_MODULE);
 
   const selectMultipleChoiceOption = (itemID: string, optionID: string) => {
     setAnswerSheet((draft) => {
@@ -130,9 +127,15 @@ export default function QuizTaker({ module }: QuizTakerProps) {
   const navigate = useNavigate();
 
   const submitAndViewResults = async () => {
-    await submitModule();
-    navigate(`results`);
-    trainingSubmissionAnimation();
+    await submitModule({
+    variables: { moduleID: module.id, answerSheet },
+    refetchQueries: [{ query: GET_CURRENT_USER }, { query: GET_TRAINING_MODULES }],
+    onError (error){
+      toast.error(`Failed to submit: ${error.message}`);
+    },
+    onCompleted: (results) => {navigate(`results`); trainingSubmissionAnimation();}
+  });
+
   };
 
   const cancelQuiz = async () => {
diff --git a/server/src/resolvers/trainingModuleResolver.ts b/server/src/resolvers/trainingModuleResolver.ts
index c8ac2c71..d30a2875 100644
--- a/server/src/resolvers/trainingModuleResolver.ts
+++ b/server/src/resolvers/trainingModuleResolver.ts
@@ -478,6 +478,12 @@ const TrainingModuleResolvers = {
               (item) => item.itemID === question.id
             )?.optionIDs;
 
+            //Stop if user hasn't answered all questions 
+            if(correctOptionIDs.length !== submittedOptionIDs?.length || submittedOptionIDs == null){
+              throw Error(
+                'You have not answered all questions. Please try again.'
+              )
+            }
 
             //Increment correcct if submitted options match correct options (order doesn't matter)
             //Increment incorrect otherwise

From 311fe0e3cb73f041a1909b9813cce41f4037d350 Mon Sep 17 00:00:00 2001
From: Yi Xhan <yl9431@rit.edu>
Date: Mon, 17 Nov 2025 17:48:58 -0500
Subject: [PATCH 2/6] display # of correct options, not gonna tell them how
 many they get right before submitting that doesn't seem like a good idea

---
 client/src/pages/maker/take_quiz/Question.tsx | 19 +++++++++--
 .../src/pages/maker/take_quiz/QuizTaker.tsx   |  4 ++-
 .../src/resolvers/trainingModuleResolver.ts   | 32 +++++++++++++++++++
 server/src/schemas/trainingModuleSchema.ts    |  5 +++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/client/src/pages/maker/take_quiz/Question.tsx b/client/src/pages/maker/take_quiz/Question.tsx
index 1ea757d9..92549f87 100644
--- a/client/src/pages/maker/take_quiz/Question.tsx
+++ b/client/src/pages/maker/take_quiz/Question.tsx
@@ -1,7 +1,9 @@
-import { QuizItem } from "../../../types/Quiz";
+import { QuizItem, QuizItemType } from "../../../types/Quiz";
 import { Card, Typography } from "@mui/material";
 import Option from "./Option";
 import Markdown from "react-markdown";
+import gql from "graphql-tag";
+import { useQuery } from "@apollo/client";
 
 const styles = {
   strongerBolds: {
@@ -14,8 +16,16 @@ const styles = {
   }
 };
 
+const GET_CORRECT_ANSWER_COUNT = gql`
+  query GetModuleQuestionAnswerCount($id: ID!, $itemID: String!) {
+    moduleQuestionAnswerCount(id: $id, itemID: $itemID){
+      count
+    }
+  }
+`;
 
 interface QuestionProps {
+  moduleID: number;
   selectedOptionIDs: string[];
   quizItem: QuizItem;
   onClick: (optionID: string) => void;
@@ -23,11 +33,14 @@ interface QuestionProps {
 }
 
 export default function Question({
+  moduleID,
   selectedOptionIDs,
   quizItem,
   onClick,
   disabled
 }: QuestionProps) {
+  const correctAnswerCount = useQuery(GET_CORRECT_ANSWER_COUNT, {variables: {id:moduleID, itemID: quizItem.id}})
+
   return (
     <Card elevation={2} sx={{ p: 2 }}>
       <Typography sx={{ fontWeight: 500, mb: 1, ...styles.strongerBolds }}>
@@ -37,7 +50,9 @@ export default function Question({
               return <a target="_blank" rel="noopener noreferrer"{...props}>{children}</a>;
             },
           }}
-        >{quizItem.text}</Markdown>
+        >{quizItem.type === QuizItemType.Checkboxes 
+          ? quizItem.text + ` (Please select ${correctAnswerCount.data?.moduleQuestionAnswerCount.count} choices.)`
+          : quizItem.text}</Markdown>
       </Typography>
       {quizItem.options?.map((o) => (
         <Option
diff --git a/client/src/pages/maker/take_quiz/QuizTaker.tsx b/client/src/pages/maker/take_quiz/QuizTaker.tsx
index 69b9b561..bb2dd044 100644
--- a/client/src/pages/maker/take_quiz/QuizTaker.tsx
+++ b/client/src/pages/maker/take_quiz/QuizTaker.tsx
@@ -133,7 +133,7 @@ export default function QuizTaker({ module }: QuizTakerProps) {
     onError (error){
       toast.error(`Failed to submit: ${error.message}`);
     },
-    onCompleted: (results) => {navigate(`results`); trainingSubmissionAnimation();}
+    onCompleted() {navigate(`results`); trainingSubmissionAnimation();}
   });
 
   };
@@ -195,6 +195,7 @@ export default function QuizTaker({ module }: QuizTakerProps) {
           case QuizItemType.MultipleChoice:
             return (
               <Question
+                moduleID={module.id}
                 selectedOptionIDs={selectedOptionIDs}
                 key={quizItem.id}
                 quizItem={quizItem}
@@ -205,6 +206,7 @@ export default function QuizTaker({ module }: QuizTakerProps) {
           case QuizItemType.Checkboxes:
             return (
               <Question
+                moduleID={module.id}
                 selectedOptionIDs={selectedOptionIDs}
                 key={quizItem.id}
                 quizItem={quizItem}
diff --git a/server/src/resolvers/trainingModuleResolver.ts b/server/src/resolvers/trainingModuleResolver.ts
index d30a2875..e31a7a67 100644
--- a/server/src/resolvers/trainingModuleResolver.ts
+++ b/server/src/resolvers/trainingModuleResolver.ts
@@ -104,6 +104,20 @@ const removeAnswersFromQuiz = (quiz: TrainingModuleItem[]) => {
   }
 };
 
+function findAnswerCount(quiz: TrainingModuleItem[], itemID: String){
+  for (const item of quiz) {
+    if(item.id === itemID && item.options){
+      var count = 0;
+      for (const option of item.options) {
+        if(option.correct == true){
+          count++;
+        }
+      }
+      return count;
+    }
+  }
+}
+
 /**
  * Determine if an array of submitted options for a question is correct
  * @param correct array of correct option IDs
@@ -219,6 +233,24 @@ const TrainingModuleResolvers = {
       })
     },
 
+    /**
+     * Finds a question based on module and id of item. No restrictions on user.
+     * @argument id ID of TrainingModule
+     * @argument itemID id of item within trainingmodule
+     * @returns number of correct answers for a question
+     */
+      moduleQuestionAnswerCount: async (
+      _parent: any,
+      args: { id: number, itemID: string },
+      { ifAuthenticated }: ApolloContext
+    ) => {
+      return ifAuthenticated(async (_user: any) => {
+        const module = await ModuleRepo.getModuleByID(args.id);
+        const answerCount = findAnswerCount(module.quiz, args.itemID)
+        return {"count": answerCount};
+      })
+    },
+
     /**
      * Fetch all archived TrainingModules
      * @returns TrainingModule
diff --git a/server/src/schemas/trainingModuleSchema.ts b/server/src/schemas/trainingModuleSchema.ts
index 421f4224..38e73a12 100644
--- a/server/src/schemas/trainingModuleSchema.ts
+++ b/server/src/schemas/trainingModuleSchema.ts
@@ -45,6 +45,10 @@ export const TrainingModuleTypeDefs = gql`
     accessCheckDone: Boolean!
   }
 
+  type CorrectAnswerCount {
+    count: Int
+  }
+
   input AnswerInput {
     itemID: ID!
     optionIDs: [ID]!
@@ -55,6 +59,7 @@ export const TrainingModuleTypeDefs = gql`
     modulesWithAnswers: [TrainingModule]
     module(id: ID!): TrainingModule
     moduleWithAnswers(id: ID!): TrainingModule
+    moduleQuestionAnswerCount(id: ID!, itemID: String!): CorrectAnswerCount
     archivedModules: [TrainingModule]
     archivedModule(id: ID!): TrainingModule
     relatedAccessProgress(sourceTrainingModuleID: ID!): [AccessProgress]

From 9b5332cafee724fe63d9a2e5615b3e891046831a Mon Sep 17 00:00:00 2001
From: Yi Xhan <yl9431@rit.edu>
Date: Wed, 19 Nov 2025 17:38:39 -0500
Subject: [PATCH 3/6] better answer counting

---
 client/src/pages/maker/take_quiz/Question.tsx  | 11 +----------
 client/src/pages/maker/take_quiz/QuizPage.tsx  | 11 +++++------
 client/src/queries/trainingQueries.ts          | 13 +++++++++++++
 client/src/types/Quiz.ts                       |  1 +
 server/src/db/tables.ts                        |  1 +
 server/src/resolvers/trainingModuleResolver.ts | 16 ++++++++--------
 server/src/schemas/trainingModuleSchema.ts     |  6 +-----
 7 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/client/src/pages/maker/take_quiz/Question.tsx b/client/src/pages/maker/take_quiz/Question.tsx
index 92549f87..18861d74 100644
--- a/client/src/pages/maker/take_quiz/Question.tsx
+++ b/client/src/pages/maker/take_quiz/Question.tsx
@@ -16,14 +16,6 @@ const styles = {
   }
 };
 
-const GET_CORRECT_ANSWER_COUNT = gql`
-  query GetModuleQuestionAnswerCount($id: ID!, $itemID: String!) {
-    moduleQuestionAnswerCount(id: $id, itemID: $itemID){
-      count
-    }
-  }
-`;
-
 interface QuestionProps {
   moduleID: number;
   selectedOptionIDs: string[];
@@ -39,7 +31,6 @@ export default function Question({
   onClick,
   disabled
 }: QuestionProps) {
-  const correctAnswerCount = useQuery(GET_CORRECT_ANSWER_COUNT, {variables: {id:moduleID, itemID: quizItem.id}})
 
   return (
     <Card elevation={2} sx={{ p: 2 }}>
@@ -51,7 +42,7 @@ export default function Question({
             },
           }}
         >{quizItem.type === QuizItemType.Checkboxes 
-          ? quizItem.text + ` (Please select ${correctAnswerCount.data?.moduleQuestionAnswerCount.count} choices.)`
+          ? quizItem.text + ` (Please select ${quizItem?.correctAnswers} choices.)`
           : quizItem.text}</Markdown>
       </Typography>
       {quizItem.options?.map((o) => (
diff --git a/client/src/pages/maker/take_quiz/QuizPage.tsx b/client/src/pages/maker/take_quiz/QuizPage.tsx
index 224b8bda..4c610be2 100644
--- a/client/src/pages/maker/take_quiz/QuizPage.tsx
+++ b/client/src/pages/maker/take_quiz/QuizPage.tsx
@@ -1,8 +1,7 @@
 import { useQuery } from "@apollo/client";
 import { useParams } from "react-router-dom";
-import { GET_MODULE } from "../../../queries/trainingQueries";
+import { GET_MODULE_ANSWER_COUNT } from "../../../queries/trainingQueries";
 import RequestWrapper2 from "../../../common/RequestWrapper2";
-import { Module } from "../../../types/Quiz";
 import QuizTaker from "./QuizTaker";
 import { Stack } from "@mui/system";
 import { Typography } from "@mui/material";
@@ -30,16 +29,16 @@ function _shuffle(array: any[] | undefined) {
 
 export default function QuizPage() {
   const { id } = useParams<{ id: string }>();
-  const result = useQuery(GET_MODULE, { variables: { id } });
+  const result = useQuery(GET_MODULE_ANSWER_COUNT, { variables: { id } });
   const isMobile = useIsMobile();
 
   return (
     <RequestWrapper2
       result={result}
-      render={({ module }: { module: Module }) => (
+      render={(data) => (
         <Stack spacing={2} margin={"15px 30px"}>
-          <Typography variant={isMobile ? "h5" : "h3"}>{module.name}</Typography>
-          <QuizTaker module={module} />
+          <Typography variant={isMobile ? "h5" : "h3"}>{data.moduleWithAnswerCount?.name}</Typography>
+          <QuizTaker module={data?.moduleWithAnswerCount} />
         </Stack>
       )}
     />
diff --git a/client/src/queries/trainingQueries.ts b/client/src/queries/trainingQueries.ts
index 76e4c3c3..c29c4094 100644
--- a/client/src/queries/trainingQueries.ts
+++ b/client/src/queries/trainingQueries.ts
@@ -27,6 +27,19 @@ export const GET_MODULE_WITH_ANSWERS = gql`
   }
 `;
 
+export const GET_MODULE_ANSWER_COUNT = gql`
+  query GetModuleAnswerCount($id: ID!) {
+    moduleWithAnswerCount(id: $id){
+      id
+      name
+      quiz
+      reservationPrompt
+      archived
+      isLocked
+    }
+  }
+`;
+
 export const GET_ARCHIVED_MODULE = gql`
   query GetArchivedModule($id: ID!) {
     archivedModule(id: $id) {
diff --git a/client/src/types/Quiz.ts b/client/src/types/Quiz.ts
index 9f85e04c..531accca 100644
--- a/client/src/types/Quiz.ts
+++ b/client/src/types/Quiz.ts
@@ -18,6 +18,7 @@ export interface QuizItem {
   type: QuizItemType;
   text: string;
   options?: Option[];
+  correctAnswers?: number;
   hint?: string;
   affirmation?: string;
 }
diff --git a/server/src/db/tables.ts b/server/src/db/tables.ts
index 94bda461..ce36cb77 100644
--- a/server/src/db/tables.ts
+++ b/server/src/db/tables.ts
@@ -273,6 +273,7 @@ export interface TrainingModuleItem {
   type: string;
   text: string;
   options?: ModuleItemOption[];
+  correctAnswers?: number;
   hint: string;
   affirmation: string;
 }
diff --git a/server/src/resolvers/trainingModuleResolver.ts b/server/src/resolvers/trainingModuleResolver.ts
index e31a7a67..060a19f4 100644
--- a/server/src/resolvers/trainingModuleResolver.ts
+++ b/server/src/resolvers/trainingModuleResolver.ts
@@ -104,16 +104,16 @@ const removeAnswersFromQuiz = (quiz: TrainingModuleItem[]) => {
   }
 };
 
-function findAnswerCount(quiz: TrainingModuleItem[], itemID: String){
+function editQuizOptions(quiz: TrainingModuleItem[]){
   for (const item of quiz) {
-    if(item.id === itemID && item.options){
+    if(item.options){
       var count = 0;
       for (const option of item.options) {
         if(option.correct == true){
           count++;
         }
       }
-      return count;
+      item.correctAnswers = count;
     }
   }
 }
@@ -234,20 +234,20 @@ const TrainingModuleResolvers = {
     },
 
     /**
-     * Finds a question based on module and id of item. No restrictions on user.
+     * Finds a module based id of item. No restrictions on user. Only returns # of correct answers for options
      * @argument id ID of TrainingModule
-     * @argument itemID id of item within trainingmodule
+     * @argument itemID id of item within TrainingModule
      * @returns number of correct answers for a question
      */
-      moduleQuestionAnswerCount: async (
+      moduleWithAnswerCount: async (
       _parent: any,
       args: { id: number, itemID: string },
       { ifAuthenticated }: ApolloContext
     ) => {
       return ifAuthenticated(async (_user: any) => {
         const module = await ModuleRepo.getModuleByID(args.id);
-        const answerCount = findAnswerCount(module.quiz, args.itemID)
-        return {"count": answerCount};
+        editQuizOptions(module.quiz)
+        return module;
       })
     },
 
diff --git a/server/src/schemas/trainingModuleSchema.ts b/server/src/schemas/trainingModuleSchema.ts
index 38e73a12..a98803d9 100644
--- a/server/src/schemas/trainingModuleSchema.ts
+++ b/server/src/schemas/trainingModuleSchema.ts
@@ -45,10 +45,6 @@ export const TrainingModuleTypeDefs = gql`
     accessCheckDone: Boolean!
   }
 
-  type CorrectAnswerCount {
-    count: Int
-  }
-
   input AnswerInput {
     itemID: ID!
     optionIDs: [ID]!
@@ -59,7 +55,7 @@ export const TrainingModuleTypeDefs = gql`
     modulesWithAnswers: [TrainingModule]
     module(id: ID!): TrainingModule
     moduleWithAnswers(id: ID!): TrainingModule
-    moduleQuestionAnswerCount(id: ID!, itemID: String!): CorrectAnswerCount
+    moduleWithAnswerCount(id: ID!): TrainingModule
     archivedModules: [TrainingModule]
     archivedModule(id: ID!): TrainingModule
     relatedAccessProgress(sourceTrainingModuleID: ID!): [AccessProgress]

From 87cbe02a5b570875bda2d74cb7aeaf7edeb8067e Mon Sep 17 00:00:00 2001
From: Yi Xhan <yl9431@rit.edu>
Date: Thu, 20 Nov 2025 17:55:53 -0500
Subject: [PATCH 4/6] frontend block submit wip, still slow to update currently

---
 .../src/pages/maker/take_quiz/QuizTaker.tsx   | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/client/src/pages/maker/take_quiz/QuizTaker.tsx b/client/src/pages/maker/take_quiz/QuizTaker.tsx
index bb2dd044..92569114 100644
--- a/client/src/pages/maker/take_quiz/QuizTaker.tsx
+++ b/client/src/pages/maker/take_quiz/QuizTaker.tsx
@@ -64,12 +64,17 @@ interface QuizTakerProps {
 
 export default function QuizTaker({ module }: QuizTakerProps) {
   const [quizProgressed, setQuizProgressed] = useState<boolean>(false);
+  const [blockSubmit, setBlockSubmit] = useState<boolean>(true);
   const isMobile = useIsMobile();
 
   const initialAnswerSheet = module.quiz
     .filter((item) => item.type === QuizItemType.MultipleChoice || item.type === QuizItemType.Checkboxes)
     .map((item) => ({ itemID: item.id, optionIDs: [] }));
 
+  const answerSheetReq = module.quiz
+  .filter((item) => item.type === QuizItemType.MultipleChoice || item.type === QuizItemType.Checkboxes)
+  .map((item) => ({itemID: item.id, reqCount: item.correctAnswers}))
+
   const [answerSheet, setAnswerSheet] = useImmer<AnswerSheet>(initialAnswerSheet);
 
   const [submitModule, result] = useMutation(SUBMIT_MODULE);
@@ -79,6 +84,7 @@ export default function QuizTaker({ module }: QuizTakerProps) {
       const index = draft.findIndex((i) => i.itemID === itemID);
       draft[index].optionIDs = [optionID];
     });
+    checkAllAnswered();
     setQuizProgressed(true);
   };
 
@@ -95,9 +101,23 @@ export default function QuizTaker({ module }: QuizTakerProps) {
       }
 
     })
+    checkAllAnswered();
     setQuizProgressed(true);
   };
 
+  const checkAllAnswered = async () => {
+    var allAnswered = true
+    answerSheet.forEach((o) => {
+      const itemIndex = answerSheetReq.findIndex((i) => i.itemID === o.itemID);
+      if(o.optionIDs.length != answerSheetReq[itemIndex].reqCount){
+        allAnswered = false;
+      }
+    })
+    setBlockSubmit(!allAnswered)
+  }
+
+  console.log(blockSubmit)
+
   const trainingSubmissionAnimation = () => {
     toast.success("Training Module Submitted", {
       position: "bottom-left",
@@ -245,7 +265,7 @@ export default function QuizTaker({ module }: QuizTakerProps) {
           loading={result.loading}
           variant="contained"
           sx={{ alignSelf: "flex-end" }}
-          disabled={module.isLocked ?? false}
+          disabled={(module.isLocked || blockSubmit) ?? false}
           onClick={() => submitAndViewResults()}
         >
           Submit

From ee4a3197dcd0049581d5aaf9ee484d2b2dd041a9 Mon Sep 17 00:00:00 2001
From: Yi Xhan <yl9431@rit.edu>
Date: Fri, 21 Nov 2025 14:46:43 -0500
Subject: [PATCH 5/6] frontend check for blocking submit instead

---
 client/src/pages/maker/take_quiz/Question.tsx |  5 ----
 .../src/pages/maker/take_quiz/QuizTaker.tsx   | 24 +++++++------------
 .../src/resolvers/trainingModuleResolver.ts   |  7 ------
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/client/src/pages/maker/take_quiz/Question.tsx b/client/src/pages/maker/take_quiz/Question.tsx
index 18861d74..3d4a40d3 100644
--- a/client/src/pages/maker/take_quiz/Question.tsx
+++ b/client/src/pages/maker/take_quiz/Question.tsx
@@ -2,8 +2,6 @@ import { QuizItem, QuizItemType } from "../../../types/Quiz";
 import { Card, Typography } from "@mui/material";
 import Option from "./Option";
 import Markdown from "react-markdown";
-import gql from "graphql-tag";
-import { useQuery } from "@apollo/client";
 
 const styles = {
   strongerBolds: {
@@ -17,7 +15,6 @@ const styles = {
 };
 
 interface QuestionProps {
-  moduleID: number;
   selectedOptionIDs: string[];
   quizItem: QuizItem;
   onClick: (optionID: string) => void;
@@ -25,13 +22,11 @@ interface QuestionProps {
 }
 
 export default function Question({
-  moduleID,
   selectedOptionIDs,
   quizItem,
   onClick,
   disabled
 }: QuestionProps) {
-
   return (
     <Card elevation={2} sx={{ p: 2 }}>
       <Typography sx={{ fontWeight: 500, mb: 1, ...styles.strongerBolds }}>
diff --git a/client/src/pages/maker/take_quiz/QuizTaker.tsx b/client/src/pages/maker/take_quiz/QuizTaker.tsx
index 92569114..0dc9ea26 100644
--- a/client/src/pages/maker/take_quiz/QuizTaker.tsx
+++ b/client/src/pages/maker/take_quiz/QuizTaker.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { Module, QuizItemType } from "../../../types/Quiz";
 import { useImmer } from "use-immer";
 import { Button, Card, CardContent, Stack, Typography } from "@mui/material";
@@ -64,7 +64,7 @@ interface QuizTakerProps {
 
 export default function QuizTaker({ module }: QuizTakerProps) {
   const [quizProgressed, setQuizProgressed] = useState<boolean>(false);
-  const [blockSubmit, setBlockSubmit] = useState<boolean>(true);
+  const [blockSubmit, setBlockSubmit] = useState(true);
   const isMobile = useIsMobile();
 
   const initialAnswerSheet = module.quiz
@@ -73,7 +73,7 @@ export default function QuizTaker({ module }: QuizTakerProps) {
 
   const answerSheetReq = module.quiz
   .filter((item) => item.type === QuizItemType.MultipleChoice || item.type === QuizItemType.Checkboxes)
-  .map((item) => ({itemID: item.id, reqCount: item.correctAnswers}))
+  .map((item) => ({itemID: item.id, reqCount: item.correctAnswers}));
 
   const [answerSheet, setAnswerSheet] = useImmer<AnswerSheet>(initialAnswerSheet);
 
@@ -84,7 +84,6 @@ export default function QuizTaker({ module }: QuizTakerProps) {
       const index = draft.findIndex((i) => i.itemID === itemID);
       draft[index].optionIDs = [optionID];
     });
-    checkAllAnswered();
     setQuizProgressed(true);
   };
 
@@ -101,22 +100,20 @@ export default function QuizTaker({ module }: QuizTakerProps) {
       }
 
     })
-    checkAllAnswered();
     setQuizProgressed(true);
   };
 
-  const checkAllAnswered = async () => {
-    var allAnswered = true
+  useEffect(() => {
+    var allAnswered = true;
     answerSheet.forEach((o) => {
       const itemIndex = answerSheetReq.findIndex((i) => i.itemID === o.itemID);
       if(o.optionIDs.length != answerSheetReq[itemIndex].reqCount){
         allAnswered = false;
       }
     })
-    setBlockSubmit(!allAnswered)
-  }
-
-  console.log(blockSubmit)
+    setBlockSubmit(!allAnswered); 
+  });
+  
 
   const trainingSubmissionAnimation = () => {
     toast.success("Training Module Submitted", {
@@ -150,9 +147,6 @@ export default function QuizTaker({ module }: QuizTakerProps) {
     await submitModule({
     variables: { moduleID: module.id, answerSheet },
     refetchQueries: [{ query: GET_CURRENT_USER }, { query: GET_TRAINING_MODULES }],
-    onError (error){
-      toast.error(`Failed to submit: ${error.message}`);
-    },
     onCompleted() {navigate(`results`); trainingSubmissionAnimation();}
   });
 
@@ -215,7 +209,6 @@ export default function QuizTaker({ module }: QuizTakerProps) {
           case QuizItemType.MultipleChoice:
             return (
               <Question
-                moduleID={module.id}
                 selectedOptionIDs={selectedOptionIDs}
                 key={quizItem.id}
                 quizItem={quizItem}
@@ -226,7 +219,6 @@ export default function QuizTaker({ module }: QuizTakerProps) {
           case QuizItemType.Checkboxes:
             return (
               <Question
-                moduleID={module.id}
                 selectedOptionIDs={selectedOptionIDs}
                 key={quizItem.id}
                 quizItem={quizItem}
diff --git a/server/src/resolvers/trainingModuleResolver.ts b/server/src/resolvers/trainingModuleResolver.ts
index 060a19f4..16d46eca 100644
--- a/server/src/resolvers/trainingModuleResolver.ts
+++ b/server/src/resolvers/trainingModuleResolver.ts
@@ -510,13 +510,6 @@ const TrainingModuleResolvers = {
               (item) => item.itemID === question.id
             )?.optionIDs;
 
-            //Stop if user hasn't answered all questions 
-            if(correctOptionIDs.length !== submittedOptionIDs?.length || submittedOptionIDs == null){
-              throw Error(
-                'You have not answered all questions. Please try again.'
-              )
-            }
-
             //Increment correcct if submitted options match correct options (order doesn't matter)
             //Increment incorrect otherwise
             if (submittedOptionIDsCorrect(correctOptionIDs, submittedOptionIDs)) {

From eec82786b09cb5318a63262bf934dd6c35ef99c5 Mon Sep 17 00:00:00 2001
From: Yi Xhan <yl9431@rit.edu>
Date: Tue, 2 Dec 2025 13:19:00 -0500
Subject: [PATCH 6/6] better? function name + no more useeffect/state for
 disabling submit button

---
 .../src/pages/maker/take_quiz/QuizTaker.tsx   | 19 ++++---------------
 .../src/resolvers/trainingModuleResolver.ts   |  4 ++--
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/client/src/pages/maker/take_quiz/QuizTaker.tsx b/client/src/pages/maker/take_quiz/QuizTaker.tsx
index 0dc9ea26..3179436e 100644
--- a/client/src/pages/maker/take_quiz/QuizTaker.tsx
+++ b/client/src/pages/maker/take_quiz/QuizTaker.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { Module, QuizItemType } from "../../../types/Quiz";
 import { useImmer } from "use-immer";
 import { Button, Card, CardContent, Stack, Typography } from "@mui/material";
@@ -64,7 +64,6 @@ interface QuizTakerProps {
 
 export default function QuizTaker({ module }: QuizTakerProps) {
   const [quizProgressed, setQuizProgressed] = useState<boolean>(false);
-  const [blockSubmit, setBlockSubmit] = useState(true);
   const isMobile = useIsMobile();
 
   const initialAnswerSheet = module.quiz
@@ -102,19 +101,9 @@ export default function QuizTaker({ module }: QuizTakerProps) {
     })
     setQuizProgressed(true);
   };
-
-  useEffect(() => {
-    var allAnswered = true;
-    answerSheet.forEach((o) => {
-      const itemIndex = answerSheetReq.findIndex((i) => i.itemID === o.itemID);
-      if(o.optionIDs.length != answerSheetReq[itemIndex].reqCount){
-        allAnswered = false;
-      }
-    })
-    setBlockSubmit(!allAnswered); 
-  });
   
-
+  const checkAllAnswered = (element: any, index: number) => (element.optionIDs.length != answerSheetReq[index].reqCount); 
+  
   const trainingSubmissionAnimation = () => {
     toast.success("Training Module Submitted", {
       position: "bottom-left",
@@ -257,7 +246,7 @@ export default function QuizTaker({ module }: QuizTakerProps) {
           loading={result.loading}
           variant="contained"
           sx={{ alignSelf: "flex-end" }}
-          disabled={(module.isLocked || blockSubmit) ?? false}
+          disabled={(module.isLocked || (answerSheet.some(checkAllAnswered))) ?? false}
           onClick={() => submitAndViewResults()}
         >
           Submit
diff --git a/server/src/resolvers/trainingModuleResolver.ts b/server/src/resolvers/trainingModuleResolver.ts
index 16d46eca..907953d9 100644
--- a/server/src/resolvers/trainingModuleResolver.ts
+++ b/server/src/resolvers/trainingModuleResolver.ts
@@ -104,7 +104,7 @@ const removeAnswersFromQuiz = (quiz: TrainingModuleItem[]) => {
   }
 };
 
-function editQuizOptions(quiz: TrainingModuleItem[]){
+function countQuizCorrectOptions(quiz: TrainingModuleItem[]){
   for (const item of quiz) {
     if(item.options){
       var count = 0;
@@ -246,7 +246,7 @@ const TrainingModuleResolvers = {
     ) => {
       return ifAuthenticated(async (_user: any) => {
         const module = await ModuleRepo.getModuleByID(args.id);
-        editQuizOptions(module.quiz)
+        countQuizCorrectOptions(module.quiz)
         return module;
       })
     },