Merge branch 'cherry-pick-d4252c12' into 'master'

Merge branch '103-verschiedene-lernmodi' into 'master'

Closes #103

See merge request enrichment-2024/qivip!51

django/play/urls.py

@@ -13,4 +13,5 @@ urlpatterns = [
     path('game/<str:join_code>/scores', views.scores, name='scores'),
     path('game/<str:join_code>/finished', views.finished, name='finished'),
     path('select_mode/<str:join_code>', views.select_mode, name='select_mode'),
+    path('selected_mode/<str:join_code>', views.selected_mode, name='selected_mode'),
 ]

django/play/views.py

@@ -1,3 +1,4 @@
+from django.utils import timezone
 from django.shortcuts import render
 from django.shortcuts import render, redirect, get_object_or_404, reverse
 from play.models import QuizGame, QuizGameParticipant
@@ -7,8 +8,12 @@ from django.contrib import messages
 
 import json
 
+
 # Create your views here.
 def lobby(request, join_code):
+
+    
+    
     quiz_game = get_object_or_404(QuizGame, join_code=join_code)
     quiz = get_object_or_404(QivipQuiz, pk=quiz_game.quiz_id.id)
     context = {
@@ -16,11 +21,19 @@ def lobby(request, join_code):
         'quiz_game': quiz_game,
     }
 
+
+    mode = request.GET.get('mode','default')
+    request.session['mode'] = mode
     if "host_id" in request.COOKIES:
         host_id = request.COOKIES['host_id']
         if host_id == quiz_game.host_id:
             context['host_id'] = host_id
             return render(request, 'play/lobby.html', context=context)
+        elif mode=="learn":
+            return redirect('play:create_participant', join_code=join_code)
+        
+    
+
 
     if not "participant_id" in request.COOKIES:
         return redirect('play:create_participant', join_code=join_code)
@@ -44,8 +57,10 @@ def select_mode(request,join_code):
 
 
 def create_participant(request, join_code):
+    mode = request.GET.get('mode','default')
+    request.session['mode'] = mode
     quiz_game = get_object_or_404(QuizGame, join_code=join_code)
-
+    if mode!="learn":
      if "participant_id" in request.COOKIES:
         # Prüfe ob der Teilnehmer noch existiert
         participant_id = request.COOKIES['participant_id']
@@ -81,8 +96,11 @@ def create_participant(request, join_code):
         return response
 
      return render(request, 'play/initialize_participant.html', {'join_code': join_code})
-
+    else:
+        messages.error(request, "Beitritt nicht möglich.")
+        return render(request, 'play/join_game.html')
 def create_game(request, quiz_id):
+    
     try:
         quiz = QivipQuiz.objects.get(id=quiz_id)
         game = QuizGame()
@@ -90,6 +108,7 @@ def create_game(request, quiz_id):
         game.host_id = game.generate_unique_id()
         game.save()
 
+
         response = HttpResponseRedirect(reverse('play:select_mode', kwargs={'join_code': game.join_code}))
         response.set_cookie('host_id', game.host_id, max_age=3600)
         
@@ -151,9 +170,18 @@ def scores(request, join_code):
     current_question = questions[quiz_game.current_question_index]
     question_data = json.loads(current_question.data)
     
