This commit is contained in:
2024-12-11 23:22:09 +01:00
parent 4b86b33872
commit 9b7944c14d
53 changed files with 2054 additions and 249 deletions

View File

@@ -1,8 +1,11 @@
from typing import final
from django.db import models
from django.utils.translation import gettext_lazy as _
from django_stubs_ext.db.models import TypedModelMeta
@final
class Answer(models.Model):
text = models.CharField(max_length=64, verbose_name=_("text"))
question = models.ForeignKey(

View File

@@ -7,15 +7,16 @@ class Correction(models.Model):
candidate = models.ForeignKey(
"Candidate",
on_delete=models.CASCADE,
related_name="corrections_used",
related_name="corrections",
verbose_name=_("candidate"),
)
quiz = models.ForeignKey(
"Quiz",
on_delete=models.CASCADE,
related_name="corrections_used",
related_name="corrections",
verbose_name=_("quiz"),
)
amount = models.FloatField(verbose_name=_("amount"), default=1)
class Meta(TypedModelMeta):
unique_together = ("candidate", "quiz")

View File

@@ -1,7 +1,10 @@
from django.db import models
from django.db.models import QuerySet
from django.utils.translation import gettext_lazy as _
from django_stubs_ext.db.models import TypedModelMeta
from quiz.models import Answer
class NoActiveTestForSeason(Exception):
pass
@@ -21,6 +24,33 @@ class Question(models.Model):
)
enabled = models.BooleanField(default=True, verbose_name=_("enabled"))
@property
def order(self):
return self._order
@property
def right_answer(self) -> QuerySet[Answer]:
return self.answers.filter(is_right_answer=True)
@property
def has_right_answer(self) -> bool:
return self.answers.filter(is_right_answer=True).count() > 0
@property
def errors(self) -> str | None:
if self.answers.count() == 0:
return _("Error: Question has no answers")
n_correct_answers = self.answers.filter(is_right_answer=True).count()
if n_correct_answers == 0:
return _("Error: This question has no right answer!")
if n_correct_answers > 1:
return _("Warning: This question has multiple correct answers")
return None
def __str__(self) -> str:
return f"{self._order + 1}. {self.question} ({self.quiz}) ({self.answers.count()} answers, {self.answers.filter(is_right_answer=True).count()} correct)"

View File

@@ -1,7 +1,12 @@
from django.db import models
from django.db.models import F, OuterRef, Subquery
from django.db.models.aggregates import Count, Max, Min
from django.db.models.functions import Coalesce
from django.utils.translation import gettext_lazy as _
from django_stubs_ext.db.models import TypedModelMeta
from quiz.models import Candidate, Correction
class Quiz(models.Model):
name = models.CharField(max_length=64, verbose_name=_("name"))
@@ -12,11 +17,42 @@ class Quiz(models.Model):
verbose_name=_("season"),
)
dropouts = models.PositiveSmallIntegerField(
verbose_name=_("dropouts"),
default=1,
)
def is_valid_quiz(self) -> bool:
return True
# Check > 0 active questions
# Check every question 1 right answer
def get_score(self):
time_query = (
Candidate.objects.filter(id=OuterRef("id"), answers__quiz=self)
.annotate(time=Max("answers__created") - Min("answers__created"))
.values("time")
)
corrections = Correction.objects.filter(
quiz=self, candidate=OuterRef("id")
).values("amount")
scores = (
Candidate.objects.filter(
answers__answer__is_right_answer=True,
answers__quiz=self,
)
.values("id", "name")
.annotate(
correct=Count("answers"),
corrections=Coalesce(Subquery(corrections), 0.0),
score=F("correct") + F("corrections"),
time=Subquery(time_query),
)
.order_by("-score", "time")
)
return scores
def __str__(self) -> str:
return f"{self.season.name} - {self.name}"

View File

@@ -1,12 +1,12 @@
import random
import string
from django.contrib.auth import get_user_model
from django.db import models
from django.utils.translation import gettext_lazy as _
from django_stubs_ext.db.models import TypedModelMeta
from ..helpers import generate_season_code
User = get_user_model()
class Season(models.Model):
name = models.CharField(max_length=64, verbose_name=_("name"))
@@ -25,6 +25,11 @@ class Season(models.Model):
preregister_candidates = models.BooleanField(
default=True, verbose_name=_("preregister candidates")
)
owner = models.ManyToManyField(
User,
verbose_name=_("owners"),
related_name="seasons",
)
def renew_season_code(self) -> str:
self.season_code = generate_season_code()