Merge branch 'master' into 44-zuruecksetz-funktion-fuer-teilnehmer

README.md

@@ -7,7 +7,6 @@
 3. [Superuser erstellen](#superuser-erstellen)
 4. [Tailwind-Nutzung](#tailwind-nutzung)
 5. [Issue - Merge Request - Merge](#issue-mergerequest-merge)
-6. [Konfiguration](#konfiguration)
 
 ## Initialisierung des Projekts
 
@@ -62,13 +61,6 @@ 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
@@ -92,19 +84,6 @@ 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
@@ -162,11 +141,3 @@ Hier der vereinbarte Arbeitsablauf:
 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.
-
-## Konfiguration
-
-Die Konfiguration des Projekts befindet sich im `config/qivip_config.json`.
-
-| Variable | Bedeutung | Optionen |
-| --- | --- | --- |
-| ENABLE_RATING_SYSTEM | Soll das Bewertungssystem aktiviert werden? | true [Standard], false |

django/config/qivip_config.json

@@ -1,3 +0,0 @@
-{
-  "ENABLE_RATING_SYSTEM": true
-}

django/core/settings.py

@@ -10,7 +10,6 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/5.1/ref/settings/
 """
 
-import json
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -28,9 +27,6 @@ DEBUG = True
 
 ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*']
 
-# Konfigurationsdatei für Projekt
-with open(BASE_DIR / 'config' / 'qivip_config.json') as config_file:
-    QIVIP_CONFIG = json.load(config_file)
 
 # Application definition
 
@@ -83,16 +79,12 @@ WSGI_APPLICATION = 'core.wsgi.application'
 ASGI_APPLICATION = 'core.asgi.application'
 
 CHANNEL_LAYERS = {
-    "default": {
-        "BACKEND": "channels_redis.core.RedisChannelLayer",
-        "CONFIG": {
-            "hosts": [("127.0.0.1", 6379)],
-        },
-    },
+    'default': {
+        'BACKEND': 'channels.layers.InMemoryChannelLayer'
+    }
 }
 
 
-
 # Database
 # https://docs.djangoproject.com/en/5.1/ref/settings/#databases
 

django/library/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from .models import QivipQuiz, QivipQuestion, QivipQuizFavorite, QuestionImage, QuizCategory, QuizImage
+from .models import QivipQuiz, QivipQuestion, QivipQuizFavorite, QuizCategory
 
 # Für das QivipQuiz Modell
 class QivipQuizAdmin(admin.ModelAdmin):
@@ -23,17 +23,8 @@ class QuizCategoryAdmin(admin.ModelAdmin):
 class QivipQuizFavoriteAdmin(admin.ModelAdmin):
     list_display = ('user', 'favorite', 'quiz')  # Welche Felder sollen in der Übersicht angezeigt werden
 
-
-class QuizImageAdmin(admin.ModelAdmin):
-     list_display = ('image',)
-
-class QuestionImageAdmin(admin.ModelAdmin):
-     list_display = ('image',)  
-
 # Registrierung der Modelle im Admin
 admin.site.register(QivipQuiz, QivipQuizAdmin)
 admin.site.register(QivipQuestion, QivipQuestionAdmin)
 admin.site.register(QuizCategory, QuizCategoryAdmin)
 admin.site.register(QivipQuizFavorite, QivipQuizFavoriteAdmin)
-admin.site.register(QuizImage, QuizImageAdmin)
-admin.site.register(QuestionImage, QuestionImageAdmin)

django/library/forms.py

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

django/library/management/commands/cleanup_games.py

@@ -1,13 +0,0 @@
-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/0050_questionimage_quizimages_alter_qivipquestion_image_and_more.py

@@ -1,38 +0,0 @@
-# Generated by Django 5.1.7 on 2025-04-22 16:04
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('library', '0049_alter_qivipquestion_image'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='QuestionImage',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('image', models.ImageField(blank=True, null=True, upload_to='question_images/', verbose_name='Bild')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='QuizImage',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('image', models.ImageField(blank=True, max_length=256, null=True, upload_to='quiz_images/', verbose_name='Bild')),
-            ],
-        ),
-        migrations.AlterField(
-            model_name='qivipquestion',
-            name='image',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='questions', to='library.questionimage'),
-        ),
-        migrations.AlterField(
-            model_name='qivipquiz',
-            name='image',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='quizzes', to='library.QuizImage'),
-        ),
-    ]

django/library/migrations/0051_alter_qivipquestion_image_alter_qivipquiz_image.py

@@ -1,24 +0,0 @@
-# Generated by Django 5.1.7 on 2025-04-23 12:04
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('library', '0050_questionimage_quizimages_alter_qivipquestion_image_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='qivipquestion',
-            name='image',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='questions', to='library.questionimage'),
-        ),
-        migrations.AlterField(
-            model_name='qivipquiz',
-            name='image',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='quizzes', to='library.quizimage'),
-        ),
-    ]

django/library/migrations/0052_alter_qivipquestion_image_alter_qivipquiz_image_and_more.py

@@ -1,29 +0,0 @@
-# Generated by Django 5.1.7 on 2025-04-23 12:21
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('library', '0051_alter_qivipquestion_image_alter_qivipquiz_image'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='qivipquestion',
-            name='image',
-            field=models.ImageField(blank=True, null=True, upload_to='question_images/', verbose_name='Bild'),
-        ),
-        migrations.AlterField(
-            model_name='qivipquiz',
-            name='image',
-            field=models.ImageField(blank=True, max_length=256, null=True, upload_to='quiz_images/', verbose_name='Bild'),
-        ),
-        migrations.DeleteModel(
-            name='QuestionImage',
-        ),
-        migrations.DeleteModel(
-            name='QuizImage',
-        ),
-    ]

django/library/migrations/0053_questionimage_quizimage_alter_qivipquestion_image_and_more.py

@@ -1,38 +0,0 @@
-# Generated by Django 5.1.7 on 2025-04-23 13:15
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('library', '0052_alter_qivipquestion_image_alter_qivipquiz_image_and_more'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='QuestionImage',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('image', models.ImageField(blank=True, null=True, upload_to='question_images/', verbose_name='Bild')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='QuizImage',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('image', models.ImageField(blank=True, max_length=256, null=True, upload_to='quiz_images/', verbose_name='Bild')),
-            ],
-        ),
-        migrations.AlterField(
-            model_name='qivipquestion',
-            name='image',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='questions', to='library.questionimage'),
-        ),
-        migrations.AlterField(
-            model_name='qivipquiz',
-            name='image',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='quizzes', to='library.quizimage'),
-        ),
-    ]

django/library/models.py

@@ -4,15 +4,6 @@ from django.utils.text import slugify
 import uuid
 from django.core.exceptions import ValidationError
 
-
-class QuizImage(models.Model):
-    image = models.ImageField(max_length=256,verbose_name="Bild", upload_to='quiz_images/', blank=True, null=True)  # Bild speichern in media/quiz_images/
-
-
-class QuestionImage(models.Model):
-     image = models.ImageField(verbose_name="Bild", upload_to="question_images/", blank=True, null=True)
-
-
 class QivipQuiz(models.Model):
     STATUS_VALUES = {
         "öffentlich": "Öffentlich",
@@ -36,15 +27,7 @@ class QivipQuiz(models.Model):
         if value.strip() == "In dem Quiz geht es um ...":
             raise ValidationError("Bitte gib eine aussagekräftige Beschreibung ein.")
 
-    image = models.ForeignKey(
-    QuizImage,
-    null=True,
-    blank=True,
-    on_delete=models.PROTECT, 
-    related_name="quizzes"
-    )
-
-
+    image = models.ImageField(max_length=256,verbose_name="Bild", upload_to='quiz_images/', blank=True, null=True)  # Bild speichern in media/quiz_images/
     uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
     user_id = models.ForeignKey(User, on_delete=models.CASCADE, related_name='quiz')
     #creator = models.ForeignKey(User, on_delete=models.SET_NULL,blank=True, null=True, related_name='creator_quiz')
@@ -91,14 +74,7 @@ class QivipQuestion(models.Model):
     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.ForeignKey(
-    QuestionImage,
-    null=True,
-    blank=True,
-    on_delete=models.PROTECT,
-    related_name="questions"
-)
-
+    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

@@ -6,7 +6,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.urls import reverse
 from django.contrib import messages
-from .models import QivipQuiz, QivipQuestion, QivipQuizFavorite, QuestionImage, QuizImage
+from .models import QivipQuiz, QivipQuestion, QivipQuizFavorite
 from .forms import QuizForm, QuestionForm
 import json
 from django.core.paginator import Paginator
@@ -193,23 +193,10 @@ def favorite_quiz(request, pk):
 # Neues Quiz erstellen
 @login_required
 def new_quiz(request):
-
-        
     if request.method == 'POST':
-
-
         form = QuizForm(request.POST, request.FILES)
         if form.is_valid():
             quiz = form.save(commit=False)
-            try:
-                quiz_image=request.FILES['quiz_image']
-                imagequiz=QuizImage.objects.create(image=quiz_image)
-                quiz.image=imagequiz
-
-            except:
-                pass
-
-            
             quiz.user_id = request.user
             #quiz.creator = request.user
             quiz.save()
@@ -228,27 +215,7 @@ def edit_quiz(request, pk):
         form = QuizForm(request.POST, instance=quiz, files=request.FILES) 
         if form.is_valid():
            
-            if 'reset_image' in request.POST:
-                quiz.image = None
-
-            try:
-                quiz_image=request.FILES['quiz_image']
-                imagequiz=QuizImage.objects.create(image=quiz_image)
-                quiz.image=imagequiz
-
-
-            except:
-                pass
-
-            
-            
             form.save()
-            for img in QuizImage.objects.all():
-                try:
-                    img.delete()
-                    img.image.delete(save=False)
-                except:
-                    pass
             return redirect('library:detail_quiz', pk=pk)
             #return modified(request, pk)
             
@@ -262,19 +229,6 @@ def delete_quiz(request, pk):
     quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
     if request.method == 'POST':
         quiz.delete()
-        for img in QuizImage.objects.all():
-            try:
-                img.delete()
-                img.image.delete(save=False)
-            except:
-                pass
-        for img in QuestionImage.objects.all():
-            try:
-                img.delete()
-                img.image.delete(save=False)
-            except:
-                pass
-
         return redirect('library:overview_quiz')
     return render(request, 'library/delete_confirmation.html', {'object': quiz})
 
@@ -302,7 +256,6 @@ def copy_quiz(request, pk):
     original_quiz = get_object_or_404(QivipQuiz, pk=pk)
     
     
-    
     # Quiz kopieren (ohne ID, damit ein neues Objekt erstellt wird)
  
         # Quiz kopieren (ohne ID, damit ein neues Objekt erstellt wird)
@@ -311,10 +264,9 @@ def copy_quiz(request, pk):
     new_quiz.pk = None  # Setzt die ID auf None, damit Django es als neues Objekt erkennt
     new_quiz.uuid = uuid.uuid4()  # Neue UUID generieren
     new_quiz.user_id = request.user  # Neuer Besitzer ist der aktuelle User
-    new_quiz.name += " - Kopie"
+    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
     # Alle zugehörigen Fragen kopieren
@@ -324,7 +276,6 @@ def copy_quiz(request, pk):
         question.pk = None  # Setze pk auf None, damit es als neues Objekt gespeichert wird
         question.quiz_id = original_quiz  # Verknüpfe mit dem neuen Quiz
         question.data = question.data  # `data`-Feld wird explizit übernommen # Verknüpfe mit dem neuen Quiz
-
         question.save()
     
     messages.success(request, "Quiz wurde erfolgreich kopiert!")
@@ -365,6 +316,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':
@@ -404,14 +356,7 @@ def new_question(request):
         question = QivipQuestion()
         question.data = json.dumps(json_data)
         question.quiz_id = quiz
-        try:
-            question_image=request.FILES['question_image']
-            imagequestion=QuestionImage.objects.create(image=question_image)
-            question.image=imagequestion
-        except:
-            pass
-
-
+        question.image = question_image
         question.time_per_question = request.POST.get('time_per_question', '30')
         question.save()
         #return modified(request, pk=quiz.pk)
@@ -453,8 +398,6 @@ def new_question(request):
 @login_required
 def edit_question(request, pk):
     question = get_object_or_404(QivipQuestion, pk=pk, quiz_id__user_id=request.user)
-    if 'reset_ques_image' in request.POST:
-                question.image = None
     if question.quiz_id.user_id != request.user:
         return redirect('library:question_list')
     
@@ -508,9 +451,7 @@ def edit_question(request, pk):
     if request.method == 'POST':
         question_text = request.POST.get('question', '')
         try:
-            question_image=request.FILES['question_image']
-            imagequestion=QuestionImage.objects.create(image=question_image)
-            question.image=imagequestion
+            question_image = request.FILES['question_image']
         except Exception:
             pass
 
@@ -555,15 +496,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()
-        for img in QuestionImage.objects.all():
-            try:
-                img.delete()
-                img.image.delete(save=False)
-            except:
-                pass
         #return modified(request, question.quiz_id.pk)
         return redirect('library:detail_quiz', pk=question.quiz_id.pk)
         
@@ -591,11 +525,5 @@ def delete_question(request, pk):
     
     if request.method == 'POST':
         question.delete()
-        for img in QuestionImage.objects.all():
-            try:
-                img.delete()
-                img.image.delete(save=False)
-            except:
-                pass
         return redirect('library:detail_quiz', pk=question.quiz_id.pk)
     return render(request, 'library/delete_confirmation.html', {'object': question})

django/play/consumers/game.py

@@ -4,10 +4,80 @@ from channels.generic.websocket import AsyncWebsocketConsumer
 from channels.db import database_sync_to_async
 from django.utils import timezone
 from django.urls import reverse
+from django.db import models
+from datetime import timedelta
+
 from play.models import QuizGame, QuizGameParticipant, QuizAnswer
-from django.conf import settings
+
+# 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']
@@ -21,6 +91,9 @@ 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
         await self.channel_layer.group_discard(
@@ -73,6 +146,21 @@ class GameConsumer(AsyncWebsocketConsumer):
                     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']
             rating = text_data_json['rating']
@@ -162,6 +250,17 @@ 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:
@@ -242,8 +341,6 @@ class GameConsumer(AsyncWebsocketConsumer):
 
     @database_sync_to_async
     def save_rating(self, participant_id, rating):
-        if not settings.QIVIP_CONFIG['ENABLE_RATING_SYSTEM']:
-            return False
         from library.models import QuizRating
         try:
             game = QuizGame.objects.get(join_code=self.join_code)
@@ -272,16 +369,20 @@ class GameConsumer(AsyncWebsocketConsumer):
         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
+                quiz_game=game,
+                last_heartbeat__gte=timezone.now() - timezone.timedelta(minutes=1)
             ).count()
             
-            if active_participants == 0:
-                game.delete()
+            # 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()
         except QuizGame.DoesNotExist:
             pass
 
-
     @database_sync_to_async
     def get_participants(self):
         try:

django/play/consumers/lobby.py

@@ -3,15 +3,53 @@ 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')
+                            ))()
                             
-    r = redis.Redis(host='localhost', port=6379, db=0, decode_responses=True)
+                            # 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())
 
     async def connect(self):
         self.join_code = self.scope['url_route']['kwargs']['join_code']
@@ -25,6 +63,9 @@ 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,
@@ -66,6 +107,11 @@ 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:
@@ -134,32 +180,36 @@ 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
+                game.participants.filter(last_heartbeat__gte=cutoff_time)
                 .values('participant_id', 'display_name')
             ))()
 
             
-            # Zustand laden
+            # Send join notification for new participants
             try:
-                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
+                prev_names = set(p['display_name'] for p in self.last_participants) if hasattr(self, 'last_participants') else set()
                 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,
@@ -168,12 +218,9 @@ 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 in send_join_notifications: {e}")
+                print(f'Error sending join notifications: {e}')
+            
             self.last_participants = participants
             return participants
         except QuizGame.DoesNotExist:

django/play/migrations/0011_quizgame_updated_at.py

@@ -1,18 +0,0 @@
-# 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,7 +19,6 @@ 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/views.py

@@ -2,19 +2,15 @@ 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
-from library.models import QivipQuiz
+from library.models import QivipQuiz, QivipQuestion
 from django.http import HttpResponseRedirect, HttpResponseNotFound
 from django.contrib import messages
-from django.conf import settings
 
 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 = {
@@ -22,7 +18,6 @@ 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:
@@ -33,9 +28,6 @@ def lobby(request, join_code):
         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)
 
@@ -55,48 +47,46 @@ def lobby(request, join_code):
 def select_mode(request,join_code):
     return render(request, 'play/select_mode.html', {'join_code': 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']
-        try:
-            participant = QuizGameParticipant.objects.get(participant_id=participant_id)
-            if participant.quiz_game.join_code != join_code:
-                participant.quiz_game = quiz_game
-                participant.score = 0  # Reset score when joining new game
-                participant.save()
-            return redirect('play:lobby', join_code=join_code)
-        except QuizGameParticipant.DoesNotExist:
-            # Cookie löschen wenn Teilnehmer nicht mehr existiert
-            response = HttpResponseRedirect(request.path)
-            response.delete_cookie('participant_id')
+        if request.method == 'GET' and "participant_id" in request.COOKIES:
+            # Prüfe ob der Teilnehmer noch existiert
+            participant_id = request.COOKIES['participant_id']
+            try:
+                participant = QuizGameParticipant.objects.get(participant_id=participant_id)
+                if participant.quiz_game.join_code != join_code:
+                    participant.quiz_game = quiz_game
+                    participant.score = 0  # Reset score when joining new game
+                    participant.save()
+                return render(request, 'play/initialize_participant.html', {'participant': participant, 'join_code': quiz_game.join_code})
+            except QuizGameParticipant.DoesNotExist:
+                # Cookie löschen wenn Teilnehmer nicht mehr existiert
+                response = HttpResponseRedirect(request.path)
+                response.delete_cookie('participant_id')
+                return response
+
+        if request.method == 'POST':
+            display_name = request.POST.get('display_name')
+            if not display_name:
+                return render(request, 'play/initialize_participant.html', {
+                    'join_code': join_code,
+                    'error': 'Bitte geben Sie einen Namen ein'
+                })
+
+            participant = QuizGameParticipant()
+            participant.display_name = display_name
+            participant.quiz_game = quiz_game
+            participant.score = 0  # Initialize score
+            participant.save()
+
+            response = HttpResponseRedirect(reverse('play:lobby', kwargs={'join_code': join_code}))
+            response.set_cookie('participant_id', participant.participant_id, max_age=3600)
             return response
 
-     if request.method == 'POST':
-        display_name = request.POST.get('display_name')
-        if not display_name:
-            return render(request, 'play/initialize_participant.html', {
-                'join_code': join_code,
-                'error': 'Bitte geben Sie einen Namen ein'
-            })
-
-        participant = QuizGameParticipant()
-        participant.display_name = display_name
-        participant.quiz_game = quiz_game
-        participant.score = 0  # Initialize score
-        participant.save()
-
-        response = HttpResponseRedirect(reverse('play:lobby', kwargs={'join_code': 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')
@@ -145,8 +135,7 @@ def finished(request, join_code):
         context = {
             'join_code': join_code,
             'is_host': str(game.host_id) == str(request.session.get('host_id')),
-            'participant_id': participant_id if participant else None,
-            'rating_enabled': settings.QIVIP_CONFIG['ENABLE_RATING_SYSTEM']
+            'participant_id': participant_id if participant else None
         }
         return render(request, 'play/game/finished.html', context)
     except QuizGame.DoesNotExist:

django/templates/base.html

@@ -7,7 +7,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="{% static 'css/t-style.css' %}">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
-    <script src="https://cdn.jsdelivr.net/npm/@tsparticles/confetti@3.0.3/tsparticles.confetti.bundle.min.js"></script>
     <title>qivip</title>
 </head>
 <body>

django/templates/library/detail_quiz.html

@@ -193,26 +193,24 @@
 
     <div class="flex justify-end">   
         {% if quiz.base_quiz %}
-        <p class="text-gray-600 mt-2 ">Bearbeitung:<span class="text-blue-600 font-bold"> <a href="{% url 'library:overview_quiz' %}?filter=1&user={{ quiz.user_id }}">{{ quiz.user_id }}</a></span></p>
-        {% else %}
-        <p class="text-gray-600 mt-2 ">Autor:<span class="text-blue-600 font-bold"> <a href="{% url 'library:overview_quiz' %}?filter=1&user={{ quiz.user_id }}">{{ quiz.user_id }}</a></span></p>
+        <p class="text-gray-600 mt-2 ">Bearbeitung:<span class="font-bold"> {{ quiz.user_id}}</span></p>
         {% endif %}
-    </div>
+        </div>
 
 <div class="flex justify-end">   
 {% if quiz.base_quiz %}
-<p class="text-gray-600  ">Kopie von: <a href="{% url 'library:detail_quiz' quiz.base_quiz.id %}"><span class="text-blue-600 font-bold">{{ quiz.base_quiz}}</span></a></p>
+<p class="text-gray-600  ">Kopie von: <a href="{% url 'library:detail_quiz' quiz.base_quiz.id %}"><span class="font-bold">{{ quiz.base_quiz}}</span></a></p>
 {% endif %}
 </div>
 <div class="flex justify-end">  
     {% if quiz.base_quiz %}
-    <p class="text-gray-600 ">Autor:<span class="text-blue-600 font-bold"> <a href="{% url 'library:overview_quiz' %}?filter=1&user={{ quiz.base_quiz.user_id }}">{{ quiz.base_quiz.user_id }}</a></span></p>
+    <p class="text-gray-600 ">Autor:<span class="font-bold"> {{ quiz.base_quiz.user_id}}</span></p>
     {% endif %}
 </div>
 
 <div class="flex justify-end">  
     {% if quiz.credits %}
-    <p class="text-gray-600 mb-2">Credits:<span class="text-blue-600 font-bold"> {{ quiz.credits }}</span></p>
+    <p class="text-gray-600 mb-2">Credits:<span class="font-bold"> {{ quiz.credits }}</span></p>
     {% endif %}
 </div>
 

django/templates/library/form.html

@@ -5,21 +5,6 @@
     <form method="post" enctype="multipart/form-data">
         {% csrf_token %}
         {{ form.as_p }}
-
-        {% if form.instance.image %}
-        <img src="{{ form.instance.image.image.url }}" style="max-width: 100px;" alt="Bild der Frage">
-        <label for="reset_image">
-            <input type="checkbox" name="reset_image" id="reset_image">
-            Bild zurücksetzen
-        </label>
-        {% endif %}
-        <div>
-            <label class="font-bold" for="quiz_image">Bild:</label>
-            <input  class="bg-blue-200 p-2 m-2 rounded-lg border-2 border-blue-400" type="file" name="quiz_image" id="quiz_image">
-        </div>
-
-
-
         <div class="flex justify-center space-x-3">
             <a href="{% if object.quiz_id %}{% url 'library:detail_quiz' object.quiz_id.id %}{% else %}{% url 'library:overview_quiz' %}{% endif %}" 
                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/overview_quiz.html

@@ -51,29 +51,28 @@
 
 <div id="filterPanel" class="container mx-auto px-4">
     <div class="bg-white rounded-xl shadow-lg p-6 border border-gray-200">
-      <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" value="{{ form.min_amout_questions.value|default_if_none:'' }}">
-        </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" value="{{ form.max_amout_questions.value|default_if_none:'' }}">
-        </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" value="{{ form.user.value|default_if_none:'' }}">
-        </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>    
+        <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 Anzahl an Fragen</label>
+                {{ form.min_amout_questions }}
+            </div>
+            <div class="space-y-2">
+                <label class="block text-sm font-medium text-gray-700">maximale Anzahl an Fragen</label>
+                {{ form.max_amout_questions }}
+            </div>
+            <div class="space-y-2">
+                <label class="block text-sm font-medium text-gray-700">veröffentlicht 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>
     </div>
 </div>
 
@@ -97,7 +96,7 @@
           <div class="relative w-full h-full inset-0 bg-cover bg-center">
             <!-- Hintergrundbild -->
             <div class="absolute inset-0 bg-cover bg-center"
-                style="background-image: url({{ quiz.image.image.url }});">
+                style="background-image: url({{ quiz.image.url }});">
             </div>
           </div>
          
@@ -167,7 +166,6 @@
             
             <!-- Rating -->
             <div class="flex items-center gap-1">
-              {% if quiz.rating_count > 0 %}
               {% for i in '12345'|make_list %}
                 {% if forloop.counter <= quiz.average_rating|floatformat:0|add:0 %}
                   <span class="text-yellow-500 text-base">★</span>
@@ -176,9 +174,6 @@
                 {% endif %}
               {% endfor %}
               <span class="text-gray-600 text-sm">({{ quiz.rating_count }})</span>
-              {% else %}
-              <span class="text-gray-600 text-sm">Noch keine Bewertungen</span>
-              {% endif %}
             </div>
           </div>
 
@@ -288,7 +283,7 @@
           <div class="relative w-full h-full inset-0 bg-cover bg-center">
             <!-- Hintergrundbild -->
             <div class="absolute inset-0 bg-cover bg-center"
-                style="background-image: url({{ quiz.image.image.url }});">
+                style="background-image: url({{ quiz.image.url }});">
             </div>
           </div>
          
@@ -359,7 +354,6 @@
             
             <!-- Rating -->
             <div class="flex items-center gap-1">
-              {% if quiz.rating_count > 0 %}
               {% for i in '12345'|make_list %}
                 {% if forloop.counter <= quiz.average_rating|floatformat:0|add:0 %}
                   <span class="text-yellow-500 text-base">★</span>
@@ -367,10 +361,7 @@
                   <span class="text-gray-300 text-base">★</span>
                 {% endif %}
               {% endfor %}
-                <span class="text-gray-600 text-sm">({{ quiz.rating_count }})</span>
-              {% else %}
-                <span class="text-gray-600 text-sm">Noch keine Bewertungen</span>
-              {% endif %}
+              <span class="text-gray-600 text-sm">({{ quiz.rating_count }})</span>
             </div>
           </div>
 
@@ -487,7 +478,7 @@
           <div class="relative w-full h-full inset-0 bg-cover bg-center">
             <!-- Hintergrundbild -->
             <div class="absolute inset-0 bg-cover bg-center"
-                style="background-image: url({{ quiz.image.image.url }});">
+                style="background-image: url({{ quiz.image.url }});">
             </div>
           </div>
           
@@ -556,7 +547,6 @@
             
             <!-- Rating -->
             <div class="flex items-center gap-1">
-              {% if quiz.rating_count > 0 %}
               {% for i in '12345'|make_list %}
                 {% if forloop.counter <= quiz.average_rating|floatformat:0|add:0 %}
                   <span class="text-yellow-500 text-base">★</span>
@@ -565,9 +555,6 @@
                 {% endif %}
               {% endfor %}
               <span class="text-gray-600 text-sm">({{ quiz.rating_count }})</span>
-              {% else %}
-              <span class="text-gray-600 text-sm">Noch keine Bewertungen</span>
-              {% endif %}
             </div>
           </div>
 
@@ -646,26 +633,11 @@
 {% 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

@@ -25,11 +25,7 @@
 
 
             {% if image %}
-            <img src="{{ image.image.url }}" style="max-width: 500px;" alt="Bild der Frage">
-            <label for="reset_image">
-                <input type="checkbox" name="reset_ques_image" id="reset_ques_image">
-                Bild zurücksetzen
-            </label>
+            <img src="{{ image.url }}" style="max-width: 500px;" alt="Bild der Frage">
             {% endif %}
             <div>
                 <label class="font-bold" for="question_image">Bild:</label>

django/templates/library/question/question_true_false.html

@@ -25,11 +25,7 @@
             </div>
 
             {% if image %}
-            <img src="{{ image.image.url }}" style="max-width: 500px;" alt="Bild der Frage">
-            <label for="reset_image">
-                <input type="checkbox" name="reset_ques_image" id="reset_ques_image">
-                Bild zurücksetzen
-            </label>
+            <img src="{{ image.url }}" style="max-width: 500px;" alt="Bild der Frage">
             {% endif %}
             <div>
                 <label class="font-bold" for="question_image">Bild:</label>

django/templates/partials/_nav.html

@@ -1,121 +1,34 @@
-<nav id="main-nav" class="relative bg-blue-600 rounded-lg mt-1 m-2 shadow-md transition-all duration-300">
-    <!-- Desktop Navigation Bar -->
-    <div class="flex justify-between items-center h-12 px-4 sm:px-6 overflow-x-auto whitespace-nowrap">
-        <!-- Logo / Left section -->
-        <div class="flex items-center flex-shrink-0 md:w-32">
-            <h2 class="text-xl font-bold text-white hover:scale-110 transition duration-200">
-                <a href="{% url 'homepage:home' %}">qivip</a>
-            </h2>
-        </div>
-
-        <!-- Desktop Search (centered on screen) - Hidden on mobile -->
-        <div class="hidden md:flex justify-center items-center absolute left-1/2 transform -translate-x-1/2 min-w-40">
-            <form method="get" action="{% url 'library:overview_quiz' %}" class="mr-2 ml-2 flex items-center justify-center w-screen max-w-sm bg-white rounded-full px-4 py-1 shadow-md">
-                <input type="text" name="search" placeholder="Suche ..." value="{{ request.GET.search }}"
-                       class="text-sm w-full px-3 py-1 text-black bg-transparent focus:outline-none lg:text-base">
-                <button class="py-1 text-blue-600">
-                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5 md:size-6">
-                        <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
-                    </svg>              
-                </button>
-            </form>
-        </div>
-        
-        <!-- Desktop Navigation Links - Hidden on mobile -->
-        <div class="hidden md:flex items-center space-x-4 md:w-40">
-            <ul class="flex space-x-4 qp-nav-list">
-                {% if show_search %}
-                <li><a href="{% url 'library:overview_quiz' %}">Bibliothek</a></li>
-                {% else%}
-                <li><a href="{% url 'library:overview_quiz' %}">Bibliothek</a></li>
-                {% endif %}
-                {% if user.is_authenticated %}
-                <li><a href="{% url 'accounts:home' %}">Konto</a></li>
-                {% else %}
-                <li><a href="{% url 'accounts:login' %}">Anmelden</a></li>
-                {% endif %}
-            </ul>
-        </div>
-
-        <!-- Mobile menu button - Only visible on mobile -->
-        <div class="flex md:hidden items-center">
-            <button id="mobile-menu-button" class="text-white focus:outline-none">
-                <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
-                </svg>
-            </button>
-        </div>
+<nav class="flex justify-between items-center bg-blue-600 h-12 px-4 sm:px-6  rounded-lg mt-1 m-2 shadow-md overflow-x-auto whitespace-nowrap">
+    <div class="flex items-center flex-shrink-0 md:w-32">
+        <h2 class="text-xl  font-bold text-white hover:scale-110 transition duration-200 ">
+            <a href="{% url 'homepage:home' %}">qivip</a>
+        </h2>
     </div>
 
-    <!-- Mobile Navigation Menu - Hidden by default - FULLWIDTH DROPDOWN -->
-    <div id="mobile-menu" class="hidden absolute w-full z-50 md:hidden opacity-0 transform -translate-y-2 transition-all duration-300">
-        <div class="bg-blue-500 pt-3 pb-4 rounded-b-lg shadow-inner">
-            <!-- Search in mobile menu -->
-            <form method="get" action="{% url 'library:overview_quiz' %}" class="px-4 mb-4">
-                <div class="flex items-center justify-center bg-white rounded-full px-4 py-2 shadow-md">
-                    <input type="text" name="search" placeholder="Suche ..." value="{{ request.GET.search }}"
-                            class="w-full text-sm px-2 text-black bg-transparent focus:outline-none">
-                    <button class="text-blue-600">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" 
-                                stroke="currentColor" class="size-5">
-                            <path stroke-linecap="round" stroke-linejoin="round" 
-                                    d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
-                        </svg>              
-                    </button>
-                </div>
-            </form>
+<div class="flex justify-center items-center  min-w-40">
+    <form method="get" action="{% url 'library:overview_quiz' %}" class="mr-2 ml-2 flex items-center justify-center w-screen max-w-sm bg-white rounded-full px-4 py-1 shadow-md">
+        <input type="text" name="search" placeholder="Suche ..." value="{{ request.GET.search }}"
+            class=" text-sm w-full px-3 py-1  text-black bg-transparent focus:outline-none lg:text-base">
+        <button class="py-1 text-blue-600">
+            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5 md:size-6 ">
+                <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
+              </svg>              
+        </button>
+    </form></div>
   
-            <!-- Mobile Navigation Links -->
-            <div class="space-y-2 px-4">
-                <a href="{% url 'library:overview_quiz' %}" class="block py-2 text-white font-medium rounded-lg hover:bg-blue-600 transition duration-200">
-                    Bibliothek
-                </a>
-                {% if user.is_authenticated %}
-                <a href="{% url 'accounts:home' %}" class="block py-2 text-white font-medium rounded-lg hover:bg-blue-600 transition duration-200">
-                    Konto
-                </a>
-                {% else %}
-                <a href="{% url 'accounts:login' %}" class="block py-2 text-white font-medium rounded-lg hover:bg-blue-600 transition duration-200">
-                    Anmelden
-                </a>
-                {% endif %}
-            </div>
-        </div>
+
+    <div class="flex items-center space-x-4 md:w-40 ">
+        <ul class="flex space-x-4 qp-nav-list">
+            {% if show_search %}
+            <li class="hidden md:flex"><a href="{% url 'library:overview_quiz' %}">Bibliothek</a></li>
+            {% else%}
+            <li><a href="{% url 'library:overview_quiz' %}">Bibliothek</a></li>
+            {% endif %}
+            {% if user.is_authenticated %}
+            <li><a href="{% url 'accounts:home' %}">Konto</a></li>
+            {% else %}
+            <li><a href="{% url 'accounts:login' %}">Anmelden</a></li>
+            {% endif %}
+        </ul>
     </div>
 </nav>
-
-<!-- Mobile Menu Script -->
-<script>
-    document.addEventListener('DOMContentLoaded', function() {
-        const mobileMenuButton = document.getElementById('mobile-menu-button');
-        const mobileMenu = document.getElementById('mobile-menu');
-        const mainNav = document.getElementById('main-nav');
-
-        mobileMenuButton.addEventListener('click', function() {
-            // Toggle menu visibility
-            if (mobileMenu.classList.contains('hidden')) {
-                // Show menu
-                mobileMenu.classList.remove('hidden');
-                // Entferne unten abgerundete Ecken der Navbar wenn Menü offen
-                mainNav.classList.remove('rounded-lg');
-                mainNav.classList.add('rounded-t-lg');
-                // Animation einfahren
-                setTimeout(() => {
-                    mobileMenu.classList.remove('opacity-0', 'transform', '-translate-y-2');
-                    mobileMenu.classList.add('opacity-100');
-                }, 50);
-            } else {
-                // Ausfahren Animation
-                mobileMenu.classList.add('opacity-0', 'transform', '-translate-y-2');
-                mobileMenu.classList.remove('opacity-100');
-                // Nach der Animation verstecken
-                setTimeout(() => {
-                    mobileMenu.classList.add('hidden');
-                    // Stelle die abgerundeten Ecken wieder her
-                    mainNav.classList.remove('rounded-t-lg');
-                    mainNav.classList.add('rounded-lg');
-                }, 300);
-            }
-        });
-    });
-</script>

django/templates/play/game/finished.html

@@ -11,7 +11,6 @@
             </div>
                     
             {% if not is_host %}
-            {% if rating_enabled %}
             <div class="bg-blue-50 rounded-lg p-6 mb-8">
                 <h2 class="text-2xl font-bold text-blue-800 mb-4 text-center">Wie hat dir das Quiz gefallen?</h2>
                 <div class="stars flex justify-center space-x-4 mb-4">
@@ -23,9 +22,6 @@
                 </div>
                 <p id="rating-message" class="text-center text-blue-600 font-medium"></p>
             </div>
-            {% else %}
-                <p class="text-center text-blue-600 font-medium mb-8">Bewertungen sind deaktiviert</p>
-            {% endif %}
             {% endif %}
 
             <div class="text-center">

django/templates/play/game/question_host.html

@@ -15,7 +15,7 @@
 
         {% if question_image %}
             <div class="flex justify-center">
-                <img class="m-4" src="{{ question_image.image.url }}" style="max-width: 500px;" alt="Bild der Frage">
+                <img class="m-4" src="{{ question_image.url }}" style="max-width: 500px;" alt="Bild der Frage">
             </div>
         {% endif %}
         

django/templates/play/game/score_overview.html

@@ -17,109 +17,52 @@
                 {% endfor %}
             </div>
         </div>
-
     {% if request.session.mode != "learn" %} 
+    
         <div class="mb-6">
             <h2 class="text-xl font-bold mb-4">Punktestand</h2>
-            <div id="scoreboard" class="space-y-2">
+            <div class="space-y-2">
                 {% for participant in participants %}
-                    {% if participant == my_participant or is_host %}
-                        <div class="p-4 bg-gray-100 rounded-lg flex justify-between items-center border {% if forloop.counter <= 3 %}border-yellow-500{% else %}border-transparent{% endif %}">
-                            <div>  
-                                <p class="text-lg font-bold">
-                                    {% if forloop.counter == 1 %}
-                                        🥇 
-                                    {% elif forloop.counter == 2 %}
-                                        🥈 
-                                    {% elif forloop.counter == 3 %}
-                                        🥉 
-                                    {% endif %}
-                                    {{ 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 %}
+                {% 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>                     
+                        {% 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">
-                Quiz beenden
-            </button>
-        {% else %}
-            <button id="next-button" class="w-full p-3 rounded-full bg-blue-600 text-white font-bold hover:bg-blue-700 transition-colors duration-200">
-                Nächste Frage
-            </button>
         {% endif %}
-    {% 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">
+                    Quiz beenden
+                </button>
+            {% else %}
+                <button id="next-button" class="w-full p-3 rounded-full bg-blue-600 text-white font-bold hover:bg-blue-700 transition-colors duration-200">
+                    Nächste Frage
+                </button>
+            {% endif %}
+        {% endif %}
     </div>
 </div>
 {% endblock %}
 
 {% block extra_js %}
-{% if is_last_question %}
-<script>
-    // Hilfsfunktion für Pausen
-    function sleep(ms) {
-      return new Promise(resolve => setTimeout(resolve, ms));
-    }
-  
-    document.addEventListener('DOMContentLoaded', async function() {
-      const items = document.querySelectorAll('#scoreboard div');
-      const top3 = Array.from(items).slice(0, 3); // Nur die ersten 3 animieren
-  
-      // Sofort Startzustände für Top3 setzen, die anderen sofort sichtbar
-      items.forEach((el, index) => {
-        if (index >= 3) {
-          el.style.opacity = '1';
-          el.style.transform = 'translateY(0)';
-        } else {
-          el.style.opacity = '0';
-          el.style.transform = 'translateY(20px)';
-        }
-      });
-  
-      // Warten bevor Animation startet
-      await sleep(1500);  // <<< hier die 5 Sekunden Pause
-  
-      // Transition-Eigenschaft setzen nach Render-Zyklus
-      requestAnimationFrame(() => {
-        top3.forEach(el => {
-          el.style.transition = 'all 0.8s ease';
-        });
-  
-        // Animation für Top 3 starten – von Platz 3 zu 1
-        top3.reverse().forEach((el, index) => {
-          setTimeout(() => {
-            el.style.opacity = '1';
-            el.style.transform = 'translateY(0)';
-  
-            if (index === top3.length - 1) {
-              triggerConfetti();
-            }
-          }, index * 1500); // Zeitversetzt aufdecken
-        });
-      });
-    });
-  
-    function triggerConfetti() {
-      const end = Date.now() + 15 * 1000;
-      (function frame() {
-        confetti({ particleCount: 2, angle: 60, spread: 55, origin: { x: 0 } });
-        confetti({ particleCount: 2, angle: 120, spread: 55, origin: { x: 1 } });
-        if (Date.now() < end) requestAnimationFrame(frame);
-      })();
-    }
-  </script>
-{% endif %}  
 {% include 'play/game/common_scripts.html' %}
 <script>
     const joinCode = '{{ quiz_game.join_code }}';

django/templates/play/initialize_participant.html

@@ -24,7 +24,8 @@
                        required
                        maxlength="20"
                        class="w-full px-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent"
-                       placeholder="Dein Spielername">
+                       placeholder="Dein Spielername"
+                       value="{{ participant.display_name }}">
                 <p class="text-xs text-gray-500 mt-2">Maximal 20 Zeichen</p>
             </div>
 

django/templates/play/lobby.html

@@ -22,6 +22,7 @@
                 <span class="w-2 h-2 bg-green-500 rounded-full mr-2"></span>
                 <span>Angemeldet als <b>{{ participant.display_name }}</b></span>
             </div>
+            <a href="{% url 'play:create_participant' quiz_game.join_code %}">Auftreten ändern...</a>
         </div>
         {% endif %}
 
@@ -33,7 +34,7 @@
                 </svg>
                 Teilnehmer
             </h3>
-            <ul id="participants-list" class="space-y-2 max-h-60">
+            <ul id="participants-list" class="space-y-2 max-h-60 overflow-y-auto">
                 <li class="text-gray-500 p-3 bg-gray-50 rounded-lg text-center">Warte auf Teilnehmer...</li>
             </ul>
         </div>

requirements.txt

@@ -5,5 +5,3 @@ daphne~=4.1.2    # ASGI server
 pillow~=11.1.0   # Image handling
 whitenoise~=6.6.0  # Static file serving
 django-cleanup
-redis
-channels_redis