+    try:
+        my_participant = request.session.get('my_participant-participant_id')
+        participant = QuizGameParticipant.objects.get(participant_id=my_participant)
+        my_participant=participant
+    except:
+        participant = QuizGameParticipant.objects.none()
+
     return render(request, 'play/game/score_overview.html', {
         'quiz_game': quiz_game,
         'participants': participants,
+        'participant': participant,
+        'my_participant':my_participant,
         'is_host': is_host,
         'host_id': quiz_game.host_id if is_host else None,
         'is_last_question': quiz_game.current_question_index + 1 >= len(questions),
@@ -229,8 +257,11 @@ def question(request, join_code):
     participant_id = request.COOKIES['participant_id']
     try:
         participant = QuizGameParticipant.objects.get(participant_id=participant_id)
+        
+   
     except QuizGameParticipant.DoesNotExist:
         return redirect('play:create_participant', join_code=join_code)
+    request.session['my_participant-participant_id'] = participant.participant_id
     
     return render(request, 'play/game/question_participant.html', {
         'quiz_game': quiz_game,
@@ -263,3 +294,42 @@ def waiting_room(request, join_code):
         'quiz_game': quiz_game,
         'participant': participant
     })
+
+
+def selected_mode(request, join_code):
+     
+    
+    mode = request.GET.get('mode','default')
+    request.session['mode'] = mode
+    quiz_game = get_object_or_404(QuizGame, join_code=join_code)
+    quiz = get_object_or_404(QivipQuiz, pk=quiz_game.quiz_id.id)
+    QuizGameParticipant.objects.filter(quiz_game=quiz_game).delete()
+   
+    context = {
+        'quiz': quiz,
+        'quiz_game': quiz_game,
+    }
+    if "host_id" in request.COOKIES:
+        host_id = request.COOKIES['host_id']
+        if host_id == quiz_game.host_id:
+            context['host_id'] = host_id
+
+        if mode=="learn":
+            participant = QuizGameParticipant()
+            if request.user.is_authenticated:
+                participant.display_name = request.user.username
+            else:
+                participant.display_name = "SIE"
+  
+            participant.participant_id=host_id
+            participant.quiz_game = quiz_game
+            participant.score = 0  # Initialize score
+            participant.save()
+            quiz_game.current_state = "question"
+            quiz_game.question_start_time = timezone.now()
+            quiz_game.save()
+  
+            return redirect('play:question',join_code)
+        
+        
+        return render(request, 'play/lobby.html', context=context)

django/templates/play/game/finished.html

@@ -7,7 +7,7 @@
         <div class="bg-white rounded-lg shadow-md p-8 mb-6">
             <div class="text-center mb-8">
                 <h1 class="text-4xl font-bold text-blue-600 mb-4">Quiz beendet!</h1>
-                <p class="text-xl text-gray-600">Vielen Dank fürs Mitspielen!</p>
+                <p class="text-xl text-gray-600">Vielen Dank fürs Spielen!</p>
             </div>
                     
             {% if not is_host %}

django/templates/play/game/question_host.html

@@ -1,34 +1,55 @@
 {% extends 'base.html' %}
-
 {% block content %}
+
+{% if request.session.mode == "learn" %}
+
 <div class="container mx-auto px-4">
+    <div class="flex justify-end mb-4">
+        <button onclick="leaveGame()" class="bg-red-500 hover:bg-red-600 text-white font-bold py-2 px-4 rounded">
+            Spiel verlassen
+        </button>
+    </div>{% endif %}
     <div class="bg-white rounded-lg shadow-md p-6 mb-6">
         <p class="text-gray-700 font-bold text-xl mb-4">Frage {{ question_index|add:1 }} von {{ total_questions }}</p>
         <h1 class="text-3xl font-bold mb-6">{{ question_data.question }}</h1>
-        
+        {% if request.session.mode == "learn" %} 
+        <div class="grid grid-cols-1 gap-4 mb-6">
+            {% else %}
             <div class="grid grid-cols-2 gap-4 mb-6">
+                {% endif %}
+                {% if request.session.mode != "learn" %} 
             <div class="p-4 bg-blue-50 rounded-lg">
                 <p class="text-blue-600 text-xl mb-2">Verbleibende Zeit </p>
                 <p id="remaining-time" class="text-6xl font-bold text-blue-700">30</p>
             </div>
+            {% endif %}
+
             <div class="p-4 bg-blue-50 rounded-lg">
                 <p class="text-blue-600 text-xl mb-2">Antworten</p>
                 <p id="answer-count" class="text-6xl font-bold text-blue-700">0/0</p>
             </div>
         </div>
 
-        <div class="grid grid-cols-2 gap-4">
+        <div class="grid grid-cols-2 gap-4" id="options-container">
             {% for option in question_data.options %}
-                <div class="p-4 bg-gray-100 rounded-lg" data-correct="{{ option.is_correct }}">
+                <button 
+                    class="p-4 bg-gray-100 hover:bg-blue-100 rounded-lg transition-colors duration-200 answer-option"
+                    data-index="{{ forloop.counter0 }}"
+                    {% if request.session.mode == "learn" %}
+                    onclick="submitAnswer({{ forloop.counter0 }});" {% endif %}>
                     <p class="text-lg">{{ option.value }}</p>
-                    <p id="option-count-{{ forloop.counter0 }}" class="text-gray-600 hidden">0 Antworten</p>
+                </button>
-                </div>
             {% endfor %}
         </div>
+
+
+
     </div>
 </div>
 {% endblock %}
 
+
+
 {% block extra_js %}
 {% include 'play/game/common_scripts.html' %}
 <script>
@@ -85,7 +106,7 @@
         // Show correct answers and answer counts
         var correctOptions = document.querySelectorAll('[data-correct="True"]');
         for (var i = 0; i < correctOptions.length; i++) {
-            correctOptions[i].classList.add('border-2', 'border-green-500');
+            correctOptions[i].classList.add('border-2', 'border-blue-500');
         }
         
         // Show answer counts
@@ -104,6 +125,7 @@
     }
 
     // Timer
+    {% if request.session.mode != "learn" %}
     function updateTimer() {
         const now = Date.now();
         const elapsed = now - questionStartTime;
@@ -118,6 +140,9 @@
         }
     }
 
