updates

app.py

@@ -52,30 +52,6 @@ def on_leave():
         emit('update_participants', {"participants": participants, "count": len(participants)}, room='quiz')
         print(f"{username} left the quiz.")
 
-#@socketio.on('load_quiz')
-def load_quiz_old(data):
-    global selected_questions
-    exam_name = data['exam_name']
-    start_question = data['start_question'] - 1  # Adjust for 0-based indexing
-    selected_questions = backend.select_exam(exam_name)
-    if selected_questions:
-        num_questions = len(selected_questions)
-        current_question['index'] = start_question
-        emit('quiz_loaded', {"success": True, "num_questions": num_questions, "start_question": start_question + 1}, room=request.sid)
-    else:
-        emit('quiz_loaded', {"success": False}, room=request.sid)
-
-#@socketio.on('load_quiz')
-def load_quiz_new1(data):
-    global selected_questions
-    exam_name = data['exam_name']
-    selected_questions = backend.select_exam(exam_name)
-    if selected_questions:
-        num_questions = len(selected_questions)
-        emit('quiz_loaded', {"success": True, "num_questions": num_questions}, room=request.sid)
-    else:
-        emit('quiz_loaded', {"success": False}, room=request.sid)
-
 @socketio.on('load_quiz')
 def load_quiz(data):
     global selected_questions, current_question
@@ -85,29 +61,29 @@ def load_quiz(data):
     if selected_questions:
         num_questions = len(selected_questions)
         current_question['index'] = start_question  # Set the starting question index
-        emit('quiz_loaded', {"success": True, "num_questions": num_questions}, room=request.sid)
+        #emit('quiz_loaded', {"success": True, "num_questions": num_questions}, room=request.sid)
+        emit('quiz_loaded', {"success": True, "num_questions": num_questions, "start_question": start_question + 1}, room=request.sid)
+
     else:
         emit('quiz_loaded', {"success": False}, room=request.sid)
 
-
-
 #@socketio.on('start_quiz')
-def start_quiz_old():
-    if participants and selected_questions:
-        current_question['started'] = True
-        emit('new_question', selected_questions[current_question['index']], room='quiz')
-        # Also emit the question to the host 
-        emit('new_question', selected_questions[current_question['index']], room=request.sid)  
-        emit('enable_end_quiz', room=request.sid) # Enable "End Quiz" for the host
+#def start_quiz():
+#    if participants and selected_questions:
+#        current_question['started'] = True
+#        index = current_question['index']
+#        emit('new_question', selected_questions[index], room='quiz')
+#        # Also emit the question to the host
+#        emit('new_question', selected_questions[index], room=request.sid)
+#        emit('enable_end_quiz', room=request.sid)  # Enable "End Quiz" for the host
 
 @socketio.on('start_quiz')
 def start_quiz():
     if participants and selected_questions:
         current_question['started'] = True
         index = current_question['index']
-        emit('new_question', selected_questions[index], room='quiz')
-        # Also emit the question to the host
-        emit('new_question', selected_questions[index], room=request.sid)
+        question = selected_questions[index]
+        emit('new_question', {"question": question["question"], "options": question["options"], "index": index + 1}, room='quiz')
         emit('enable_end_quiz', room=request.sid)  # Enable "End Quiz" for the host
 
 
@@ -143,6 +119,20 @@ def check_answers():
             if current_question['answers'].get(participant["username"]) == correct_answer:
                 participants[sid]["score"] += 1
 
+#@socketio.on('next_question')
+#def next_question():
+#    current_question['index'] += 1
+#    current_question['answers'] = {}
+#    if current_question['index'] < len(selected_questions):
+#        question = selected_questions[current_question['index']]
+#        emit('clear_results', room='quiz')
+#        emit('new_question', question, room='quiz')
+#        # Also emit the question to the host
+#        emit('new_question', question, room=request.sid)  
+#    else:
+#        final_results = calculate_final_results()
+#        emit('display_final_results', final_results, room='quiz')
+
 @socketio.on('next_question')
 def next_question():
     current_question['index'] += 1
@@ -150,13 +140,12 @@ def next_question():
     if current_question['index'] < len(selected_questions):
         question = selected_questions[current_question['index']]
         emit('clear_results', room='quiz')
-        emit('new_question', question, room='quiz')
-        # Also emit the question to the host
-        emit('new_question', question, room=request.sid)  
+        emit('new_question', {"question": question["question"], "options": question["options"], "index": current_question['index'] + 1}, room='quiz')
     else:
         final_results = calculate_final_results()
         emit('display_final_results', final_results, room='quiz')
 
+
 @socketio.on('end_quiz')
 def end_quiz():
     if current_question['started']:  # Ensure the quiz has started before ending it

static/script.js

@@ -29,17 +29,7 @@ function selectExam() {
     document.getElementById('question-start-display').textContent = `Starting from question ${startQuestion}.`;
 }
 
-function loadQuiz_old() {
-    const examName = document.getElementById('exam-selector').value;
-    const startQuestion = parseInt(document.getElementById('start-question-number').value, 10);
-
-    if (!examName) {
-        alert("Please select an exam first.");
-        return;
-    }
 
-    socket.emit('load_quiz', { exam_name: examName, start_question: startQuestion });
-}
 function loadQuiz() {
     const examName = document.getElementById('exam-selector').value;
     const startQuestion = parseInt(document.getElementById('start-question-number').value, 10);
@@ -83,14 +73,13 @@ function restartQuiz() {
 socket.on('quiz_loaded', (data) => {
     if (data.success) {
         alert(`Quiz loaded with ${data.num_questions} questions.`);
-
-        // Update the range and number input max values dynamically
         const startQuestionInput = document.getElementById('start-question');
         const startQuestionNumber = document.getElementById('start-question-number');
         startQuestionInput.max = data.num_questions;
         startQuestionNumber.max = data.num_questions;
-
-        // Show the start question controls
+        startQuestionInput.value = data.start_question;
+        startQuestionNumber.value = data.start_question;
+        document.getElementById('question-start-display').textContent = `Starting from question ${data.start_question}.`;
         document.getElementById('start-question-label').style.display = 'block';
         startQuestionInput.style.display = 'block';
         startQuestionNumber.style.display = 'block';
@@ -103,8 +92,7 @@ socket.on('quiz_loaded', (data) => {
 
 socket.on('new_question', (data) => {
     document.getElementById('waiting-message').style.display = 'none';
-    document.getElementById('question-text').innerText = data.question;
-    // Dynamically generate letters for options (up to 'h')
+    document.getElementById('question-text').innerText = `Question ${data.index}: ${data.question}`;
     const letters = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']; 
     const options = data.options.map((opt, index) =>
         `<input type="radio" id="${letters[index]}" name="answer" value="${opt}">
@@ -113,6 +101,8 @@ socket.on('new_question', (data) => {
     document.getElementById('options').innerHTML = options;
 });
 
+
+
 socket.on('display_results', (data) => {
     const img = `<img src="data:image/png;base64,${data.chart}" alt="Results Chart" />`;
     const resultText = `<p>Correct Answer: ${data.results.correct_answer}</p>`;