Merge branch '73-lobby-ueberarbeiten' into 'master'

Resolve "Lobby ueberarbeiten"

Closes #73

See merge request enrichment-2024/qivip!56

README.md

@@ -61,6 +61,13 @@ Für die Entwicklung mit WebSocket-Unterstützung verwenden wir Daphne:
    daphne -b 127.0.0.1 -p 8000 core.asgi:application
    ```
 
+3. Starte den REDIS Server
+   ```sh
+   redis-server
+   ```
+   > **Hinweis:** Der Redis Server muss, wenn er nicht auf dem selben Gerät unter Standardeinstellungen läuft, in der Datei play/consumers/lobby.py und core/settings.py entsprechend umkonfiguriert werden!
+
+
 Alternativ kannst du den Django-Entwicklungsserver verwenden, wenn du keine WebSocket-Funktionalität benötigst:
    ```sh
    python3 core/manage.py runserver
@@ -84,6 +91,19 @@ Für den Produktivbetrieb verwenden wir Daphne als ASGI-Server, der sowohl HTTP
    - `-b 0.0.0.0`: Bindet den Server an alle Netzwerk-Interfaces
    - `-p 8000`: Port (anpassbar)
 
+4. Cronjob für Bereinigung der Spiele in der Datenbank
+   - Zum bearbeiten der Cronjobs:
+      ```sh
+      crontab -e
+      ```
+   - Dann `0 0 * * * /path/to/venv/bin/python /path/to/your_project/manage.py cleanup_games` einfügen, damit um Mitternacht alle Spiele gelöscht werden
+
+5. Starte den REDIS Server
+   ```sh
+   redis-server
+   ```
+   > **Hinweis:** Der Redis Server muss, wenn er nicht auf dem selben Gerät unter Standardeinstellungen läuft, in der Datei play/consumers/lobby.py und core/settings.py entsprechend umkonfiguriert werden!
+
 Damit ist das Projekt erfolgreich eingerichtet und der Server kann gestartet werden!
 
 ## Superuser erstellen
@@ -138,6 +158,6 @@ Hier der vereinbarte Arbeitsablauf:
 
 1. Issue erstellen - das geht am einfachsten über die Webseite. Der Titel beschreibt kurz und klar, was angestrebt wird.
 
-2. Merge Request anlegen - dadurch wird der Bransch automatisch angelegt. Dieser kann mit `git pull` geholt und mit `git checkout <branch>` bearbeitet werden.
+2. Merge Request anlegen - dadurch wird der Branch automatisch angelegt. Dieser kann mit `git pull` geholt und mit `git checkout <branch>` bearbeitet werden.
 
 3. Nach dem Hochladen kann der Merge in den Master durchgeführt werden.

django/core/settings.py

@@ -43,6 +43,7 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'channels',
+    'django_cleanup',
 ]
 
 MIDDLEWARE = [
@@ -78,12 +79,16 @@ WSGI_APPLICATION = 'core.wsgi.application'
 ASGI_APPLICATION = 'core.asgi.application'
 
 CHANNEL_LAYERS = {
-    'default': {
-        'BACKEND': 'channels.layers.InMemoryChannelLayer'
-    }
+    "default": {
+        "BACKEND": "channels_redis.core.RedisChannelLayer",
+        "CONFIG": {
+            "hosts": [("127.0.0.1", 6379)],
+        },
+    },
 }
 
 
+
 # Database
 # https://docs.djangoproject.com/en/5.1/ref/settings/#databases
 

django/library/forms.py

@@ -4,12 +4,12 @@ from .models import QivipQuiz, QivipQuestion
 class QuizForm(forms.ModelForm):
     class Meta:
         model = QivipQuiz
-        fields = ['name', 'description','image', 'status', 'category', "difficulty","credits"]
+        fields = ['name', 'description','image', 'status', 'category','difficulty','credits']
 
 class QuestionForm(forms.ModelForm):
     class Meta:
         model = QivipQuestion
-        fields = ['quiz_id', 'data']
+        fields = ['quiz_id', 'data','time_per_question']
 
 from django import forms
 

django/library/management/commands/cleanup_games.py

@@ -0,0 +1,13 @@
+from django.core.management.base import BaseCommand
+from play.models import QuizGame
+from django.utils import timezone
+
+class Command(BaseCommand):
+    help = 'Bereinigt beendete Spiele'
+
+    def handle(self, *args, **kwargs):
+        expired_games = QuizGame.objects.filter(
+            updated_at__lt=timezone.now() - timezone.timedelta(minutes=5))
+        deleted_count = expired_games.count()
+        expired_games.delete()
+        self.stdout.write(f'{deleted_count} alte Spiele gelöscht.')

django/library/migrations/0033_qivipquestion_time_per_question.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-04-08 14:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0032_qivipquiz_average_rating_qivipquiz_rating_count_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='qivipquestion',
+            name='time_per_question',
+            field=models.CharField(choices=[('10', 10), ('15', 15), ('30', 30), ('60', 60), ('90', 90), ('120', 120), ('180', 180), ('nicht gesetzt', 'nicht gesetzt')], default=30, help_text='Zeit pro Frage in Sekunden', max_length=13),
+        ),
+    ]

django/library/migrations/0034_alter_qivipquestion_time_per_question.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-04-08 14:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0033_qivipquestion_time_per_question'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquestion',
+            name='time_per_question',
+            field=models.CharField(choices=[('10', 10), ('15', 15), ('30', 30), ('60', 60), ('90', 90), ('120', 120), ('180', 180)], default=30, help_text='Zeit pro Frage in Sekunden', max_length=13),
+        ),
+    ]