+    
+    {% endif %}
+    
     // Request initial participants list
     gameSocket.onopen = function(e) {
         gameSocket.send(JSON.stringify({
@@ -125,5 +150,51 @@
         }));
         updateTimer();
     };
+
+    
+    let hasAnswered = false;
+    const participantId = '{{ host_id }}'; // HIER IST DER HOST DER SPIELER
+
+    function leaveGame() {
+        if (confirm('Möchtest du das Spiel wirklich verlassen?')) {
+            gameSocket.send(JSON.stringify({
+                type: 'leave_game',
+                participant_id: participantId
+            }));
+            window.location.href = '/';
+            gameSocket.close();
+        }
+    }
+
+    
+
+    function submitAnswer(optionIndex) {
+        if (hasAnswered) return;
+        
+        hasAnswered = true;
+        const now = Date.now();
+        const timeRemaining = Math.max(0, questionDuration - (now - questionStartTime));
+
+        // Disable all options and highlight selected
+        const options = document.getElementsByClassName('answer-option');
+        for (let option of options) {
+            option.disabled = true;
+            option.classList.remove('hover:bg-blue-100');
+            if (parseInt(option.dataset.index) === optionIndex) {
+                option.classList.remove('bg-gray-100');
+                option.classList.add('bg-blue-600', 'text-white');
+            } else {
+                option.classList.add('opacity-50');
+            }
+        }
+
+        // Send answer to server
+        gameSocket.send(JSON.stringify({
+            type: 'submit_answer',
+            participant_id: participantId,
+            answer: optionIndex,
+            time_remaining: timeRemaining
+        }));
+    }
 </script>
 {% endblock %}

django/templates/play/game/score_overview.html

@@ -17,11 +17,14 @@
                 {% endfor %}
             </div>
         </div>
+    {% if request.session.mode != "learn" %} 
     
         <div class="mb-6">
             <h2 class="text-xl font-bold mb-4">Punktestand</h2>
             <div class="space-y-2">
                 {% for participant in participants %}
+                {% if participant == my_participant or is_host %}
+                
                     <div class="p-4 {% if forloop.first %}bg-yellow-100 border-2 border-yellow-500{% else %}bg-gray-100{% endif %} rounded-lg flex justify-between items-center">
                         <div>                    
                              <p class="text-lg font-bold">{{ participant.display_name }}</p>
@@ -33,10 +36,17 @@
                             <span class="text-red-500">✗</span>
                         {% endif %}
                     </div>
+                    {% else %}
+
+
+                    {% endif %}
+                    
+
+
                 {% endfor %}
             </div>
         </div>
