diff --git a/django/library/admin.py b/django/library/admin.py index 6526f60..685ee1c 100644 --- a/django/library/admin.py +++ b/django/library/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import QivipQuiz, QivipQuestion, QuizCategory, Tag +from .models import QivipQuiz, QivipQuestion, QuizCategory # Für das QivipQuiz Modell class QivipQuizAdmin(admin.ModelAdmin): @@ -27,4 +27,4 @@ class TagAdmin(admin.ModelAdmin): admin.site.register(QivipQuiz, QivipQuizAdmin) admin.site.register(QivipQuestion, QivipQuestionAdmin) admin.site.register(QuizCategory, QuizCategoryAdmin) -admin.site.register(Tag, TagAdmin) + diff --git a/django/library/forms.py b/django/library/forms.py index c454b71..958ae7b 100644 --- a/django/library/forms.py +++ b/django/library/forms.py @@ -4,7 +4,7 @@ from .models import QivipQuiz, QivipQuestion class QuizForm(forms.ModelForm): class Meta: model = QivipQuiz - fields = ['name', 'description','image', 'status', 'category', 'tags',"difficulty","credits"] + fields = ['name', 'description','image', 'status', 'category', "difficulty","credits"] class QuestionForm(forms.ModelForm): class Meta: diff --git a/django/library/migrations/0033_remove_qivipquiz_tags_delete_tag.py b/django/library/migrations/0033_remove_qivipquiz_tags_delete_tag.py new file mode 100644 index 0000000..680c87a --- /dev/null +++ b/django/library/migrations/0033_remove_qivipquiz_tags_delete_tag.py @@ -0,0 +1,20 @@ +# Generated by Django 5.1.7 on 2025-04-10 13:59 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0032_qivipquiz_average_rating_qivipquiz_rating_count_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='qivipquiz', + name='tags', + ), + migrations.DeleteModel( + name='Tag', + ), + ] diff --git a/django/library/migrations/0034_alter_qivipquiz_status.py b/django/library/migrations/0034_alter_qivipquiz_status.py new file mode 100644 index 0000000..27a3a46 --- /dev/null +++ b/django/library/migrations/0034_alter_qivipquiz_status.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.7 on 2025-04-10 14:04 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('library', '0033_remove_qivipquiz_tags_delete_tag'), + ] + + operations = [ + migrations.AlterField( + model_name='qivipquiz', + name='status', + field=models.CharField(choices=[('öffentlich', 'Öffentlich'), ('privat', 'Privat')], default='öffentlich', max_length=10), + ), + ] diff --git a/django/library/models.py b/django/library/models.py index ceb2eb5..82fcc5a 100644 --- a/django/library/models.py +++ b/django/library/models.py @@ -7,7 +7,7 @@ from django.core.exceptions import ValidationError class QivipQuiz(models.Model): STATUS_VALUES = { "öffentlich": "Öffentlich", - "versteckt": "Versteckt", + #"versteckt": "Versteckt", "privat": "Privat", } DIFFICULTY_VALUES = { @@ -33,7 +33,6 @@ class QivipQuiz(models.Model): update_date = models.DateTimeField(auto_now=True) status = models.CharField(max_length=10, choices=list(STATUS_VALUES.items()), default="öffentlich") category = models.ForeignKey('QuizCategory', related_name='quiz', on_delete=models.CASCADE) - tags = models.ManyToManyField('Tag', blank=True) name = models.CharField(max_length=75) description = models.TextField(validators=[validate_description],max_length=200,blank=False, default="In dem Quiz geht es um ...") difficulty= models.CharField(max_length=13, choices=list(DIFFICULTY_VALUES.items()), default="nicht gesetzt", help_text="1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit") @@ -57,11 +56,7 @@ class QivipQuestion(models.Model): def __str__(self): return self.data[:50] -class Tag(models.Model): - name = models.CharField(max_length=100, unique=True) - def __str__(self): - return self.name class QuizRating(models.Model): quiz = models.ForeignKey(QivipQuiz, on_delete=models.CASCADE, related_name='ratings')