django/library/migrations/0035_alter_qivipquestion_time_per_question.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-04-08 14:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0034_alter_qivipquestion_time_per_question'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquestion',
+            name='time_per_question',
+            field=models.CharField(choices=[('10', 10), ('15', 15), ('30', 30), ('60', 60), ('90', 90), ('120', 120), ('180', 180)], default=30, help_text='Zeit pro Frage in Sekunden', max_length=3),
+        ),
+    ]

django/library/migrations/0047_merge_20250418_1334.py

@@ -0,0 +1,14 @@
+# Generated by Django 5.1.7 on 2025-04-18 11:34
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0035_alter_qivipquestion_time_per_question'),
+        ('library', '0046_alter_qivipquizfavorite_favorite_date'),
+    ]
+
+    operations = [
+    ]

django/library/migrations/0048_qivipquestion_image.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-04-18 11:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0047_merge_20250418_1334'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='qivipquestion',
+            name='image',
+            field=models.ImageField(blank=True, height_field=900, max_length=200, null=True, upload_to='question_images/', verbose_name='Bild', width_field=1000),
+        ),
+    ]

django/library/migrations/0049_alter_qivipquestion_image.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-04-18 19:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0048_qivipquestion_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquestion',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to='question_images/', verbose_name='Bild'),
+        ),
+    ]

django/library/models.py

@@ -19,6 +19,9 @@ class QivipQuiz(models.Model):
         "nicht gesetzt":"nicht gesetzt",
 
     }
+
+
+
         
     def validate_description(value):
         if value.strip() == "In dem Quiz geht es um ...":
@@ -55,12 +58,23 @@ class QivipQuizFavorite(models.Model):
 
 # Create your models here.
 class QivipQuestion(models.Model):
+    
+    TIME_VALUES = {
+        "10": 10,
+        "15": 15,
+        "30": 30,
+        "60": 60,
+        "90": 90,
+        "120": 120,
+        "180": 180,
+    }
     uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
     quiz_id = models.ForeignKey(QivipQuiz, on_delete=models.CASCADE, related_name='questions')
     creation_date = models.DateTimeField(auto_now_add=True)
     update_date = models.DateTimeField(auto_now=True)
     data = models.TextField()
-
+    time_per_question = models.CharField(max_length=3, choices=list(TIME_VALUES.items()), default=30, help_text="Zeit pro Frage in Sekunden")
+    image = models.ImageField(verbose_name="Bild", upload_to="question_images/", blank=True, null=True)
     def __str__(self):
         return self.data[:50]
 

django/library/views.py

@@ -176,23 +176,17 @@ def favorite_quiz(request, pk):
             
             statement="Das Quiz '"+ favorite.quiz.name+ "' wurde erfolgreich zu den Favoriten hinzugefügt!"
             messages.success(request,statement )
+            favorite.save()
         else:
             favorite.favorite_date = None
-            
-            statement="Das Quiz '"+ favorite.quiz.name+ "' wurde erfolgreich von den  Favoriten entfernt!"
+            favorite.delete()
+            statement="Das Quiz '"+ favorite.quiz.name+ "' wurde erfolgreich von den Favoriten entfernt!"
             messages.error(request, statement)
     
-        favorite.save()
+        
     else:
        QivipQuizFavorite.objects.create(user=request.user, quiz=quiz, favorite=True, favorite_date=timezone.now())
-    """
-    referer = request.META.get('HTTP_REFERER')
-    if referer and 'library/' in referer:
-   
-        return redirect(request.META.get('HTTP_REFERER', 'library:overview_quiz'))
-    else:
-        return overview_quiz(request)
-    """
+
     return redirect(request.META.get('HTTP_REFERER', 'library:overview_quiz'))
     
     
@@ -255,33 +249,7 @@ def detail_quiz(request, pk):
         'detail':show_answers,
     }
     return render(request, 'library/detail_quiz.html', context)
-"""
-def modified(request, pk):
 
-        original_quiz = get_object_or_404(QivipQuiz, pk=pk)           
-        words=original_quiz.modified_description.split()
-        word_exist=0
-        print(original_quiz.creator.username)
-        print(request.user.username)
-       
-        for word in words:
-            
-            if word==request.user.username or word+","==request.user.username:
-                word_exist=1
-
-
-        if word_exist==0 and len(words)!=0 and request.user.username!=original_quiz.creator.username:
-                    original_quiz.modified_description  +=", "+ request.user.username
-                    
-                   
-        elif word_exist==0 and request.user.username!=original_quiz.creator.username:
-                original_quiz.modified_description  +=" "+ request.user.username
-                    
-        original_quiz.save()
-      
-        return redirect('library:detail_quiz', pk=pk)
-        
-"""
 
 @login_required
 def copy_quiz(request, pk):
@@ -298,6 +266,8 @@ def copy_quiz(request, pk):
     new_quiz.user_id = request.user  # Neuer Besitzer ist der aktuelle User
     new_quiz.name += " - Kopie"  # Optional: Name anpassen
     new_quiz.base_quiz_id = pk
+    new_quiz.rating_count = 0
+    new_quiz.average_rating = 3.0
     #new_quiz.creator = original_quiz.creator or request.user
     new_quiz.save()  # Speichern als neues Objekt 
    # Optional: Beschreibung anpassen
@@ -348,6 +318,7 @@ def new_question(request):
         
     if request.method == 'POST':
         question_text = request.POST.get('question', '')
+        question_image = request.FILES.get('question_image', None)
         
         # Handle different question types
         if question_type == 'true_false':
@@ -387,6 +358,8 @@ def new_question(request):
         question = QivipQuestion()
         question.data = json.dumps(json_data)
         question.quiz_id = quiz