-
+        {% endif %}
         {% if is_host %}
             {% if is_last_question %}
                 <button id="finish-button" class="w-full p-3 rounded-full bg-blue-600 text-white font-bold hover:bg-blue-700 transition-colors duration-200">
@@ -112,7 +122,8 @@
             if (stats.hasOwnProperty(optionIndex)) {
                 var element = document.getElementById('option-count-' + optionIndex);
                 if (element) {
-                    element.textContent = stats[optionIndex] + ' Antworten';
+                    
+                    element.textContent = stats[optionIndex] + ' Antwort(en)';
                 }
             }
         }

django/templates/play/lobby.html

@@ -7,11 +7,13 @@
         <!-- Quiz Info -->
         <div class="text-center mb-8">
             <h3 class="text-xl text-gray-600 mb-2">{{ quiz.name }}</h3>
+            {% if request.session.mode != "learn" %}
             <div class="bg-blue-100 rounded-lg p-4 mb-4">
                 <h1 class="text-4xl font-bold text-blue-800">{{ quiz_game.join_code }}</h1>
                 <p class="text-sm text-blue-600 mt-1">Spiel-Code</p>
             </div>
         </div>
+        {% endif %}
 
         <!-- Participant Info -->
         {% if participant %}

django/templates/play/select_mode.html

@@ -6,10 +6,10 @@
     <div class="rounded-md rounded-xl shadow-lg border-3 border-blue-100 p-10">
        <span class="flex justify-center font-bold p-4 text-center text-1xl lg:text-2xl">Bitte wählen Sie einen Spielmodus aus:</span> 
 
-        <div class="grid sm:grid-cols-3 place-items-stretch text-center gap-4 p-4">
+        <div class="grid sm:grid-cols-2 place-items-stretch text-center gap-4 p-4">
             
             <!-- Moderieren -->
-            <a class="qp-a-button bg-green-500 text-white flex justify-center items-center relative group h-20 gap-2" href="{% url 'play:lobby' join_code %}">
+            <a class="qp-a-button bg-green-500 text-white flex justify-center items-center relative group h-20 gap-2" href="{% url 'play:selected_mode' join_code %}?mode=classic">
                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-6">
                     <path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
                   </svg>
@@ -22,7 +22,7 @@
             </a>
 
             <!-- Lernmodus -->
-            <a class="qp-a-button bg-indigo-500 text-white flex justify-center items-center relative group h-20 gap-2" href="#">
+            <a class="qp-a-button bg-indigo-500 text-white flex justify-center items-center relative group h-20 gap-2" href="{% url 'play:selected_mode' join_code %}?mode=learn">
                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-6">
                     <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 6a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0ZM4.501 20.118a7.5 7.5 0 0 1 14.998 0A17.933 17.933 0 0 1 12 21.75c-2.676 0-5.216-.584-7.499-1.632Z" />
                   </svg>
@@ -34,18 +34,6 @@
                 </span>
             </a>
 
-            <!-- Testmodus -->
-            <a class="qp-a-button bg-purple-500 text-white flex justify-center items-center relative group h-20 gap-2" href="#">
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="size-6">
-                    <path stroke-linecap="round" stroke-linejoin="round" d="M10.125 2.25h-4.5c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125v-9M10.125 2.25h.375a9 9 0 0 1 9 9v.375M10.125 2.25A3.375 3.375 0 0 1 13.5 5.625v1.5c0 .621.504 1.125 1.125 1.125h1.5a3.375 3.375 0 0 1 3.375 3.375M9 15l2.25 2.25L15 12" />
-                  </svg>
-                  
-                 Testmodus
-                <!-- Tooltip -->
-                <span class="absolute w-full h-1/2 top-1/4 left-0 hidden group-hover:flex items-center justify-center text-white bg-black bg-opacity-90 text-xs rounded px-2 z-10 pointer-events-none">
-                    Ideal für die Schule (mit Feedback für Lehrkraft)
-                </span>
-            </a>
         </div>
     </div>
 </div>