Compare commits
70 Commits
20-t-style
...
51-im-impr
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
69dc2530ce | ||
|
|
e0bfda0dee | ||
|
|
23675bc69e | ||
|
|
94659791e6 | ||
|
|
17cc0af02d | ||
|
|
f28878e1b0 | ||
|
|
2a8b0b813c | ||
|
|
f18ed83f9d | ||
|
|
d1cca38595 | ||
|
|
1f1344522f | ||
|
|
7cad46063e | ||
|
|
55750bcf1f | ||
|
|
230944cbcd | ||
|
|
2f47ff8523 | ||
|
|
3ef7d61da6 | ||
|
|
7fe29c5bd4 | ||
|
|
5775e53bb8 | ||
|
|
57682d4607 | ||
|
|
915552ac4a | ||
| 861e89ae4d | |||
| 97fd326561 | |||
|
|
34a9ab6a43 | ||
|
|
4c597473b7 | ||
|
|
8119f202d3 | ||
| 6beccc772a | |||
|
|
4797a74111 | ||
|
|
30b5cd9731 | ||
|
|
6b83f26fc0 | ||
|
|
346ac69046 | ||
|
|
838eaab9be | ||
|
|
eba34fa2d4 | ||
|
|
9f51def959 | ||
| c8bf38dd36 | |||
|
|
7120dcd317 | ||
|
|
da419533e9 | ||
|
|
bd0aa651af | ||
|
|
d1b11a0c51 | ||
|
|
5dc849f551 | ||
| 35617470c4 | |||
|
|
b6991c2cbd | ||
|
|
a0e31d77f2 | ||
|
|
434d1f63e3 | ||
|
|
e3bd3c8579 | ||
|
|
7e66868a7d | ||
|
|
b306321565 | ||
|
|
3a099945b5 | ||
|
|
9f6c1cc33c | ||
|
|
13cbaaa6dc | ||
|
|
46634b1e1c | ||
|
|
3508b8e341 | ||
|
|
039e3ea0cb | ||
| 90d7a3ea94 | |||
| c348734ff4 | |||
| 35da688b1e | |||
|
|
089abfc598 | ||
| f732d8305e | |||
|
|
7a4caf7191 | ||
| 213b4cfd77 | |||
|
|
1f55ad8247 | ||
|
|
53ffe3822a | ||
|
|
71d8deab5b | ||
|
|
2173d7f928 | ||
|
|
eddab4a298 | ||
|
|
2ea2c03c67 | ||
|
|
0775710102 | ||
|
|
ba77d72091 | ||
|
|
b09eb2c7d6 | ||
|
|
47beb3a8e7 | ||
|
|
0eaac8c2f0 | ||
|
|
adb208a56a |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -2,4 +2,5 @@ __pycache__
|
|||||||
.venv
|
.venv
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
tailwindcss.exe
|
tailwindcss.exe
|
||||||
t-style.css
|
t-style.css
|
||||||
|
dump.rdb
|
||||||
23
README.md
23
README.md
@@ -6,6 +6,7 @@
|
|||||||
2. [Starten des Servers](#starten-des-servers)
|
2. [Starten des Servers](#starten-des-servers)
|
||||||
3. [Superuser erstellen](#superuser-erstellen)
|
3. [Superuser erstellen](#superuser-erstellen)
|
||||||
4. [Tailwind-Nutzung](#tailwind-nutzung)
|
4. [Tailwind-Nutzung](#tailwind-nutzung)
|
||||||
|
5. [Issue - Merge Request - Merge](#issue-mergerequest-merge)
|
||||||
|
|
||||||
## Initialisierung des Projekts
|
## Initialisierung des Projekts
|
||||||
|
|
||||||
@@ -83,7 +84,11 @@ npm install tailwindcss @tailwindcss/cli
|
|||||||
### Datei generieren
|
### Datei generieren
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
|
# Bei Verwendung der Binärdatei:
|
||||||
tailwindcss -i <INPUT-DATEI> -o <OUTPUT-DATEI> --watch --minify
|
tailwindcss -i <INPUT-DATEI> -o <OUTPUT-DATEI> --watch --minify
|
||||||
|
|
||||||
|
# Bei Verwendung von NPM:
|
||||||
|
npx @tailwindcss/cli -i <INPUT-DATEI> -o <OUTPUT-DATEI> --watch --minify
|
||||||
```
|
```
|
||||||
|
|
||||||
- INPUT-DATEI: CSS Datei, welche die Einbindung und Konfiguration von Tailwind enthält
|
- INPUT-DATEI: CSS Datei, welche die Einbindung und Konfiguration von Tailwind enthält
|
||||||
@@ -94,5 +99,19 @@ tailwindcss -i <INPUT-DATEI> -o <OUTPUT-DATEI> --watch --minify
|
|||||||
**Beispiel:**
|
**Beispiel:**
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
tailwindcss -i core/homepage/static/homepage/t-input.css -o core/homepage/static/homepage/t-style.css --watch --minify
|
# unter Linux mit Tailwind Binärdatei:
|
||||||
```
|
tailwindcss -i core/static/homepage/t-input.css -o core/static/homepage/t-style.css --watch --minify
|
||||||
|
|
||||||
|
# unter Windows mit NPM:
|
||||||
|
npx @tailwindcss/cli -i .\core\static\homepage\t-input.css -o .\core\static\homepage\t-style.css --watch --minify
|
||||||
|
```
|
||||||
|
|
||||||
|
## Issue - Merge Request - Merge
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
3. Nach dem Hochladen kann der Merge in den Master durchgeführt werden.
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
{% load static %}
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="de">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>{% block title %}{% endblock %}</title>
|
|
||||||
<link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
{% include 'homepage/partials/_nav.html' %}
|
|
||||||
{% block content %}
|
|
||||||
{% endblock %}
|
|
||||||
{% include 'homepage/partials/_footer.html' %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
<nav class="flex justify-between bg-blue-600 h-12 px-4 sm:px-6 lg:px-8 rounded-lg m-2 shadow-md">
|
|
||||||
<div class="flex items-center">
|
|
||||||
<h2 class="text-xl font-bold text-white hover:scale-110 transition duration-200"><a href="#">qivip</a></h2>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center">
|
|
||||||
<ul class="flex space-x-4 qp-nav-list">
|
|
||||||
<li><a href="#">Start</a></li>
|
|
||||||
<li><a href="#">Bibliothek</a></li>
|
|
||||||
<li><a href="{% url 'login' %}">Konto</a></li> <!--Hier ist der Link erstmal auf das alte Login-Formular gesetzt! Zum Testen!-->
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,34 +0,0 @@
|
|||||||
{% load static %}
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="de">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Impressum</title>
|
|
||||||
<link rel="icon" type="image/png" href="{% static 'icons/favicon.png' %}">
|
|
||||||
<link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
{% include 'homepage/partials/_nav.html' %}
|
|
||||||
<div class="max-w-screen-lg mx-auto">
|
|
||||||
{% block content%}{% endblock %}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<div>
|
|
||||||
<h1>Impressum</h1>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<dvi>
|
|
||||||
<p>
|
|
||||||
Katharineum zu Lübeck
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Königsstraße 27-31
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
23552 Lübeck
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
{% include 'homepage/partials/_footer.html' %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
{% load static %}
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="de">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Impressum</title>
|
|
||||||
<link rel="icon" type="image/png" href="{% static 'icons/favicon.png' %}">
|
|
||||||
<link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
{% include 'homepage/partials/_nav.html' %}
|
|
||||||
<div class="max-w-screen-lg mx-auto">
|
|
||||||
{% block content%}{% endblock %}
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
Hallo, ich bin die Datenschutzerklärung!
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% include 'homepage/partials/_footer.html' %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
{% load static %}
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="de">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">
|
|
||||||
<title>qivip</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
{% include 'homepage/partials/_nav.html' %}
|
|
||||||
<div class="max-w-screen-lg mx-auto">
|
|
||||||
{% block content%}{% endblock %}
|
|
||||||
</div>
|
|
||||||
{% include 'homepage/partials/_footer.html' %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{% extends 'library/base.html' %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h1>Löschen</h1>
|
|
||||||
<p>Soll das Quiz "{{ object.name }}" wirklich gelöscht werden?</p>
|
|
||||||
<form method="post">
|
|
||||||
{% csrf_token %}
|
|
||||||
<button type="submit">Löschen</button>
|
|
||||||
<a href="{% url 'library:overview_quiz' %}">Abbrechen</a>
|
|
||||||
</form>
|
|
||||||
{% endblock %}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{% extends 'library/base.html' %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h1>{{ quiz.name }}</h1>
|
|
||||||
<p>{{ quiz.description }}</p>
|
|
||||||
<a href="{% url 'library:edit_quiz' quiz.id %}">Bearbeiten</a>
|
|
||||||
<a href="{% url 'library:delete_quiz' quiz.id %}">Löschen</a>
|
|
||||||
|
|
||||||
<h2>Fragen</h2>
|
|
||||||
<ul>
|
|
||||||
<a href="{% url 'library:new_question' %}">Neue Frage erstellen</a>
|
|
||||||
{% for question in questions %}
|
|
||||||
<li>{{ question.data }}</li>
|
|
||||||
<a href="{% url 'library:edit_question' question.id %}">Bearbeiten</a>
|
|
||||||
<a href="{% url 'library:delete_question' question.id %}">Löschen</a>
|
|
||||||
{% endfor %}
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
{% endblock %}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{% extends 'library/base.html' %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h1>Übersicht</h1>
|
|
||||||
<div class="flex justify-end">
|
|
||||||
<a href="{% url 'library:new_quiz' %}" class="bg-blue-500 text-white px-4 py-2 rounded-md">Neues Quiz erstellen</a>
|
|
||||||
</div>
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
|
||||||
{% for quiz in quizzes %}
|
|
||||||
<div class="bg-white rounded-lg p-4 shadow-md">
|
|
||||||
<h2 class="text-lg font-bold"><a href="{% url 'library:detail_quiz' quiz.id %}">{{ quiz.name }}</a></h2>
|
|
||||||
<p class="text-sm text-gray-600 my-8">{{ quiz.description }}</p>
|
|
||||||
<a href="#"class="qp-a-button-small bg-green-500">Spiel starten</a>
|
|
||||||
<button><a href="{% url 'library:edit_quiz' quiz.id %}"class="qp-a-button-small bg-indigo-500">Bearbeiten</a></button>
|
|
||||||
<a href="{% url 'library:delete_quiz' quiz.id %}" class="qp-a-button-small bg-purple-500">Löschen</a>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
from django.shortcuts import render, redirect, get_object_or_404
|
|
||||||
from django.contrib.auth.decorators import login_required
|
|
||||||
from django.contrib.auth.models import User
|
|
||||||
from .models import QivipQuiz, QivipQuestion
|
|
||||||
from .forms import QuizForm, QuestionForm
|
|
||||||
|
|
||||||
# Übersicht aller Quizze
|
|
||||||
@login_required
|
|
||||||
def overview_quiz(request):
|
|
||||||
quizzes = QivipQuiz.objects.filter(user_id=request.user)
|
|
||||||
return render(request, 'library/overview_quiz.html', {'quizzes': quizzes})
|
|
||||||
|
|
||||||
# Neues Quiz erstellen
|
|
||||||
@login_required
|
|
||||||
def new_quiz(request):
|
|
||||||
if request.method == 'POST':
|
|
||||||
form = QuizForm(request.POST)
|
|
||||||
if form.is_valid():
|
|
||||||
quiz = form.save(commit=False)
|
|
||||||
quiz.user_id = request.user
|
|
||||||
quiz.save()
|
|
||||||
form.save_m2m() # Speichert die Many-to-Many Beziehungen (Tags)
|
|
||||||
return redirect('library:edit_quiz', pk=quiz.pk)
|
|
||||||
else:
|
|
||||||
form = QuizForm()
|
|
||||||
return render(request, 'library/form.html', {'form': form})
|
|
||||||
|
|
||||||
# Quiz bearbeiten
|
|
||||||
@login_required
|
|
||||||
def edit_quiz(request, pk):
|
|
||||||
quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
|
|
||||||
if request.method == 'POST':
|
|
||||||
form = QuizForm(request.POST, instance=quiz)
|
|
||||||
if form.is_valid():
|
|
||||||
form.save()
|
|
||||||
return redirect('library:overview_quiz')
|
|
||||||
else:
|
|
||||||
form = QuizForm(instance=quiz)
|
|
||||||
return render(request, 'library/form.html', {'form': form})
|
|
||||||
|
|
||||||
# Quiz löschen
|
|
||||||
@login_required
|
|
||||||
def delete_quiz(request, pk):
|
|
||||||
quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
|
|
||||||
if request.method == 'POST':
|
|
||||||
quiz.delete()
|
|
||||||
return redirect('library:overview_quiz')
|
|
||||||
return render(request, 'library/delete_confirmation.html', {'object': quiz})
|
|
||||||
|
|
||||||
# Quiz anzeigen
|
|
||||||
@login_required
|
|
||||||
def detail_quiz(request, pk):
|
|
||||||
quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
|
|
||||||
questions = QivipQuestion.objects.filter(quiz_id=quiz)
|
|
||||||
return render(request, 'library/detail_quiz.html', {'quiz': quiz, 'questions': questions})
|
|
||||||
|
|
||||||
# Übersicht aller Fragen
|
|
||||||
@login_required
|
|
||||||
def question_list(request):
|
|
||||||
questions = QivipQuestion.objects.filter(quiz_id__user_id=request.user)
|
|
||||||
return render(request, 'library/question_list.html', {'questions': questions})
|
|
||||||
|
|
||||||
# Neue Frage erstellen
|
|
||||||
@login_required
|
|
||||||
def new_question(request):
|
|
||||||
if request.method == 'POST':
|
|
||||||
form = QuestionForm(request.POST)
|
|
||||||
if form.is_valid():
|
|
||||||
question = form.save(commit=False)
|
|
||||||
# Prüfe ob der User Zugriff auf das Quiz hat
|
|
||||||
if question.quiz_id.user_id != request.user:
|
|
||||||
return redirect('library:question_list')
|
|
||||||
question.save()
|
|
||||||
return redirect('library:edit_question', pk=question.pk)
|
|
||||||
else:
|
|
||||||
form = QuestionForm()
|
|
||||||
return render(request, 'library/form.html', {'form': form})
|
|
||||||
|
|
||||||
# Frage bearbeiten
|
|
||||||
@login_required
|
|
||||||
def edit_question(request, pk):
|
|
||||||
question = get_object_or_404(QivipQuestion, pk=pk, quiz_id__user_id=request.user)
|
|
||||||
if request.method == 'POST':
|
|
||||||
form = QuestionForm(request.POST, instance=question)
|
|
||||||
if form.is_valid():
|
|
||||||
form.save()
|
|
||||||
return redirect('library:edit_question', pk=pk)
|
|
||||||
else:
|
|
||||||
form = QuestionForm(instance=question)
|
|
||||||
return render(request, 'library/form.html', {'form': form})
|
|
||||||
|
|
||||||
# Frage löschen
|
|
||||||
@login_required
|
|
||||||
def delete_question(request, pk):
|
|
||||||
question = get_object_or_404(QivipQuestion, pk=pk, quiz_id__user_id=request.user)
|
|
||||||
if request.method == 'POST':
|
|
||||||
question.delete()
|
|
||||||
return redirect('library:detail_quiz', pk=question.quiz_id.pk)
|
|
||||||
return render(request, 'library/delete_confirmation.html', {'object': question})
|
|
||||||
@@ -35,6 +35,7 @@ INSTALLED_APPS = [
|
|||||||
'homepage.apps.HomepageConfig',
|
'homepage.apps.HomepageConfig',
|
||||||
'components.apps.ComponentsConfig',
|
'components.apps.ComponentsConfig',
|
||||||
'accounts.apps.AccountsConfig',
|
'accounts.apps.AccountsConfig',
|
||||||
|
'play',
|
||||||
'django.contrib.admin',
|
'django.contrib.admin',
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
'django.contrib.contenttypes',
|
'django.contrib.contenttypes',
|
||||||
@@ -58,7 +59,7 @@ ROOT_URLCONF = 'core.urls'
|
|||||||
TEMPLATES = [
|
TEMPLATES = [
|
||||||
{
|
{
|
||||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||||
'DIRS': [],
|
'DIRS': [BASE_DIR / 'templates'],
|
||||||
'APP_DIRS': True,
|
'APP_DIRS': True,
|
||||||
'OPTIONS': {
|
'OPTIONS': {
|
||||||
'context_processors': [
|
'context_processors': [
|
||||||
@@ -120,7 +121,7 @@ USE_TZ = True
|
|||||||
# https://docs.djangoproject.com/en/5.1/howto/static-files/
|
# https://docs.djangoproject.com/en/5.1/howto/static-files/
|
||||||
|
|
||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/static/'
|
||||||
BASE_DIR='static' #von ben8 hinzugefügt
|
STATICFILES_DIRS = [BASE_DIR / 'static']
|
||||||
|
|
||||||
# Default primary key field type
|
# Default primary key field type
|
||||||
# https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
|
# https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
|
||||||
@@ -21,6 +21,6 @@ urlpatterns = [
|
|||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
path('account/', include('accounts.urls')),
|
path('account/', include('accounts.urls')),
|
||||||
path('', include('homepage.urls')),
|
path('', include('homepage.urls')),
|
||||||
path('play/', include('components.urls')),
|
path('play/', include('play.urls')),
|
||||||
path('library/', include('library.urls')),
|
path('library/', include('library.urls')),
|
||||||
]
|
]
|
||||||
18
django/library/migrations/0016_alter_qivipquiz_status.py
Normal file
18
django/library/migrations/0016_alter_qivipquiz_status.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 12:53
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0015_alter_qivipquiz_difficulty'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='status',
|
||||||
|
field=models.CharField(choices=[('öffentlich', 'Öffentlich'), ('versteckt', 'Versteckt'), ('privat', 'Privat')], default='öffentlich', max_length=10),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
django/library/migrations/0017_alter_qivipquiz_difficulty.py
Normal file
18
django/library/migrations/0017_alter_qivipquiz_difficulty.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 12:54
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0016_alter_qivipquiz_status'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='difficulty',
|
||||||
|
field=models.CharField(choices=[('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('nicht gesetzt', 'nicht gesetzt')], default='nicht gesetzt', help_text='1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit', max_length=13),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 13:03
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0017_alter_qivipquiz_difficulty'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(blank=True, default='In dem Quiz geht es um ...', max_length=150, null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 13:05
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0018_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(default='In dem Quiz geht es um ...', max_length=255, null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 13:08
|
||||||
|
|
||||||
|
import library.models
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0019_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(default='In dem Quiz geht es um ...', max_length=255, validators=[library.models.QivipQuiz.validate_description]),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
django/library/migrations/0021_alter_qivipquiz_name.py
Normal file
18
django/library/migrations/0021_alter_qivipquiz_name.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 14:34
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0020_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='name',
|
||||||
|
field=models.CharField(max_length=100),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 14:35
|
||||||
|
|
||||||
|
import library.models
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0021_alter_qivipquiz_name'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(default='In dem Quiz geht es um ...', max_length=200, validators=[library.models.QivipQuiz.validate_description]),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='name',
|
||||||
|
field=models.CharField(max_length=75),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -2,12 +2,13 @@ from django.db import models
|
|||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.utils.text import slugify
|
from django.utils.text import slugify
|
||||||
import uuid
|
import uuid
|
||||||
|
from django.core.exceptions import ValidationError
|
||||||
|
|
||||||
class QivipQuiz(models.Model):
|
class QivipQuiz(models.Model):
|
||||||
STATUS_VALUES = {
|
STATUS_VALUES = {
|
||||||
"public": "Öffentlich",
|
"öffentlich": "Öffentlich",
|
||||||
"hidden": "Versteckt",
|
"versteckt": "Versteckt",
|
||||||
"private": "Privat",
|
"privat": "Privat",
|
||||||
}
|
}
|
||||||
DIFFICULTY_VALUES = {
|
DIFFICULTY_VALUES = {
|
||||||
"1": "1",
|
"1": "1",
|
||||||
@@ -15,20 +16,25 @@ class QivipQuiz(models.Model):
|
|||||||
"3": "3",
|
"3": "3",
|
||||||
"4": "4",
|
"4": "4",
|
||||||
"5": "5",
|
"5": "5",
|
||||||
"not defined":"nicht gesetzt",
|
"nicht gesetzt":"nicht gesetzt",
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def validate_description(value):
|
||||||
|
if value.strip() == "In dem Quiz geht es um ...":
|
||||||
|
raise ValidationError("Bitte gib eine aussagekräftige Beschreibung ein.")
|
||||||
|
|
||||||
|
|
||||||
uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
|
uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
|
||||||
user_id = models.ForeignKey(User, on_delete=models.CASCADE, related_name='quiz')
|
user_id = models.ForeignKey(User, on_delete=models.CASCADE, related_name='quiz')
|
||||||
creation_date = models.DateTimeField(auto_now_add=True)
|
creation_date = models.DateTimeField(auto_now_add=True)
|
||||||
update_date = models.DateTimeField(auto_now=True)
|
update_date = models.DateTimeField(auto_now=True)
|
||||||
status = models.CharField(max_length=10, choices=list(STATUS_VALUES.items()), default="public")
|
status = models.CharField(max_length=10, choices=list(STATUS_VALUES.items()), default="öffentlich")
|
||||||
category = models.ForeignKey('QuizCategory', related_name='quiz', on_delete=models.CASCADE)
|
category = models.ForeignKey('QuizCategory', related_name='quiz', on_delete=models.CASCADE)
|
||||||
tags = models.ManyToManyField('Tag', blank=True)
|
tags = models.ManyToManyField('Tag', blank=True)
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=75)
|
||||||
description = models.TextField(blank=True, null=True, default="In dem Quiz geht es um ...")
|
description = models.TextField(validators=[validate_description],max_length=200,blank=False, default="In dem Quiz geht es um ...")
|
||||||
difficulty= models.CharField(max_length=11, choices=list(DIFFICULTY_VALUES.items()), default="not defined", help_text="1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit")
|
difficulty= models.CharField(max_length=13, choices=list(DIFFICULTY_VALUES.items()), default="nicht gesetzt", help_text="1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit")
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
301
django/library/views.py
Normal file
301
django/library/views.py
Normal file
@@ -0,0 +1,301 @@
|
|||||||
|
from django.shortcuts import render, redirect, get_object_or_404
|
||||||
|
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
|
||||||
|
from .forms import QuizForm, QuestionForm
|
||||||
|
import json
|
||||||
|
from django.core.paginator import Paginator
|
||||||
|
# Übersicht aller Quizze
|
||||||
|
|
||||||
|
def overview_quiz(request):
|
||||||
|
try:
|
||||||
|
quizzes = QivipQuiz.objects.filter(user_id=request.user)
|
||||||
|
all_quizzes = QivipQuiz.objects.filter(status='öffentlich').exclude(user_id=request.user).filter(question__isnull=False).distinct()
|
||||||
|
return render(request, 'library/overview_quiz.html', {'quizzes': quizzes, 'all_quizzes': all_quizzes})
|
||||||
|
|
||||||
|
except:
|
||||||
|
all_quizzes = QivipQuiz.objects.filter(status='öffentlich').filter(question__isnull=False).distinct()
|
||||||
|
return render(request, 'library/overview_quiz.html', {'quizzes': None, 'all_quizzes': all_quizzes})
|
||||||
|
|
||||||
|
# Neues Quiz erstellen
|
||||||
|
@login_required
|
||||||
|
def new_quiz(request):
|
||||||
|
if request.method == 'POST':
|
||||||
|
form = QuizForm(request.POST)
|
||||||
|
if form.is_valid():
|
||||||
|
quiz = form.save(commit=False)
|
||||||
|
quiz.user_id = request.user
|
||||||
|
quiz.save()
|
||||||
|
form.save_m2m() # Speichert die Many-to-Many Beziehungen (Tags)
|
||||||
|
return redirect('library:edit_quiz', pk=quiz.pk)
|
||||||
|
else:
|
||||||
|
form = QuizForm()
|
||||||
|
return render(request, 'library/form.html', {'form': form})
|
||||||
|
|
||||||
|
# Quiz bearbeiten
|
||||||
|
@login_required
|
||||||
|
def edit_quiz(request, pk):
|
||||||
|
quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
|
||||||
|
if request.method == 'POST':
|
||||||
|
form = QuizForm(request.POST, instance=quiz)
|
||||||
|
if form.is_valid():
|
||||||
|
form.save()
|
||||||
|
return redirect('library:overview_quiz')
|
||||||
|
else:
|
||||||
|
form = QuizForm(instance=quiz)
|
||||||
|
return render(request, 'library/form.html', {'form': form})
|
||||||
|
|
||||||
|
# Quiz löschen
|
||||||
|
@login_required
|
||||||
|
def delete_quiz(request, pk):
|
||||||
|
quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
|
||||||
|
if request.method == 'POST':
|
||||||
|
quiz.delete()
|
||||||
|
return redirect('library:overview_quiz')
|
||||||
|
return render(request, 'library/delete_confirmation.html', {'object': quiz})
|
||||||
|
|
||||||
|
# Quiz anzeigen
|
||||||
|
@login_required
|
||||||
|
def detail_quiz(request, pk):
|
||||||
|
quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
|
||||||
|
questions = QivipQuestion.objects.filter(quiz_id=quiz)
|
||||||
|
|
||||||
|
# Parse JSON data for each question
|
||||||
|
for question in questions:
|
||||||
|
if question.data:
|
||||||
|
question.data = json.loads(question.data)
|
||||||
|
|
||||||
|
context = {
|
||||||
|
'quiz': quiz,
|
||||||
|
'questions': questions
|
||||||
|
}
|
||||||
|
return render(request, 'library/detail_quiz.html', context)
|
||||||
|
|
||||||
|
# Übersicht aller Fragen
|
||||||
|
@login_required
|
||||||
|
def question_list(request):
|
||||||
|
questions = QivipQuestion.objects.filter(quiz_id__user_id=request.user)
|
||||||
|
|
||||||
|
# Parse JSON data for each question
|
||||||
|
for question in questions:
|
||||||
|
if question.data:
|
||||||
|
question.data = json.loads(question.data)
|
||||||
|
|
||||||
|
return render(request, 'library/question_list.html', {'questions': questions})
|
||||||
|
|
||||||
|
# Neue Frage erstellen
|
||||||
|
@login_required
|
||||||
|
def new_question(request):
|
||||||
|
question_type = request.GET.get('type')
|
||||||
|
quiz_id = request.GET.get('quiz_id')
|
||||||
|
|
||||||
|
if not quiz_id:
|
||||||
|
messages.error(request, 'Quiz ID muss angegeben werden.')
|
||||||
|
return redirect('library:overview_quiz')
|
||||||
|
|
||||||
|
try:
|
||||||
|
quiz = QivipQuiz.objects.get(pk=quiz_id, user_id=request.user)
|
||||||
|
except QivipQuiz.DoesNotExist:
|
||||||
|
messages.error(request, 'Quiz nicht gefunden oder keine Berechtigung.')
|
||||||
|
return redirect('library:overview_quiz')
|
||||||
|
|
||||||
|
if question_type not in ['multiple_choice', 'true_false']:
|
||||||
|
base_url = reverse('library:new_question')
|
||||||
|
return redirect(f'{base_url}?type=multiple_choice&quiz_id={quiz_id}')
|
||||||
|
|
||||||
|
if request.method == 'POST':
|
||||||
|
question_text = request.POST.get('question', '')
|
||||||
|
|
||||||
|
# Handle different question types
|
||||||
|
if question_type == 'true_false':
|
||||||
|
correct_answer = request.POST.get('correct_answer') == 'true'
|
||||||
|
json_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': question_text,
|
||||||
|
'options': [
|
||||||
|
{'value': 'Wahr', 'is_correct': correct_answer},
|
||||||
|
{'value': 'Falsch', 'is_correct': not correct_answer}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
elif question_type == 'multiple_choice':
|
||||||
|
options = []
|
||||||
|
i = 1
|
||||||
|
# Limit to maximum 6 options
|
||||||
|
while request.POST.get(f'option_{i}') and i <= 6:
|
||||||
|
is_correct = request.POST.get(f'correct_{i}') == '1'
|
||||||
|
options.append({
|
||||||
|
'order': i,
|
||||||
|
'value': request.POST.get(f'option_{i}'),
|
||||||
|
'is_correct': is_correct
|
||||||
|
})
|
||||||
|
i += 1
|
||||||
|
|
||||||
|
# Validate minimum 2 options
|
||||||
|
if len(options) < 2:
|
||||||
|
messages.error(request, 'Mindestens zwei Optionen müssen angegeben werden.')
|
||||||
|
return redirect(request.get_full_path())
|
||||||
|
|
||||||
|
json_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': question_text,
|
||||||
|
'options': options
|
||||||
|
}
|
||||||
|
|
||||||
|
question = QivipQuestion()
|
||||||
|
question.data = json.dumps(json_data)
|
||||||
|
question.quiz_id = quiz
|
||||||
|
question.save()
|
||||||
|
return redirect('library:detail_quiz', pk=quiz.pk)
|
||||||
|
else:
|
||||||
|
# Initialize empty question data for new questions
|
||||||
|
if question_type == 'true_false':
|
||||||
|
question_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': '',
|
||||||
|
'options': [
|
||||||
|
{'value': 'Wahr', 'is_correct': True},
|
||||||
|
{'value': 'Falsch', 'is_correct': False}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
elif question_type == 'multiple_choice':
|
||||||
|
question_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': '',
|
||||||
|
'options': [
|
||||||
|
{'value': '', 'is_correct': False},
|
||||||
|
{'value': '', 'is_correct': False}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
template_name = f'library/question/question_{question_type}.html'
|
||||||
|
context = {
|
||||||
|
'question': question_data,
|
||||||
|
'quiz_id': quiz_id,
|
||||||
|
'quiz': quiz
|
||||||
|
}
|
||||||
|
|
||||||
|
return render(request, template_name, context)
|
||||||
|
|
||||||
|
# Frage bearbeiten
|
||||||
|
@login_required
|
||||||
|
def edit_question(request, pk):
|
||||||
|
question = get_object_or_404(QivipQuestion, pk=pk, quiz_id__user_id=request.user)
|
||||||
|
if question.quiz_id.user_id != request.user:
|
||||||
|
return redirect('library:question_list')
|
||||||
|
|
||||||
|
# Parse the existing JSON data
|
||||||
|
try:
|
||||||
|
question_data = json.loads(question.data) if question.data else {}
|
||||||
|
question_type = question_data.get('type', 'multiple_choice')
|
||||||
|
|
||||||
|
# For true/false questions, get the correct answer from the options
|
||||||
|
if question_type == 'true_false':
|
||||||
|
# Default to true if no options exist
|
||||||
|
correct_answer = True
|
||||||
|
if question_data.get('options'):
|
||||||
|
correct_answer = question_data['options'][0].get('is_correct', True)
|
||||||
|
question_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': question_data.get('question', ''),
|
||||||
|
'correct_answer': correct_answer, # Add this for template compatibility
|
||||||
|
'options': [
|
||||||
|
{'value': 'Wahr', 'is_correct': correct_answer},
|
||||||
|
{'value': 'Falsch', 'is_correct': not correct_answer}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
# For multiple choice questions
|
||||||
|
question_data.setdefault('type', question_type)
|
||||||
|
question_data.setdefault('question', '')
|
||||||
|
question_data.setdefault('options', [])
|
||||||
|
|
||||||
|
except (json.JSONDecodeError, AttributeError):
|
||||||
|
# Handle invalid JSON or None data
|
||||||
|
question_type = question_data.get('type', 'multiple_choice')
|
||||||
|
if question_type == 'true_false':
|
||||||
|
question_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': '',
|
||||||
|
'correct_answer': True, # Default to true for new questions
|
||||||
|
'options': [
|
||||||
|
{'value': 'Wahr', 'is_correct': True},
|
||||||
|
{'value': 'Falsch', 'is_correct': False}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
question_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': '',
|
||||||
|
'options': []
|
||||||
|
}
|
||||||
|
|
||||||
|
if request.method == 'POST':
|
||||||
|
question_text = request.POST.get('question', '')
|
||||||
|
|
||||||
|
# Handle different question types
|
||||||
|
if question_type == 'true_false':
|
||||||
|
correct_answer = request.POST.get('correct_answer') == 'true'
|
||||||
|
json_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': question_text,
|
||||||
|
'options': [
|
||||||
|
{'value': 'Wahr', 'is_correct': correct_answer},
|
||||||
|
{'value': 'Falsch', 'is_correct': not correct_answer}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
elif question_type == 'multiple_choice':
|
||||||
|
options = []
|
||||||
|
i = 1
|
||||||
|
# Limit to maximum 6 options
|
||||||
|
while request.POST.get(f'option_{i}') and i <= 6:
|
||||||
|
options.append({
|
||||||
|
'order': i,
|
||||||
|
'value': request.POST.get(f'option_{i}'),
|
||||||
|
'is_correct': request.POST.get(f'correct_{i}') == '1'
|
||||||
|
})
|
||||||
|
i += 1
|
||||||
|
|
||||||
|
# Validate minimum 2 options
|
||||||
|
if len(options) < 2:
|
||||||
|
messages.error(request, 'Mindestens zwei Optionen müssen angegeben werden.')
|
||||||
|
return redirect(request.get_full_path())
|
||||||
|
|
||||||
|
# Validate maximum 6 options
|
||||||
|
if len(options) > 6:
|
||||||
|
messages.error(request, 'Maximal 6 Optionen sind erlaubt.')
|
||||||
|
return redirect(request.get_full_path())
|
||||||
|
|
||||||
|
json_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': question_text,
|
||||||
|
'options': options
|
||||||
|
}
|
||||||
|
|
||||||
|
question.data = json.dumps(json_data)
|
||||||
|
question.save()
|
||||||
|
return redirect('library:detail_quiz', pk=question.quiz_id.pk)
|
||||||
|
else:
|
||||||
|
template_name = f'library/question/question_{question_type}.html'
|
||||||
|
context = {
|
||||||
|
'question': {'data': question_data}, # Wrap in data structure expected by template
|
||||||
|
'quiz_id': question.quiz_id.pk,
|
||||||
|
'quiz': question.quiz_id
|
||||||
|
}
|
||||||
|
|
||||||
|
return render(request, template_name, context)
|
||||||
|
|
||||||
|
# Frage löschen
|
||||||
|
@login_required
|
||||||
|
def delete_question(request, pk):
|
||||||
|
question = get_object_or_404(QivipQuestion, pk=pk, quiz_id__user_id=request.user)
|
||||||
|
|
||||||
|
# Parse JSON data for question
|
||||||
|
if question.data:
|
||||||
|
question.data = json.loads(question.data)
|
||||||
|
|
||||||
|
if request.method == 'POST':
|
||||||
|
question.delete()
|
||||||
|
return redirect('library:detail_quiz', pk=question.quiz_id.pk)
|
||||||
|
return render(request, 'library/delete_confirmation.html', {'object': question})
|
||||||
0
django/play/__init__.py
Normal file
0
django/play/__init__.py
Normal file
6
django/play/admin.py
Normal file
6
django/play/admin.py
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
from django.contrib import admin
|
||||||
|
from .models import QuizGame, QuizGameParticipant
|
||||||
|
|
||||||
|
# Register your models here.
|
||||||
|
admin.site.register(QuizGame)
|
||||||
|
admin.site.register(QuizGameParticipant)
|
||||||
6
django/play/apps.py
Normal file
6
django/play/apps.py
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class PlayConfig(AppConfig):
|
||||||
|
default_auto_field = 'django.db.models.BigAutoField'
|
||||||
|
name = 'play'
|
||||||
37
django/play/migrations/0001_initial.py
Normal file
37
django/play/migrations/0001_initial.py
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-15 13:48
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
initial = True
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0015_alter_qivipquiz_difficulty'),
|
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='QuizGame',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('join_code', models.CharField(max_length=6, unique=True)),
|
||||||
|
('host_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='host_user', to=settings.AUTH_USER_MODEL)),
|
||||||
|
('quiz_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='library.qivipquiz')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='QuizGameParticipant',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('display_name', models.CharField(max_length=15, verbose_name='Anzeigename')),
|
||||||
|
('score', models.IntegerField(max_length=10, verbose_name='Punkte')),
|
||||||
|
('avatar', models.CharField(max_length=200)),
|
||||||
|
('quiz_game', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='participant', to='play.quizgame')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
]
|
||||||
18
django/play/migrations/0002_alter_quizgame_join_code.py
Normal file
18
django/play/migrations/0002_alter_quizgame_join_code.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-15 13:59
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('play', '0001_initial'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='quizgame',
|
||||||
|
name='join_code',
|
||||||
|
field=models.CharField(blank=True, max_length=6, unique=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-15 19:05
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('play', '0002_alter_quizgame_join_code'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='quizgameparticipant',
|
||||||
|
name='participant_id',
|
||||||
|
field=models.CharField(default=1, max_length=200, unique=True),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='quizgameparticipant',
|
||||||
|
name='avatar',
|
||||||
|
field=models.CharField(blank=True, default='', max_length=200),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='quizgameparticipant',
|
||||||
|
name='score',
|
||||||
|
field=models.IntegerField(default=0, verbose_name='Punkte'),
|
||||||
|
),
|
||||||
|
]
|
||||||
0
django/play/migrations/__init__.py
Normal file
0
django/play/migrations/__init__.py
Normal file
40
django/play/models.py
Normal file
40
django/play/models.py
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
from django.db import models
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
from library.models import QivipQuiz
|
||||||
|
from django.http import response
|
||||||
|
import random, string
|
||||||
|
|
||||||
|
# Create your models here.
|
||||||
|
class QuizGame(models.Model):
|
||||||
|
host_user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='host_user')
|
||||||
|
join_code = models.CharField(max_length=6, unique=True, blank=True)
|
||||||
|
quiz_id = models.ForeignKey(QivipQuiz, on_delete=models.CASCADE)
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
if not self.join_code:
|
||||||
|
self.join_code = self.generate_unique_code()
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
def generate_unique_code(self):
|
||||||
|
for i in range(10):
|
||||||
|
new_code = ''.join(random.choices(string.digits, k=6))
|
||||||
|
if not QuizGame.objects.filter(join_code=new_code).exists():
|
||||||
|
return new_code
|
||||||
|
|
||||||
|
class QuizGameParticipant(models.Model):
|
||||||
|
participant_id = models.CharField(max_length=200, unique=True)
|
||||||
|
display_name = models.CharField(verbose_name="Anzeigename", max_length=15)
|
||||||
|
quiz_game = models.ForeignKey(QuizGame, on_delete=models.CASCADE, related_name="participant")
|
||||||
|
score = models.IntegerField(verbose_name="Punkte", default=0)
|
||||||
|
avatar = models.CharField(max_length=200, blank=True, default="")
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
if not self.participant_id:
|
||||||
|
self.participant_id = self.generate_unique_id()
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
def generate_unique_id(self):
|
||||||
|
for i in range(10):
|
||||||
|
new_id = ''.join(random.choices(string.digits + string.ascii_lowercase, k=60))
|
||||||
|
if not QuizGameParticipant.objects.filter(participant_id=new_id).exists():
|
||||||
|
return new_id
|
||||||
3
django/play/tests.py
Normal file
3
django/play/tests.py
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
||||||
10
django/play/urls.py
Normal file
10
django/play/urls.py
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
from django.urls import path
|
||||||
|
from . import views
|
||||||
|
|
||||||
|
app_name = 'play'
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path('lobby/<str:join_code>', views.lobby, name='lobby'),
|
||||||
|
path('lobby/<str:join_code>/participate', views.create_participant, name='create_participant'),
|
||||||
|
path('join', views.join_game, name='join_game'),
|
||||||
|
]
|
||||||
60
django/play/views.py
Normal file
60
django/play/views.py
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
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 django.http import HttpResponseRedirect
|
||||||
|
|
||||||
|
# Create your views here.
|
||||||
|
def lobby(request, join_code):
|
||||||
|
if not "participant_id" in request.COOKIES:
|
||||||
|
return redirect('play:create_participant', join_code=join_code)
|
||||||
|
participant_id = request.COOKIES['participant_id']
|
||||||
|
quiz_game = get_object_or_404(QuizGame, join_code=join_code)
|
||||||
|
quiz = get_object_or_404(QivipQuiz, pk=quiz_game.quiz_id.id)
|
||||||
|
participant = get_object_or_404(QuizGameParticipant, participant_id=participant_id)
|
||||||
|
|
||||||
|
if not participant.quiz_game.join_code == join_code:
|
||||||
|
participant.quiz_game = quiz_game
|
||||||
|
participant.save()
|
||||||
|
|
||||||
|
context = {
|
||||||
|
'debug': "test",
|
||||||
|
'participant': participant,
|
||||||
|
'quiz': quiz,
|
||||||
|
}
|
||||||
|
|
||||||
|
return render(request, 'play/lobby.html', context=context)
|
||||||
|
|
||||||
|
def create_participant(request, join_code):
|
||||||
|
if "participant_id" in request.COOKIES: # Umleiten, falls Teilnehmer bereits erstellt
|
||||||
|
return redirect('play:lobby', join_code=join_code)
|
||||||
|
if request.method == 'POST':
|
||||||
|
display_name = request.POST.get('display_name')
|
||||||
|
join_code = request.POST.get('join_code')
|
||||||
|
try:
|
||||||
|
quiz = QuizGame.objects.get(join_code=join_code)
|
||||||
|
participant = QuizGameParticipant()
|
||||||
|
participant.display_name = display_name
|
||||||
|
participant.quiz_game = quiz
|
||||||
|
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
|
||||||
|
except QuizGame.DoesNotExist:
|
||||||
|
# TODO: Fehlermeldung fuer nicht-existierendes Quiz
|
||||||
|
pass
|
||||||
|
|
||||||
|
return render(request, 'play/initialize_participant.html', {'join_code': join_code})
|
||||||
|
|
||||||
|
def join_game(request):
|
||||||
|
if request.method == 'POST':
|
||||||
|
join_code = request.POST.get('game_code')
|
||||||
|
try:
|
||||||
|
quiz = QuizGame.objects.get(join_code=join_code)
|
||||||
|
return redirect('play:lobby', join_code=join_code)
|
||||||
|
except QuizGame.DoesNotExist:
|
||||||
|
# TODO: Mit message eine Fehlermeldung weitergeben (und im entsprechenden Template Designen)
|
||||||
|
pass
|
||||||
|
return render(request, 'play/join_game.html')
|
||||||
@@ -1,5 +1,9 @@
|
|||||||
@import 'tailwindcss';
|
@import 'tailwindcss';
|
||||||
|
|
||||||
|
qp-container {
|
||||||
|
@apply max-w-xl w-full mx-auto;
|
||||||
|
}
|
||||||
|
|
||||||
nav div ul.qp-nav-list li {
|
nav div ul.qp-nav-list li {
|
||||||
@apply text-white hover:scale-110 hover:border-b-2 hover:border-white transition duration-200;
|
@apply text-white hover:scale-110 hover:border-b-2 hover:border-white transition duration-200;
|
||||||
}
|
}
|
||||||
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
@@ -1,9 +1,9 @@
|
|||||||
{% extends 'accounts/base.html'%}
|
{% extends 'base.html'%}
|
||||||
{% block title %}Home{% endblock %}
|
{% block title %}Home{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
|
|
||||||
<div class="max-w-screen-lg mx-auto mt-12">
|
<div class="flex justify-center items-center mt-12 ">
|
||||||
<div class="input-group p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md">
|
<div class="input-group p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md">
|
||||||
<div class="grid place-content-center h-120">
|
<div class="grid place-content-center h-120">
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{% extends 'accounts/base.html' %}
|
{% extends 'base.html' %}
|
||||||
{% load static %}
|
{% load static %}
|
||||||
{% block title %}Anmeldung{% endblock %}
|
{% block title %}Anmeldung{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{% extends 'accounts/base.html' %}
|
{% extends 'base.html' %}
|
||||||
{% block title %}Registrierung{% endblock %}
|
{% block title %}Registrierung{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="grid place-content-center h-120 mt-12 mb-12">
|
<div class="grid place-content-center h-120 mt-12 mb-12">
|
||||||
@@ -5,12 +5,13 @@
|
|||||||
<link rel="icon" type="image/png" href="{% static 'icons/favicon.png' %}">
|
<link rel="icon" type="image/png" href="{% static 'icons/favicon.png' %}">
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">
|
<link rel="stylesheet" href="{% static 'css/t-style.css' %}">
|
||||||
<title>qivip</title>
|
<title>qivip</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{% include 'homepage/partials/_nav.html' %}
|
{% include 'partials/_nav.html' %}
|
||||||
{% block content%}{% endblock %}
|
{% block content%}{% endblock %}
|
||||||
{% include 'homepage/partials/_footer.html' %}
|
{% include 'partials/_footer.html' %}
|
||||||
|
{% block extra_js %}{% endblock %}
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{% extends 'homepage/base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="grid place-content-center md:h-screen h-150 w-full -z-50 top-0 p-4">
|
<div class="grid place-content-center md:h-screen h-150 w-full -z-50 top-0 p-4">
|
||||||
@@ -7,9 +7,9 @@
|
|||||||
<h3 class="italic font-extralight sm:text-2xl text-md">Interaktives Lernen neu definiert.</h3>
|
<h3 class="italic font-extralight sm:text-2xl text-md">Interaktives Lernen neu definiert.</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="grid sm:grid-cols-3 place-items-stretch text-center mt-8 gap-4 p-4 border-3 bg-blue-100 border-blue-100 rounded-md">
|
<div class="grid sm:grid-cols-3 place-items-stretch text-center mt-8 gap-4 p-4 border-3 bg-blue-100 border-blue-100 rounded-md">
|
||||||
<a class="qp-a-button bg-green-500 text-white" href="#">Teilnehmen</a>
|
<a class="qp-a-button bg-green-500 text-white" href="{% url 'play:join_game' %}">Teilnehmen</a>
|
||||||
<a class="qp-a-button bg-indigo-500 text-white" href="#">Moderieren</a>
|
<a class="qp-a-button bg-indigo-500 text-white" href="#">Moderieren</a>
|
||||||
<a class="qp-a-button bg-purple-500 text-white" href="#">Verwalten</a>
|
<a class="qp-a-button bg-purple-500 text-white" href="{% url 'library:new_quiz' %}">Erstellen</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
36
django/templates/homepage/impress.html
Normal file
36
django/templates/homepage/impress.html
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
{% block content%}
|
||||||
|
|
||||||
|
<div class="flex justify-center items-center mt-12 ">
|
||||||
|
<div class="input-group p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md">
|
||||||
|
<div class="grid place-content-center h-120">
|
||||||
|
|
||||||
|
<h1 class="text-center m-4 text-3xl lg:text-6xl">Impressum</b></h1>
|
||||||
|
Katharineum zu Lübeck <br>
|
||||||
|
Königsstraße 27-31 <br>
|
||||||
|
23552 Lübeck
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex justify-end">
|
||||||
|
<span class="text-[clamp(0.6rem,5vw,1rem)] font-black overflow-x-auto mt-1 ml-0.75 text-blue-600 p-0.75 bg-white">qivip
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
23
django/templates/homepage/privacy.html
Normal file
23
django/templates/homepage/privacy.html
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block content%}
|
||||||
|
<div class="flex justify-center items-center mt-12 ">
|
||||||
|
<div class="input-group p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md">
|
||||||
|
<div class="grid place-content-center h-120">
|
||||||
|
|
||||||
|
<h1 class="text-center m-4 text-3xl break-words lg:text-6xl">Datenschutz-<br>erklärung</b></h1>
|
||||||
|
Hier muss die Datenschutzerklärung stehen! <br>
|
||||||
|
<br>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex justify-end">
|
||||||
|
<span class="text-[clamp(0.6rem,5vw,1rem)] font-black overflow-x-auto mt-1 ml-0.75 text-blue-600 p-0.75 bg-white">qivip
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
39
django/templates/library/delete_confirmation.html
Normal file
39
django/templates/library/delete_confirmation.html
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="container mx-auto px-4">
|
||||||
|
<div class="max-w-lg mx-auto mt-10">
|
||||||
|
<div class="bg-white rounded-lg shadow-md p-6 border-blue-600 border-2 rounded-xl shadow-md">
|
||||||
|
<div class="text-center">
|
||||||
|
<svg class="mx-auto h-12 w-12 text-red-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"/>
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
<h2 class="mt-4 text-xl font-bold text-gray-900">Löschen bestätigen</h2>
|
||||||
|
|
||||||
|
<p class="mt-2 text-sm text-gray-600">
|
||||||
|
{% if object.quiz_id %}
|
||||||
|
Möchten Sie die Frage "{{ object.data.question }}" wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.
|
||||||
|
{% else %}
|
||||||
|
Möchten Sie das Quiz "{{ object.name }}" wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.
|
||||||
|
{% endif %}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form method="post" class="mt-6">
|
||||||
|
{% csrf_token %}
|
||||||
|
<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">
|
||||||
|
Abbrechen
|
||||||
|
</a>
|
||||||
|
<button type="submit"
|
||||||
|
class="inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-red-600 hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500">
|
||||||
|
Löschen
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
114
django/templates/library/detail_quiz.html
Normal file
114
django/templates/library/detail_quiz.html
Normal file
@@ -0,0 +1,114 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="container mx-auto px-4">
|
||||||
|
<div class="flex justify-between items-center mb-6">
|
||||||
|
<h1 class="text-2xl font-bold">{{ quiz.name }}</h1>
|
||||||
|
<div class="flex space-x-2">
|
||||||
|
<a href="{% url 'library:edit_quiz' quiz.id %}" class=" text-white px-4 py-2 rounded-md text-sm lg:text-lg hover:scale-110 transition-colors">✏</a>
|
||||||
|
<a href="{% url 'library:delete_quiz' quiz.id %}" class=" text-white px-4 py-2 rounded-md text-sm lg:text-lg hover:scale-110 transition-colors">🗑</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% if quiz.description %}
|
||||||
|
<p class="text-gray-600 mb-8">{{ quiz.description }}</p>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="bg-white rounded-lg shadow-md border-blue-600 border-2 rounded-xl shadow-md">
|
||||||
|
<div class="border-b border-gray-200 p-4">
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<h2 class="text-xl font-semibold">Fragen</h2>
|
||||||
|
<div class="flex space-x-2">
|
||||||
|
<a href="{% url 'library:new_question' %}?type=multiple_choice&quiz_id={{ quiz.id }}"
|
||||||
|
class="bg-blue-100 text-blue-800 px-4 py-2 rounded-md text-xs lg:text-lg hover:border-blue-600 border-2">
|
||||||
|
Multiple Choice
|
||||||
|
</a>
|
||||||
|
<a href="{% url 'library:new_question' %}?type=true_false&quiz_id={{ quiz.id }}"
|
||||||
|
class="bg-purple-100 text-purple-800 px-4 py-2 rounded-md text-xs lg:text-lg hover:border-blue-600 border-2">
|
||||||
|
Wahr/Falsch
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% if questions %}
|
||||||
|
|
||||||
|
<div class="divide-y divide-gray-200">
|
||||||
|
{% for question in questions %}
|
||||||
|
|
||||||
|
<div class="w-full rounded-xl p-4 hover:bg-gray-50">
|
||||||
|
<a class="block flex h-full w-full" href="{% url 'library:edit_question' question.id %}" >
|
||||||
|
<div class="flex justify-between items-start">
|
||||||
|
|
||||||
|
<div class="flex-grow">
|
||||||
|
<p class="font-medium">{{ question.data.question }}</p>
|
||||||
|
<div class="mt-1">
|
||||||
|
<span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium {% if question.data.type == 'multiple_choice' %}bg-blue-100 text-blue-800{% else %}bg-purple-100 text-purple-800{% endif %}">
|
||||||
|
{% if question.data.type == 'multiple_choice' %}Multiple Choice{% else %}Wahr/Falsch{% endif %}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="mt-2">
|
||||||
|
{% if question.data.type == 'multiple_choice' %}
|
||||||
|
<ul class="space-y-1 ">
|
||||||
|
{% for option in question.data.options %}
|
||||||
|
<li class="flex items-center text-sm">
|
||||||
|
{% if option.is_correct %}
|
||||||
|
<svg class="h-4 w-4 text-green-500 mr-1.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"/>
|
||||||
|
</svg>
|
||||||
|
<span class="font-medium text-green-700">{{ option.value }}</span>
|
||||||
|
{% else %}
|
||||||
|
<svg class="h-4 w-4 text-gray-400 mr-1.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M18 12H6"/>
|
||||||
|
</svg>
|
||||||
|
<span class="text-gray-600">{{ option.value }}</span>
|
||||||
|
{% endif %}
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
{% else %}
|
||||||
|
{% for option in question.data.options %}
|
||||||
|
{% if option.is_correct %}
|
||||||
|
<p class="text-sm">
|
||||||
|
<span class="text-gray-500">Richtige Antwort:</span>
|
||||||
|
<span class="ml-1 font-medium {% if option.value == "Wahr" %} text-green-700 {% else %}text-red-700{% endif %}">{{ option.value }}</span>
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex h-full space-x-2 ml-4 items-center">
|
||||||
|
<!--
|
||||||
|
<a href="{% url 'library:edit_question' question.id %}"
|
||||||
|
class="bg-gray-100 text-gray-700 px-3 py-1 rounded hover:bg-gray-200 transition-colors">
|
||||||
|
Bearbeiten
|
||||||
|
</a>
|
||||||
|
-->
|
||||||
|
|
||||||
|
<a href=" {% url 'library:delete_question' question.id %}"
|
||||||
|
class=" text-red-700 px-4 py-1 rounded hover:scale-110 ">
|
||||||
|
🗑
|
||||||
|
</a>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% else %}
|
||||||
|
|
||||||
|
<div class="p-8 text-center">
|
||||||
|
<svg class="mx-auto h-12 w-12 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2"/>
|
||||||
|
</svg>
|
||||||
|
<p class="mt-2 text-sm text-gray-500">Noch keine Fragen vorhanden. Erstellen Sie eine neue Frage, um loszulegen!</p>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
@@ -1,9 +1,7 @@
|
|||||||
{% extends 'library/base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1>Formular</h1>
|
<div class="input-group border-blue-600 border-2 rounded-xl shadow-md mt-12">
|
||||||
<h2>{{ form.name.value }}</h2>
|
|
||||||
<div class="input-group">
|
|
||||||
<form method="post">
|
<form method="post">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ form.as_p }}
|
{{ form.as_p }}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user