+        question.image = question_image
+        question.time_per_question = request.POST.get('time_per_question', '30')
         question.save()
         #return modified(request, pk=quiz.pk)
         return redirect('library:detail_quiz', pk=quiz.pk)
@@ -401,6 +374,7 @@ def new_question(request):
                     {'value': 'Falsch', 'is_correct': False}
                 ]
             }
+            standard_time_per_question = 30
         elif question_type == 'multiple_choice':
             question_data = {
                 'type': question_type,
@@ -410,12 +384,14 @@ def new_question(request):
                     {'value': '', 'is_correct': False}
                 ]
             }
+            standard_time_per_question = 30
     
     template_name = f'library/question/question_{question_type}.html'
     context = {
         'question': question_data,
         'quiz_id': quiz_id,
-        'quiz': quiz
+        'quiz': quiz,
+        'standard_time_per_question': standard_time_per_question,
     }
     
     return render(request, template_name, context)
@@ -431,6 +407,7 @@ def edit_question(request, pk):
     try:
         question_data = json.loads(question.data) if question.data else {}
         question_type = question_data.get('type', 'multiple_choice')
+        question_image = question.image
         
         # For true/false questions, get the correct answer from the options
         if question_type == 'true_false':
@@ -475,7 +452,11 @@ def edit_question(request, pk):
         
     if request.method == 'POST':
         question_text = request.POST.get('question', '')
-        
+        try:
+            question_image = request.FILES['question_image']
+        except Exception:
+            pass
+
         # Handle different question types
         if question_type == 'true_false':
             correct_answer = request.POST.get('correct_answer') == 'true'
@@ -516,6 +497,8 @@ def edit_question(request, pk):
             }
             
         question.data = json.dumps(json_data)
+        question.time_per_question = request.POST.get('time_per_question', '30')
+        question.image = question_image
         question.save()
         #return modified(request, question.quiz_id.pk)
         return redirect('library:detail_quiz', pk=question.quiz_id.pk)
@@ -525,7 +508,9 @@ def edit_question(request, pk):
         context = {
             'question': {'data': question_data},  # Wrap in data structure expected by template
             'quiz_id': question.quiz_id.pk,
-            'quiz': question.quiz_id
+            'quiz': question.quiz_id,
+            'time_per_question': question.time_per_question,
+            'image': question_image,
         }
         
         return render(request, template_name, context)

django/play/consumers/game.py

@@ -9,75 +9,7 @@ from datetime import timedelta
 
 from play.models import QuizGame, QuizGameParticipant, QuizAnswer
 
-# Dictionary to track inactive check tasks per game
-game_check_tasks = {}
-
-
 class GameConsumer(AsyncWebsocketConsumer):
-    @classmethod
-    async def start_inactive_check(cls, join_code, channel_layer):
-        """Start the inactive player check for a game if not already running."""
-        if join_code not in game_check_tasks or game_check_tasks[join_code].done():
-            async def check_inactive_players():
-                game_group_name = f'game_{join_code}'
-                while True:
-                    try:
-                        await asyncio.sleep(30)  # Check every 30 seconds
-                        try:
-                            game = await database_sync_to_async(QuizGame.objects.get)(join_code=join_code)
-                            cutoff_time = timezone.now() - timedelta(minutes=1)
-                            
-                            # Get active and inactive participants
-                            all_participants = await database_sync_to_async(lambda: list(
-                                game.participants.all().values('participant_id', 'display_name', 'last_heartbeat')
-                            ))()
-                            
-                            # Konvertiere datetime zu ISO Format String
-                            for p in all_participants:
-                                if p['last_heartbeat']:
-                                    p['last_heartbeat'] = p['last_heartbeat'].isoformat()
-                            
-                            active_participants = [p for p in all_participants if p['last_heartbeat'] and timezone.datetime.fromisoformat(p['last_heartbeat']) >= cutoff_time]
-                            inactive_participants = [p for p in all_participants if not p['last_heartbeat'] or timezone.datetime.fromisoformat(p['last_heartbeat']) < cutoff_time]
-                            
-                            # Remove inactive participants
-                            if inactive_participants:
-                                for p in inactive_participants:
-                                    # Benachrichtige andere über den gekickten Spieler
-                                    await channel_layer.group_send(
-                                        game_group_name,
-                                        {
-                                            'type': 'player_left',
-                                            'player_name': p['display_name'],
-                                            'was_kicked': True
-                                        }
-                                    )
-                                    # Lösche den inaktiven Teilnehmer
-                                    await database_sync_to_async(QuizGameParticipant.objects.filter(
-                                        participant_id=p['participant_id']
-                                    ).delete)()
-                            
-                            # Broadcast update to all clients
-                            if active_participants or inactive_participants:
-                                await channel_layer.group_send(
-                                    game_group_name,
-                                    {
-                                        'type': 'participant_list_update',
-                                        'participants': active_participants
-                                    }
-                                )
-                        except QuizGame.DoesNotExist:
-                            break  # Stop checking if game no longer exists
-                        except Exception as e:
-                            print(f'Error checking inactive players in game: {e}')
-                            await asyncio.sleep(5)  # Wait before retry
-                    except asyncio.CancelledError:
-                        break
-                    except Exception as e:
-                        print(f'Error in game inactive check loop: {e}')
-                        await asyncio.sleep(5)
-
-            game_check_tasks[join_code] = asyncio.create_task(check_inactive_players())
 
     async def connect(self):
         self.join_code = self.scope['url_route']['kwargs']['join_code']
@@ -90,9 +22,6 @@ class GameConsumer(AsyncWebsocketConsumer):
         )
 
         await self.accept()
