Application changes

app.py

@@ -44,12 +44,22 @@ def quiz():
     if request.method == 'POST':
         action = request.form.get('action')
         if action == 'next':
+            question = session['questions'][session['current_question']]
+            multiple_selection = 'SELECT TWO' in question['question'] or 'SELECT THREE' in question['question']
             answers = request.form.getlist('answer')
-            if answers:
-                session['answers'].append(answers)
-                correct_answers = session['questions'][session['current_question']]['correct']
-                if set(answers) == set(correct_answers):
-                    session['score'] += 1
+            if multiple_selection:
+                required_answers = 2 if 'SELECT TWO' in question['question'] else 3
+                if len(answers) == required_answers:
+                    session['answers'].append(answers)
+                    correct_answers = [str(int(x) + 1) for x in question['correct']]
+                    if set(answers) == set(correct_answers):
+                        session['score'] += 1
+            else:
+                if answers:
+                    session['answers'].append(answers)
+                    correct_answers = [str(int(x) + 1) for x in question['correct']]
+                    if set(answers) == set(correct_answers):
+                        session['score'] += 1
             session['current_question'] += 1
             if session['current_question'] >= len(session['questions']):
                 return redirect(url_for('results'))
@@ -61,7 +71,7 @@ def quiz():
             return redirect(url_for('results'))
 
     question = session['questions'][session['current_question']]
-    multiple_selection = 'SELECT TWO' in question['question'].upper() or 'SELECT THREE' in question['question'].upper() or 'CHOOSE TWO' in question['question'].upper() or 'CHOOSE THREE' in question['question'].upper()
+    multiple_selection = 'SELECT TWO' in question['question'] or 'SELECT THREE' in question['question']
     elapsed_time = time.time() - session['start_time']
     elapsed_time_str = time.strftime('%H:%M:%S', time.gmtime(elapsed_time))
 

templates/quiz.html

@@ -22,12 +22,21 @@
     <h1>Question {{ question_number }} of {{ total_questions }} - {{ selected_file }} <span id="timer"></span></h1>
     <p>{{ question.question }}</p>
     <form action="{{ url_for('quiz') }}" method="post">
-        {% for option in question.options %}
-            <label style="display: flex; align-items: center;">
-                <input type="checkbox" name="answer" value="{{ loop.index }}" {% if not multiple_selection %}required{% endif %}>
-                <span>{{ option }}</span>
-            </label><br>
-        {% endfor %}
+        {% if multiple_selection %}
+            {% for option in question.options %}
+                <label style="display: flex; align-items: center;">
+                    <input type="checkbox" name="answer" value="{{ loop.index }}" required>
+                    <span>{{ option }}</span>
+                </label><br>
+            {% endfor %}
+        {% else %}
+            {% for option in question.options %}
+                <label style="display: flex; align-items: center;">
+                    <input type="radio" name="answer" value="{{ loop.index }}" required>
+                    <span>{{ option }}</span>
+                </label><br>
+            {% endfor %}
+        {% endif %}
         <br>
         {% if show_previous %}
             <button type="submit" name="action" value="previous">Previous</button>