day 3, 1-4

index.html

@@ -39,7 +39,7 @@ <h1>JavaScript Quiz</h1>
           <div id="result"></div>
         </div>
         <!-- The below 'Restart Quiz' button is commented out because it is not used initially -->
-        <!-- <button id="restartButton" class="button-secondary">Restart Quiz</button> -->
+        <button id="restartButton" class="button-secondary">Restart Quiz</button>
       </div>
     </div>
 

src/index.js

@@ -23,7 +23,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
 
   /************  QUIZ DATA  ************/
-  
+
   // Array with the quiz questions
   const questions = [
     new Question("What is 2 + 2?", ["3", "4", "5", "6"], "4", 1),
@@ -36,7 +36,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
 
   /************  QUIZ INSTANCE  ************/
-  
+
   // Create a new Quiz instance object
   const quiz = new Quiz(questions, quizDuration, quizDuration);
   // Shuffle the quiz questions
@@ -46,20 +46,48 @@ document.addEventListener("DOMContentLoaded", () => {
   /************  SHOW INITIAL CONTENT  ************/
 
   // Convert the time remaining in seconds to minutes and seconds, and pad the numbers with zeros if needed
-  const minutes = Math.floor(quiz.timeRemaining / 60).toString().padStart(2, "0");
-  const seconds = (quiz.timeRemaining % 60).toString().padStart(2, "0");
+  //const minutes = Math.floor(quiz.timeRemaining / 60).toString().padStart(2, "0");
+  //const seconds = (quiz.timeRemaining % 60).toString().padStart(2, "0");
 
   // Display the time remaining in the time remaining container
-  const timeRemainingContainer = document.getElementById("timeRemaining");
-  timeRemainingContainer.innerText = `${minutes}:${seconds}`;
+  //const timeRemainingContainer = document.getElementById("timeRemaining");
+  //timeRemainingContainer.innerText = `${minutes}:${seconds}`;
 
   // Show first question
   showQuestion();
 
 
   /************  TIMER  ************/
 
-  let timer;
+  let timer = null;
+
+  function setTimer() {
+    timer = setInterval(() => {
+      quiz.timeRemaining -= 1;
+
+      const minutes = Math.floor(quiz.timeRemaining / 60).toString().padStart(2, "0");
+      const seconds = (quiz.timeRemaining % 60).toString().padStart(2, "0");
+      const timeRemainingContainer = document.getElementById("timeRemaining");
+      timeRemainingContainer.innerText = `${minutes}:${seconds}`;
+
+
+      if (quiz.timeRemaining === 0) {
+        clearInterval(timer);
+        showResults();
+      }
+    }, 1000);
+  }
+  //start counting from time specified in timeRemaining (property of Quiz)
+  //update the timeRemaining and the timer every second
+  //stop counting when time is up
+  //when time is up: display endView and score
+
+  //use clearInterval() in the showResults() function
+
+  //when quiz is restarted: timeRemaining set to initial value
+  //update the timer text in the quiz view to initial value
+  //start the timer countdown again. 
+
 
 
   /************  EVENT LISTENERS  ************/
@@ -77,12 +105,12 @@ document.addEventListener("DOMContentLoaded", () => {
 
 
   function showQuestion() {
+
     // If the quiz has ended, show the results
     if (quiz.hasEnded()) {
       showResults();
       return;
     }
-
     // Clear the previous question text and question choices
     questionContainer.innerText = "";
     choiceContainer.innerHTML = "";
@@ -91,84 +119,128 @@ document.addEventListener("DOMContentLoaded", () => {
     const question = quiz.getQuestion();
     // Shuffle the choices of the current question by calling the method 'shuffleChoices()' on the question object
     question.shuffleChoices();
-
-
+
 
     // YOUR CODE HERE:
     //
     // 1. Show the question
     // Update the inner text of the question container element and show the question text
+    questionContainer.innerText = question.text;
 
-
     // 2. Update the green progress bar
     // Update the green progress bar (div#progressBar) width so that it shows the percentage of questions answered
-
-    progressBar.style.width = `65%`; // This value is hardcoded as a placeholder
-
+    const currentQuestionIndex = quiz.currentQuestionIndex;
+    const totalQuestions = quiz.questions.length;
 
+    const progress = (currentQuestionIndex / totalQuestions) * 100;
+    progressBar.style.width = `${progress}%`; // This value is hardcoded as a placeholder
 
     // 3. Update the question count text 
     // Update the question count (div#questionCount) show the current question out of total questions
-
-    questionCount.innerText = `Question 1 of 10`; //  This value is hardcoded as a placeholder
 
+    questionCount.innerText = `Question ${currentQuestionIndex + 1} of ${totalQuestions}`; //  This value is hardcoded as a placeholder
 
-
     // 4. Create and display new radio input element with a label for each choice.
-    // Loop through the current question `choices`.
-      // For each choice create a new radio input with a label, and append it to the choice container.
-      // Each choice should be displayed as a radio input element with a label:
-      /* 
-          <input type="radio" name="choice" value="CHOICE TEXT HERE">
-          <label>CHOICE TEXT HERE</label>
-        <br>
-      */
-      // Hint 1: You can use the `document.createElement()` method to create a new element.
-      // Hint 2: You can use the `element.type`, `element.name`, and `element.value` properties to set the type, name, and value of an element.
-      // Hint 3: You can use the `element.appendChild()` method to append an element to the choices container.
-      // Hint 4: You can use the `element.innerText` property to set the inner text of an element.
+    question.choices.forEach(choiceText => {
+      const newRadioInput = document.createElement("input");
+      newRadioInput.type = "radio";
+      newRadioInput.name = "choice";
+      newRadioInput.value = choiceText;
 
-  }
+      const newLabel = document.createElement("label");
 
+      newLabel.appendChild(newRadioInput);
+      newLabel.appendChild(document.createTextNode(choiceText));
 
+      choiceContainer.appendChild(newLabel);
+      choiceContainer.appendChild(document.createElement("br"));
+    });
+    // Loop through the current question `choices`.
+    // For each choice create a new radio input with a label, and append it to the choice container.
+    // Each choice should be displayed as a radio input element with a label:
+    /* 
+        <input type="radio" name="choice" value="CHOICE TEXT HERE">
+        <label>CHOICE TEXT HERE</label>
+      <br>
+    */
+    // Hint 1: You can use the `document.createElement()` method to create a new element.
+    // Hint 2: You can use the `element.type`, `element.name`, and `element.value` properties to set the type, name, and value of an element.
+    // Hint 3: You can use the `element.appendChild()` method to append an element to the choices container.
+    // Hint 4: You can use the `element.innerText` property to set the inner text of an element.
 
-  function nextButtonHandler () {
-    let selectedAnswer; // A variable to store the selected answer value
+  }
+  setTimer(); 
 
 
+  function nextButtonHandler() {
+    let selectedAnswer; // A variable to store the selected answer value
 
     // YOUR CODE HERE:
-    //
     // 1. Get all the choice elements. You can use the `document.querySelectorAll()` method.
+    const allChoices = document.querySelectorAll('input[name="choice"]');
 
+    allChoices.forEach(choice => {
 
-    // 2. Loop through all the choice elements and check which one is selected
-      // Hint: Radio input elements have a property `.checked` (e.g., `element.checked`).
-      //  When a radio input gets selected the `.checked` property will be set to true.
-      //  You can use check which choice was selected by checking if the `.checked` property is true.
+      if (choice.checked === true) {
+        selectedAnswer = choice.value;
+      }
+    });
 
+    if (selectedAnswer) {
+      quiz.checkAnswer(selectedAnswer);
+      quiz.moveToNextQuestion();
+      showQuestion();
+    } else {
 
-    // 3. If an answer is selected (`selectedAnswer`), check if it is correct and move to the next question
-      // Check if selected answer is correct by calling the quiz method `checkAnswer()` with the selected answer.
-      // Move to the next question by calling the quiz method `moveToNextQuestion()`.
-      // Show the next question by calling the function `showQuestion()`.
-  }  
+    }
+
+  }
+
+
+  // 2. Loop through all the choice elements and check which one is selected
+  // Hint: Radio input elements have a property `.checked` (e.g., `element.checked`).
+  //  When a radio input gets selected the `.checked` property will be set to true.
+  //  You can use check which choice was selected by checking if the `.checked` property is true.
 
 
+  // 3. If an answer is selected (`selectedAnswer`), check if it is correct and move to the next question
+  // Check if selected answer is correct by calling the quiz method `checkAnswer()` with the selected answer.
+  // Move to the next question by calling the quiz method `moveToNextQuestion()`.
+  // Show the next question by calling the function `showQuestion()`.
 
 
   function showResults() {
 
     // YOUR CODE HERE:
     //
+    clearInterval(timer);
     // 1. Hide the quiz view (div#quizView)
     quizView.style.display = "none";
 
     // 2. Show the end view (div#endView)
     endView.style.display = "flex";
-    
+
     // 3. Update the result container (div#result) inner text to show the number of correct answers out of total questions
-    resultContainer.innerText = `You scored 1 out of 1 correct answers!`; // This value is hardcoded as a placeholder
+    resultContainer.innerText = `You scored ${quiz.correctAnswers} out of ${quiz.questions.length} correct answers!`;
+
+
   }
-
-});
+
+  const restartQuiz = document.querySelector('#restartButton');
+
+  restartQuiz.addEventListener('click', () => {
+    endView.style.display = "none";
+    quizView.style.display = "flex";
+
+    quiz.currentQuestionIndex = 0;
+    quiz.correctAnswers = 0;
+
+    quiz.timeRemaining = quizDuration;
+
+    quiz.shuffleQuestions();
+    showQuestion();
+    setTimer();
+
+  })
+
+});

src/question.js

@@ -1,7 +1,18 @@
 class Question {
-    // YOUR CODE HERE:
-    //
-    // 1. constructor (text, choices, answer, difficulty)
+    constructor (text, choices, answer, difficulty) {
+        this.text = text;
+        this.choices = choices;
+        this.answer = answer ;
+        this.difficulty = difficulty; 
+    }
+
+shuffleChoices = () => { 
+  for (let i = this.choices.length - 1; i > 0; i--) { 
+    const j = Math.floor(Math.random() * (i + 1)); 
+    [this.choices[i], this.choices[j]] = [this.choices[j], this.choices[i]]; 
+  } 
+  return this.choices; 
+}; 
+
+}
 
-    // 2. shuffleChoices()
-}

src/quiz.js

@@ -2,14 +2,81 @@ class Quiz {
     // YOUR CODE HERE:
     //
     // 1. constructor (questions, timeLimit, timeRemaining)
+    constructor(questions, timeLimit, timeRemaining) {
+        this.questions = questions;
+        this.timeLimit = timeLimit;
+        this.timeRemaining = timeRemaining;
+        this.correctAnswers = 0;
+        this.currentQuestionIndex = 0;
 
+    };
     // 2. getQuestion()
-
+    getQuestion() {
+        return this.questions[this.currentQuestionIndex];
+    };
+
     // 3. moveToNextQuestion()
+    moveToNextQuestion() {
+        return this.currentQuestionIndex++;
+    };
 
     // 4. shuffleQuestions()
+    shuffleQuestions = () => {
+        for (let i = this.questions.length - 1; i > 0; i--) {
+            const j = Math.floor(Math.random() * (i + 1));
+            [this.questions[i], this.questions[j]] = [this.questions[j], this.questions[i]];
+        }
+        return this.questions;
+    };
 
     // 5. checkAnswer(answer)
+    checkAnswer(answer) {
+        console.log('checking answer...')
+         console.log("Answer submitted:", answer);
+        console.log("Correct answer:", this.questions[this.currentQuestionIndex].answer);
+
+        if (answer === this.questions[this.currentQuestionIndex].answer) {
+            this.correctAnswers++
+        }
+         return this.correctAnswers;
+    };
 
     // 6. hasEnded()
-}
+    hasEnded() {
+        if (this.currentQuestionIndex < this.questions.length) {
+            return false
+        }
+        else if (this.currentQuestionIndex = this.questions.length) {
+            return true
+        }
+    }
+
+
+    filterQuestionsByDifficulty(difficulty) {
+        const validDifficulties = [1, 2, 3];
+
+        if (!validDifficulties.includes(difficulty)) {
+            return this.questions;
+        }
+        this.questions = this.questions.filter(
+            (question) => question.difficulty === difficulty
+        );
+    }
+
+    averageDifficulty() {
+        const total = this.questions.reduce((sum, question) => {
+            return sum + question.difficulty
+        }, 0);
+        return Math.round((total / this.questions.length) * 10) / 10;
+    }
+}
+/*const questions = [
+  { text: "Question 1", choices: ["a", "b", "c"], answer: "a", difficulty: 1 },
+  { text: "Question 2", choices: ["d", "e", "f"], answer: "d", difficulty: 2 },
+  { text: "Question 3", choices: ["g", "h", "i"], answer: "g", difficulty: 2 },
+  { text: "Question 4", choices: ["j", "k", "l"], answer: "j", difficulty: 3 },
+];
+
+const quiz = new Quiz(questions, 60, 60); // z. B. 60 Sekunden Zeitlimit
+
+console.log(quiz.filterQuestionsByDifficulty(1)); */