-        
-        # Ensure inactive check is running for this game
-        await self.start_inactive_check(self.join_code, self.channel_layer)
 
     async def disconnect(self, close_code):
         # Leave game group
@@ -145,21 +74,6 @@ class GameConsumer(AsyncWebsocketConsumer):
                 except QuizGameParticipant.DoesNotExist:
                     pass
             return
-            
-        if message_type == 'heartbeat':
-            participant_id = text_data_json.get('participant_id')
-            if participant_id:
-                await self.update_participant_heartbeat(participant_id)
-                # Update participants list after heartbeat
-                participants = await self.get_participants()
-                await self.channel_layer.group_send(
-                    self.game_group_name,
-                    {
-                        'type': 'participant_list_update',
-                        'participants': participants
-                    }
-                )
-            return
 
         if message_type == 'submit_rating':
             participant_id = text_data_json['participant_id']
@@ -250,17 +164,6 @@ class GameConsumer(AsyncWebsocketConsumer):
             'redirect_url': event.get('redirect_url')
         }))
 
-    async def update_participant_heartbeat(self, participant_id):
-        """Update the last heartbeat timestamp for a participant."""
-        try:
-            participant = await database_sync_to_async(QuizGameParticipant.objects.get)(
-                participant_id=participant_id
-            )
-            participant.last_heartbeat = timezone.now()
-            await database_sync_to_async(participant.save)()
-        except QuizGameParticipant.DoesNotExist:
-            pass
-
     @database_sync_to_async
     def verify_host(self, host_id):
         try:
@@ -368,21 +271,17 @@ class GameConsumer(AsyncWebsocketConsumer):
     def cleanup_game(self):
         try:
             game = QuizGame.objects.get(join_code=self.join_code)
-            
-            # Get all active participants (heartbeat within last minute)
-            from django.utils import timezone
+
             active_participants = QuizGameParticipant.objects.filter(
-                quiz_game=game,
-                last_heartbeat__gte=timezone.now() - timezone.timedelta(minutes=1)
+                quiz_game=game
             ).count()
-            
-            # If no active participants and game is finished for more than 5 minutes, delete it
-            if active_participants == 0 and game.current_state == 'finished':
-                if game.question_start_time and (timezone.now() - game.question_start_time).total_seconds() > 300:
-                    game.delete()
+
+            if active_participants == 0:
+                game.delete()
         except QuizGame.DoesNotExist:
             pass
 
+
     @database_sync_to_async
     def get_participants(self):
         try:

django/play/consumers/lobby.py

@@ -3,53 +3,15 @@ import json
 import asyncio
 from ..models import QuizGame, QuizGameParticipant
 from channels.db import database_sync_to_async
+import redis
 
 # Dictionary to track inactive check tasks and active connections per game
 game_check_tasks = {}
 game_connections = {}
 
 class LobbyConsumer(AsyncWebsocketConsumer):
-    @classmethod
-    async def start_inactive_check(cls, join_code, channel_layer):
-        """Start the inactive player check for a game if not already running."""
-        if join_code not in game_check_tasks or game_check_tasks[join_code].done():
-            async def check_inactive_players():
-                room_group_name = f'lobby_{join_code}'
-                while True:
-                    try:
-                        await asyncio.sleep(10)  # Check every 10 seconds to match frontend heartbeat
-                        # Get participants list and broadcast update
-                        try:
-                            from django.utils import timezone
-                            from datetime import timedelta
-                            game = await database_sync_to_async(QuizGame.objects.get)(join_code=join_code)
-                            cutoff_time = timezone.now() - timedelta(seconds=20)  # Consider inactive after 20 seconds (2 missed heartbeats)
-                            # Get current active participants with full info
-                            active_participants = await database_sync_to_async(lambda: list(
-                                game.participants.filter(last_heartbeat__gte=cutoff_time)
-                                .values('participant_id', 'display_name')
-                            ))()
-                            
-                            # Send update to all clients
-                            await channel_layer.group_send(
-                                room_group_name,
-                                {
-                                    'type': 'participants_list_update',
-                                    'participants': active_participants
-                                }
-                            )
-                        except QuizGame.DoesNotExist:
-                            break  # Stop checking if game no longer exists
-                        except Exception as e:
-                            print(f'Error checking inactive players: {e}')
-                            await asyncio.sleep(5)  # Wait before retry
-                    except asyncio.CancelledError:
-                        break
-                    except Exception as e:
-                        print(f'Error in inactive check loop: {e}')
-                        await asyncio.sleep(5)
 
-            game_check_tasks[join_code] = asyncio.create_task(check_inactive_players())
+    r = redis.Redis(host='localhost', port=6379, db=0, decode_responses=True)
 
     async def connect(self):
         self.join_code = self.scope['url_route']['kwargs']['join_code']
@@ -63,9 +25,6 @@ class LobbyConsumer(AsyncWebsocketConsumer):
             game_connections[self.join_code] = set()
         game_connections[self.join_code].add(self.channel_name)
 
-        # Start inactive check task if not already running
-        await self.start_inactive_check(self.join_code, self.channel_layer)
-
         # Join room group
         await self.channel_layer.group_add(
             self.room_group_name,
@@ -107,11 +66,6 @@ class LobbyConsumer(AsyncWebsocketConsumer):
             }))
             return
 
-        if message_type == 'heartbeat':
-            participant_id = data.get('participant_id')
-            if participant_id:
-                await self.update_participant_heartbeat(participant_id)
-                # Don't update participants list after heartbeat - let the background task handle it
         elif message_type in ['leave_game', 'kick_player']:
             participant_id = data.get('participant_id')
             if participant_id:
@@ -180,36 +134,32 @@ class LobbyConsumer(AsyncWebsocketConsumer):
                         }
                     )
 
