From 3807eee07b3486ad1b6dd7250206499660899836 Mon Sep 17 00:00:00 2001
From: andrewtan2000 <andrew_tan2000@hotmail.com>
Date: Sun, 29 Sep 2024 15:02:05 +0800
Subject: [PATCH] Revert "Question Length"

This reverts commit 47236f5573d87979d61140a3ec982b4c5350389f.
---
 app/(main)/quiz/page.tsx | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/(main)/quiz/page.tsx b/app/(main)/quiz/page.tsx
index face4c7..27639be 100644
--- a/app/(main)/quiz/page.tsx
+++ b/app/(main)/quiz/page.tsx
@@ -151,7 +151,7 @@ const QuizPage: React.FC = () => {
 
     const handleNextQuestion = () => {
         if (currentQuestionLength > 0) {
-            if (currentQuestionIndex < (currentQuestionLength || 0) - 1) {
+            if (currentQuestionIndex < currentQuestionLength - 1) {
                 setExplanationsVisible({});
                 setIsAnswerSubmitted(false);
                 setIsRadioDisabled(false);
@@ -336,7 +336,7 @@ const QuizPage: React.FC = () => {
 
     const displayScore = () => {
         const score = calculateScore();
-        const totalQuestions = quiz?.mcqs?.content?.length || 0;
+        const totalQuestions = quiz?.mcqs.content.length || 0;
         setCurrentQuestionIndex(currentQuestionIndex + 1);
         setShowScore(true);
         localStorage.setItem('currentQuestionIndex', '0');
@@ -410,11 +410,9 @@ const QuizPage: React.FC = () => {
                 }
                 setQuiz(responseData);
                 const initialSelectedOptions: { [key: number]: number | 0 } = {};
-                if (responseData.mcqs && responseData.mcqs.content) {
-                    responseData.mcqs.content.forEach((mcq) => {
-                        initialSelectedOptions[mcq.id] = 0;
-                    });
-                }
+                responseData.mcqs.content.forEach((mcq) => {
+                    initialSelectedOptions[mcq.id] = 0;
+                });
                 setSelectedOptions(initialSelectedOptions);
                 setQuizIdAvailable(true); // Set quizIdAvailable to true once quiz data is fetched
             } catch (error) {
@@ -457,7 +455,7 @@ const QuizPage: React.FC = () => {
                             Are you sure you want to exit the quiz?
                         </Dialog>
                     </div>
-                    {quiz && quiz.mcqs && Array.isArray(quiz.mcqs.content) && quiz.mcqs.content.length === 0 && <div>No questions generated.</div>}
+                    {quiz && quiz.mcqs && Array.isArray(quiz.mcqs) && quiz.mcqs.content.length === 0 && <div>No questions generated.</div>}
                     {!isQuizOngoing && (
                         <div>
                             <div>
@@ -498,17 +496,17 @@ const QuizPage: React.FC = () => {
                                 <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
                                     <div style={{ minWidth: '200px' }}>
                                         <h6>
-                                            Question {currentQuestionIndex + 1} of {quiz?.mcqs?.content?.length || 0}
+                                            Question {currentQuestionIndex + 1} of {quiz?.mcqs?.content.length || 0}
                                         </h6>
                                     </div>
                                     <b>
-                                        <div className="card">{currentQuestion.skills ? currentQuestion.skills.map((skill) => skill.name).join(', ') : ''}</div>
+                                        <div className="card">{currentQuestion.skills.map((skill) => skill.name).join(', ')}</div>
                                     </b>
                                 </div>
                                 <div className="cardOption">
                                     <span dangerouslySetInnerHTML={{ __html: currentQuestion.stem }} />
                                 </div>
-                                {currentQuestion.options && currentQuestion.options.map((option) => (
+                                {currentQuestion.options.map((option) => (
                                     <label key={option.no} className="option-label" htmlFor={`option-${option.no}`} style={{ display: 'block', cursor: 'pointer' }}>
                                         <div className="card">
                                             <div style={{ display: 'flex', alignItems: 'center' }}>
@@ -540,7 +538,7 @@ const QuizPage: React.FC = () => {
                                     </label>
                                 ))}
                                 {isAnswerSubmitted ? (
-                                    currentQuestionIndex < (quiz?.mcqs?.content?.length || 0) - 1 ? (
+                                    currentQuestionIndex < quiz.mcqs.content.length - 1 ? (
                                         <Button
                                             label="Next Question"
                                             onClick={() => {
@@ -568,16 +566,16 @@ const QuizPage: React.FC = () => {
                             </div>
                             <div style={{ marginBottom: '30px' }}>
                                 <h6>
-                                    <b>{currentQuestion.topics ? currentQuestion.topics.map((topic) => topic.name).join(', ') : ''}</b>
+                                    <b>{currentQuestion.topics.map((topic) => topic.name).join(', ')}</b>
                                 </h6>
                             </div>
-                            <ProgressBar value={Math.round(((currentQuestionIndex + 1) / (quiz?.mcqs?.content?.length || 1)) * 100)} />
+                            <ProgressBar value={Math.round(((currentQuestionIndex + 1) / quiz?.mcqs?.content?.length) * 100)} />
                         </div>
                     )}
                     {showScore && showScoreMessage && (
                         <div>
                             <p>
-                                {showScoreMessage}
+                                <div className="score-message">{showScoreMessage}</div>
                             </p>
                             <div>
                                 <Button onClick={handleViewResults}>View History</Button>