-    @database_sync_to_async
-    def update_participant_heartbeat(self, participant_id):
-        try:
-            participant = QuizGameParticipant.objects.get(participant_id=participant_id)
-            from django.utils import timezone
-            participant.last_heartbeat = timezone.now()
-            participant.save()
-            return True
-        except QuizGameParticipant.DoesNotExist:
-            return False
-
     async def get_participants_list(self):
         try:
             from django.utils import timezone
             from datetime import timedelta
             game = await database_sync_to_async(QuizGame.objects.get)(join_code=self.join_code)
-            # Only return participants that have been seen in the last minute
-            cutoff_time = timezone.now() - timedelta(seconds=20)  # Consider inactive after 20 seconds (2 missed heartbeats)
             participants = await database_sync_to_async(lambda: list(
-                game.participants.filter(last_heartbeat__gte=cutoff_time)
+                game.participants
                 .values('participant_id', 'display_name')
             ))()
 
             
-            # Send join notification for new participants
+            # Zustand laden
             try:
-                prev_names = set(p['display_name'] for p in self.last_participants) if hasattr(self, 'last_participants') else set()
+                r = redis.Redis(host='localhost', port=6379, db=0, decode_responses=True)
+
+                # Alte Teilnehmer aus Redis holen
+                data = r.get(f"last_participants_{self.room_group_name}")
+                prev_names = set(json.loads(data)) if data else set()
+
+                # Aktuelle Teilnehmer aus dem Argument extrahieren
                 current_names = set(p['display_name'] for p in participants)
+
+                # Neue Teilnehmer bestimmen
                 new_participants = current_names - prev_names
-                
+
+                # Benachrichtigung für neue Teilnehmer versenden
                 for name in new_participants:
                     await self.channel_layer.group_send(
                         self.room_group_name,
@@ -218,9 +168,12 @@ class LobbyConsumer(AsyncWebsocketConsumer):
                             'player_name': name
                         }
                     )
+
+                # Teilnehmerliste in Redis aktualisieren
+                r.set(f"last_participants_{self.room_group_name}", json.dumps(list(current_names)))
+
             except Exception as e:
-                print(f'Error sending join notifications: {e}')
-            
+                print(f"Error in send_join_notifications: {e}")
             self.last_participants = participants
             return participants
         except QuizGame.DoesNotExist:

django/play/migrations/0011_quizgame_updated_at.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-04-21 11:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('play', '0010_alter_quizgameparticipant_last_heartbeat'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='quizgame',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

django/play/models.py

@@ -19,6 +19,7 @@ class QuizGame(models.Model):
     current_state = models.CharField(max_length=20, choices=GAME_STATES, default='lobby')
     current_question_index = models.IntegerField(default=0)
     question_start_time = models.DateTimeField(null=True, blank=True)
+    updated_at = models.DateTimeField(auto_now=True)
 
     def save(self, *args, **kwargs):
         if not self.join_code:

django/play/urls.py

@@ -12,4 +12,6 @@ urlpatterns = [
     path('game/<str:join_code>/waiting', views.waiting_room, name='waiting'),
     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)
@@ -38,10 +51,17 @@ def lobby(request, join_code):
     context['participant'] = participant
     return render(request, 'play/lobby.html', context=context)
 
-def create_participant(request, join_code):
-    quiz_game = get_object_or_404(QuizGame, join_code=join_code)
+def select_mode(request,join_code):
+    return render(request, 'play/select_mode.html', {'join_code': join_code})
 
-    if "participant_id" in request.COOKIES:
+
+
+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']
         try:
@@ -57,7 +77,7 @@ def create_participant(request, join_code):
             response.delete_cookie('participant_id')
             return response
 
-    if request.method == 'POST':
+     if request.method == 'POST':
         display_name = request.POST.get('display_name')
         if not display_name:
             return render(request, 'play/initialize_participant.html', {
@@ -75,9 +95,12 @@ def create_participant(request, join_code):
         response.set_cookie('participant_id', participant.participant_id, max_age=3600)
         return response
 
-    return render(request, 'play/initialize_participant.html', {'join_code': join_code})
-
+     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()
@@ -85,7 +108,8 @@ def create_game(request, quiz_id):
         game.host_id = game.generate_unique_id()
         game.save()
 
-        response = HttpResponseRedirect(reverse('play:lobby', kwargs={'join_code': game.join_code}))
+
+        response = HttpResponseRedirect(reverse('play:select_mode', kwargs={'join_code': game.join_code}))
         response.set_cookie('host_id', game.host_id, max_age=3600)
         
         return response
@@ -128,7 +152,7 @@ def finished(request, join_code):
 
 def scores(request, join_code):
     quiz_game = get_object_or_404(QuizGame, join_code=join_code)
-    
+
     # Verify game state
     if quiz_game.current_state != 'scores':
         return redirect('play:lobby', join_code=join_code)
@@ -146,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),
@@ -210,10 +243,12 @@ def question(request, join_code):
         return render(request, 'play/game/question_host.html', {
             'quiz_game': quiz_game,
             'question_data': question_data,
+            'current_question':current_question,
             'host_id': quiz_game.host_id,
             'start_time': int(quiz_game.question_start_time.timestamp() * 1000),
             'question_index': quiz_game.current_question_index,
-            'total_questions': len(questions)
+            'total_questions': len(questions),
+            'question_image': current_question.image
         })
     
     # Handle participant view
@@ -223,16 +258,20 @@ 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,
         'question_data': question_data,
+        'current_question':current_question,
         'participant': participant,
         'start_time': int(quiz_game.question_start_time.timestamp() * 1000),
         'question_index': quiz_game.current_question_index,
-        'total_questions': len(questions)
+        'total_questions': len(questions),
     })
 
 def waiting_room(request, join_code):
@@ -255,4 +294,43 @@ def waiting_room(request, join_code):
     return render(request, 'play/game/wait_for_other_players.html', {
         '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/base.html

@@ -66,6 +66,8 @@
                 }, duration);
             }
         };
+        if (window.location.pathname !== "/library/") {
+        localStorage.setItem("meine_seite_scroll", 0);}
     </script>
     {% block extra_js %}{% endblock %}
 </body>

django/templates/library/detail_quiz.html

@@ -34,7 +34,8 @@
                   </svg>
                   Quiz kopieren
                 </a>
-              
+            
+                {% if quiz.questions.count != 0 %}
                 <a href="{% url 'play:create_game' quiz.id %}"
                    class="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white text-sm font-medium rounded-lg hover:bg-blue-700 transition-colors duration-200">
                   <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -44,7 +45,8 @@
                       d="M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
                   </svg>
                   Spielen
-                </a>
+                </a>           
+                {% endif %}
               </div>
             </div>
           

django/templates/library/overview_quiz.html

@@ -51,28 +51,29 @@
 
 <div id="filterPanel" class="container mx-auto px-4">
     <div class="bg-white rounded-xl shadow-lg p-6 border border-gray-200">
-        <form method="get" class="grid grid-cols-1 md:grid-cols-3 gap-6">
-            <div class="space-y-2">
-                <label class="block text-sm font-medium text-gray-700">Minimale Fragen</label>
-                {{ form.min_amout_questions }}
-            </div>
-            <div class="space-y-2">
-                <label class="block text-sm font-medium text-gray-700">Maximale Fragen</label>
-                {{ form.max_amout_questions }}
-            </div>
-            <div class="space-y-2">
-                <label class="block text-sm font-medium text-gray-700">Von User</label>
-                {{ form.user }}
-            </div>
-            <div class="md:col-span-3 flex justify-end">
-                <button type="submit" class="inline-flex items-center px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors duration-200">
-                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 4a1 1 0 011-1h16a1 1 0 011 1v2.586a1 1 0 01-.293.707l-6.414 6.414a1 1 0 00-.293.707V17l-4 4v-6.586a1 1 0 00-.293-.707L3.293 7.293A1 1 0 013 6.586V4z" />
-                    </svg>
-                    Filtern
-                </button>
-            </div>
-        </form>
+      <form action="{% url 'library:overview_quiz' %}" method="get" class="grid grid-cols-1 md:grid-cols-3 gap-6">
+        <input type="hidden" name="filter" value="1">
+        <div class="space-y-2">
+            <label class="block text-sm font-medium text-gray-700">minimale Anzahl an Fragen</label>
+            <input type="number" name="min_amout_questions" class="border-2 border-gray-300 rounded-lg p-2 w-full" min="1" id="id_min_amout_questions">
+        </div>
+        <div class="space-y-2">
+            <label class="block text-sm font-medium text-gray-700">maximale Anzahl an Fragen</label>
+            <input type="number" name="max_amout_questions" class="border-2 border-gray-300 rounded-lg p-2 w-full" min="1" id="id_max_amout_questions">
+        </div>
+        <div class="space-y-2">
+            <label class="block text-sm font-medium text-gray-700">veröffentlicht von User</label>
+            <input type="text" name="user" class="border-2 border-gray-300 rounded-lg p-2 w-full" id="id_user">
+        </div>
+        <div class="md:col-span-3 flex justify-end">
+            <button type="submit" class="inline-flex items-center px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors duration-200">
+                <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 4a1 1 0 011-1h16a1 1 0 011 1v2.586a1 1 0 01-.293.707l-6.414 6.414a1 1 0 00-.293.707V17l-4 4v-6.586a1 1 0 00-.293-.707L3.293 7.293A1 1 0 013 6.586V4z"></path>
+                </svg>
+                Filtern
+            </button>
+        </div>
+    </form>    
     </div>
 </div>
 
@@ -193,6 +194,7 @@
 
           <!-- Action Buttons -->
           <div class="flex justify-between items-center gap-2 mt-3 border-t pt-3">
+            {% if quiz.questions.count != 0 %}
             <a href="{% url 'play:create_game' quiz.id %}" 
                class="px-3 py-1.5 bg-blue-600 hover:bg-blue-700 text-white text-sm font-medium rounded-lg transition-colors duration-200 flex items-center gap-2">
               <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -201,6 +203,9 @@
               </svg>
               Spielen
             </a>
+            {% else %}
+            Fürs Spielen ist min. 1 Frage nötig!
+            {% endif %}
             <div class="flex gap-1">
               <a href="{% url 'library:detail_quiz' quiz.id %}" 
                  class="p-1.5 bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-lg transition-colors duration-200">
@@ -377,6 +382,7 @@
 
           <!-- Action Buttons -->
           <div class="flex justify-between items-center gap-2 mt-3 border-t pt-3">
+            {% if quiz.questions.count != 0 %}
             <a href="{% url 'play:create_game' quiz.id %}" 
                class="px-3 py-1.5 bg-blue-600 hover:bg-blue-700 text-white text-sm font-medium rounded-lg transition-colors duration-200 flex items-center gap-2">
               <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -385,6 +391,10 @@
               </svg>
               Spielen
             </a>
+            {% else %}
+           Fürs Spielen ist min. 1 Frage nötig!
+            {% endif %}
+
             <div class="flex gap-1">
               <a href="{% url 'library:detail_quiz' quiz.id %}" 
                  class="p-1.5 bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-lg transition-colors duration-200">
@@ -565,6 +575,7 @@
 
           <!-- Action Buttons -->
           <div class="flex justify-between items-center gap-2 mt-3 border-t pt-3">
+            {% if quiz.questions.count != 0 %}
             <a href="{% url 'play:create_game' quiz.id %}" 
                class="px-3 py-1.5 bg-blue-600 hover:bg-blue-700 text-white text-sm font-medium rounded-lg transition-colors duration-200 flex items-center gap-2">
               <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -573,6 +584,9 @@
               </svg>
               Spielen
             </a>
+            {% else %}
+            Fürs Spielen ist min. 1 Frage nötig!
+            {% endif %}
             <div class="flex gap-1">
               <a href="{% url 'library:detail_quiz' quiz.id %}" 
                  class="p-1.5 bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-lg transition-colors duration-200">
@@ -620,11 +634,26 @@
 {% endif %}
 <script>
 document.addEventListener('DOMContentLoaded', function() {
+    const urlParams = new URLSearchParams(window.location.search);
+    if (urlParams.get('filter') === '1') {
+        document.getElementById('filterPanel').classList.add('show');
+    }
+
     document.getElementById('filterButton').addEventListener('click', function() {
         document.getElementById('filterPanel').classList.toggle('show');
+
+        // URL beim Öffnen aktualisieren
+        const params = new URLSearchParams(window.location.search);
+        if (document.getElementById('filterPanel').classList.contains('show')) {
+            params.set('filter', '1');
+        } else {
+            params.delete('filter');
+        }
+        history.replaceState(null, '', `${location.pathname}?${params}`);
     });
 });
 
+
 if (window.location.pathname === "/library/") {
   window.addEventListener("beforeunload", function () {
     localStorage.setItem("meine_seite_scroll", window.scrollY);

django/templates/library/question/question_multiple_choice.html

@@ -9,9 +9,8 @@
             Zurück zum Quiz
         </a>
     </div>
-
     <div class="bg-white rounded-lg shadow-md p-6 border-blue-600 border-2 rounded-xl shadow-md">
-        <form method="post" class="space-y-6">
+        <form method="post" class="space-y-6" enctype="multipart/form-data">
             {% csrf_token %}
             
             <!-- Question Text -->
@@ -24,6 +23,15 @@
                 </div>
             </div>
 
+
+            {% if image %}
+            <img src="{{ image.url }}" style="max-width: 500px;" alt="Bild der Frage">
+            {% endif %}
+            <div>
+                <label class="font-bold" for="question_image">Bild:</label>
+                <input value="image.url" class="bg-blue-200 p-2 m-2 rounded-lg border-2 border-blue-400" type="file" name="question_image" id="question_image">
+            </div>
+
             <!-- Options -->
             <div>
                 <label class="block text-sm font-medium text-gray-700 mb-2">Antwortmöglichkeiten</label>
@@ -92,6 +100,19 @@
                 </button>
             </div>
 
+            <div class="p-4">
+                <label class="font-bold" for="time_per_question">Zeit pro Frage:</label>
+                <select name="time_per_question" id="time_per_question">
+                    <option value="10" {% if standard_time_per_question == "10" or time_per_question == "10" %}selected{% endif %}>10 Sekunden</option>
+                    <option value="20" {% if standard_time_per_question == "20" or time_per_question == "20" %}selected{% endif %}>20 Sekunden</option>
+                    <option value="30" {% if standard_time_per_question == "30" or time_per_question == "30" %}selected{% endif %}>30 Sekunden</option>
+                    <option value="45" {% if standard_time_per_question == "45" or time_per_question == "45" %}selected{% endif %}>45 Sekunden</option>
+                    <option value="60" {% if standard_time_per_question == "60" or time_per_question == "60" %}selected{% endif %}>1 Minute</option>
+                    <option value="120" {% if standard_time_per_question == "120" or time_per_question == "120" %}selected{% endif %}>2 Minuten</option>
+                    <option value="300" {% if standard_time_per_question == "300" or time_per_question == "300" %}selected{% endif %}>5 Minuten</option>
+                </select>
+            </div>
+
             <div class="flex justify-end space-x-3">
                 <a href="{% url 'library:detail_quiz' quiz.id %}" 
                    class="inline-flex items-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">

django/templates/library/question/question_true_false.html

@@ -11,7 +11,7 @@
     </div>
 
     <div class="bg-white rounded-lg shadow-md p-6 border-blue-600 border-2 rounded-xl shadow-md">
-        <form method="post" class="space-y-6">
+        <form method="post" class="space-y-6" enctype="multipart/form-data">
             {% csrf_token %}
             
             <!-- Question Text -->
@@ -24,6 +24,14 @@
                 </div>
             </div>
 
+            {% if image %}
+            <img src="{{ image.url }}" style="max-width: 500px;" alt="Bild der Frage">
+            {% endif %}
+            <div>
+                <label class="font-bold" for="question_image">Bild:</label>
+                <input class="bg-blue-200 p-2 m-2 rounded-lg border-2 border-blue-400" type="file" name="question_image" id="question_image">
+            </div>
+
             <!-- True/False Selection -->
             <div>
                 <label class="block text-sm font-medium text-gray-700 mb-2">Richtige Antwort</label>
@@ -43,6 +51,19 @@
                 </div>
             </div>
 
+            <div class="p-4">
+                <label class="font-bold" for="time_per_question">Zeit pro Frage:</label>
+                <select name="time_per_question" id="time_per_question">
+                    <option value="10" {% if standard_time_per_question == "10" or time_per_question == "10" %}selected{% endif %}>10 Sekunden</option>
+                    <option value="20" {% if standard_time_per_question == "20" or time_per_question == "20" %}selected{% endif %}>20 Sekunden</option>
+                    <option value="30" {% if standard_time_per_question == "30" or time_per_question == "30" %}selected{% endif %}>30 Sekunden</option>
+                    <option value="45" {% if standard_time_per_question == "45" or time_per_question == "45" %}selected{% endif %}>45 Sekunden</option>
+                    <option value="60" {% if standard_time_per_question == "60" or time_per_question == "60" %}selected{% endif %}>1 Minute</option>
+                    <option value="120" {% if standard_time_per_question == "120" or time_per_question == "120" %}selected{% endif %}>2 Minuten</option>
+                    <option value="300" {% if standard_time_per_question == "300" or time_per_question == "300" %}selected{% endif %}>5 Minuten</option>
+                </select>
+            </div>
+
             <div class="flex justify-end space-x-3">
                 <a href="{% url 'library:detail_quiz' quiz.id %}" 
                    class="inline-flex items-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500">

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,46 +1,74 @@
 {% 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 question_image %}
+            <div class="flex justify-center">
+                <img class="m-4" src="{{ question_image.url }}" style="max-width: 500px;" alt="Bild der Frage">
+            </div>
+        {% endif %}
         
+        {% 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 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>
-                </div>
+                </button>
             {% endfor %}
         </div>
+
+
+
     </div>
 </div>
 {% endblock %}
 
+
+
 {% block extra_js %}
 {% include 'play/game/common_scripts.html' %}
 <script>
     const joinCode = '{{ quiz_game.join_code }}';
     const hostId = '{{ host_id }}';
     const questionStartTime = {{ start_time }};
-    const questionDuration = 30000; // 30 seconds in milliseconds
+    const questionDuration = '{{ current_question.time_per_question }}'*1000; //Zeit pro Frage (indviduell eingestellt)
     const gameSocket = initializeGameSocket(joinCode);
     let answeredParticipants = 0;
     let totalParticipants = 0;
     const optionCounts = {};
-
+    
     gameSocket.onmessage = function(e) {
         const data = JSON.parse(e.data);
         if (data.type === 'participant_answer') {
@@ -85,7 +113,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 +132,7 @@
     }
 
     // Timer
+    {% if request.session.mode != "learn" %}
     function updateTimer() {
         const now = Date.now();
         const elapsed = now - questionStartTime;
@@ -118,6 +147,9 @@
         }
     }
 
+    
+    {% endif %}
+    
     // Request initial participants list
     gameSocket.onopen = function(e) {
         gameSocket.send(JSON.stringify({
@@ -125,5 +157,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/question_participant.html

@@ -37,7 +37,7 @@
     const joinCode = '{{ quiz_game.join_code }}';
     const participantId = '{{ participant.participant_id }}';
     const questionStartTime = {{ start_time }};
-    const questionDuration = 30000; // 30 seconds in milliseconds
+    const questionDuration = '{{ current_question.time_per_question }}'*1000; //Zeit pro Frage (indviduell eingestellt)
     const gameSocket = initializeGameSocket(joinCode);
 
     gameSocket.onmessage = function(e) {

django/templates/play/game/score_overview.html

@@ -10,33 +10,43 @@
             <p class="text-lg mb-2">{{ question_data.question }}</p>
             <div class="grid grid-cols-2 gap-4">
                 {% for option in question_data.options %}
-                    <div class="p-4 rounded-lg {% if option.is_correct %}bg-green-100 border-2 border-green-500{% else %}bg-gray-100{% endif %}">
+                    <div class="p-4 rounded-lg {% if option.is_correct %}bg-green-100 border-2 border-green-500 {% else %} bg-gray-100 {% endif %}">
                         <p class="text-lg">{{ option.value }}</p>
                         <p class="text-gray-600" id="option-count-{{ forloop.counter0 }}">0 Antworten</p>
                     </div>
                 {% 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>
-                            <p class="text-gray-600">{{ participant.score }} Punkte</p>
-                        </div>
+                        <div>                    
+                             <p class="text-lg font-bold">{{ participant.display_name }}</p>
+                             <p class="text-gray-600">{{ participant.score }} Punkte</p> 
+                        </div>                     
                         {% if participant.last_answer_correct %}
                             <span class="text-green-500">✓</span>
                         {% elif participant.last_answer_correct == False %}
                             <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 %}
@@ -31,7 +33,7 @@
                 </svg>
                 Teilnehmer
             </h3>
-            <ul id="participants-list" class="space-y-2 max-h-60 overflow-y-auto">
+            <ul id="participants-list" class="space-y-2 max-h-60">
                 <li class="text-gray-500 p-3 bg-gray-50 rounded-lg text-center">Warte auf Teilnehmer...</li>
             </ul>
         </div>

django/templates/play/select_mode.html

@@ -0,0 +1,41 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+<div class="grid place-content-center md:h-screen h-150 w-full -z-50 top-0 p-8 ">
+    <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-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: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>
+                  
+                Moderiermodus
+                <!-- 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">
+                    Klassischer Spielmodus zum Moderieren
+                </span>
+            </a>
+
+            <!-- Lernmodus -->
+            <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>
+                  
+              Lernmodus
+                <!-- 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">
+                    Modus zum selbständigen Üben und Lernen
+                </span>
+            </a>
+
+        </div>
+    </div>
+</div>
+
+{% endblock %}

requirements.txt

@@ -3,4 +3,5 @@ django~=5.1.4
 channels~=4.2.0  # WebSocket support
 daphne~=4.1.2    # ASGI server
 pillow~=11.1.0   # Image handling
-whitenoise~=6.6.0  # Static file serving
+whitenoise~=6.6.0  # Static file serving
+django-cleanup