- {% blocktrans with n=problem|problem_number %}Problem {{ n }}{% endblocktrans %} + {% problem_number problem categories as problem_number %} + {% blocktrans with n=problem_number %}Problem {{ n }}{% endblocktrans %}
{{ problem.statement|safe }}
diff --git a/bullet/problems/templatetags/archive_statements.py b/bullet/problems/templatetags/archive_statements.py
index f703ae46..7619ce1d 100644
--- a/bullet/problems/templatetags/archive_statements.py
+++ b/bullet/problems/templatetags/archive_statements.py
@@ -1,26 +1,29 @@
-from collections import defaultdict
from datetime import timedelta
from typing import Iterable
+from competitions.models.competitions import Category
from django import template
-from problems.models import CategoryProblem, ProblemStatement
+from problems.models import ProblemStatement
register = template.Library()
-@register.filter()
-def problem_number(obj: ProblemStatement):
- problems: Iterable[CategoryProblem] = obj.problem.category_problems.all()
- numbers = set([cp.number for cp in problems])
- if len(numbers) == 1:
- return numbers.pop()
+@register.simple_tag()
+def problem_number(problem: ProblemStatement, categories: Iterable[Category]):
+ numbers = []
+ used_numbers = set()
+
+ for cat in categories:
+ prefix = cat.identifier[0].upper()
+ number = problem.problem.number + 1 - cat.first_problem
+ numbers.append((prefix, number))
+ used_numbers.add(number)
- number_category: dict[int, set[str]] = defaultdict(set)
- for cp in problems:
- number_category[cp.number].add(cp.category.identifier[0].upper())
+ if len(used_numbers) == 1:
+ return used_numbers.pop()
- return " / ".join(f"{''.join(cat)}{n}" for n, cat in number_category.items())
+ return " / ".join([f"{n[0]}{n[1]}" for n in numbers if n[1] >= 1])
@register.filter()
diff --git a/bullet/problems/templatetags/results.py b/bullet/problems/templatetags/results.py
index 01f607aa..14dbe054 100644
--- a/bullet/problems/templatetags/results.py
+++ b/bullet/problems/templatetags/results.py
@@ -1,6 +1,7 @@
from typing import Optional
from competitions.models import Competition, Venue
+from competitions.models.competitions import Category
from django import template
from problems.models import ResultRow
@@ -15,12 +16,13 @@ def squares(
team_problem_count: Optional[int] = None,
first_problem: Optional[int] = None,
):
+ category: Category = obj.team.venue.category
if not team_problem_count:
- team_problem_count = obj.team.venue.category.problems_per_team
+ team_problem_count = category.problems_per_team
if not first_problem:
- first_problem = obj.team.venue.category.first_problem
+ first_problem = category.first_problem
if not problem_count:
- problem_count = obj.team.venue.category.problems.count()
+ problem_count = category.competition.problem_count - first_problem + 1
return {
"squares": obj.get_squares(problem_count, team_problem_count, first_problem),
diff --git a/bullet/problems/views/archive.py b/bullet/problems/views/archive.py
index cd428372..8c956661 100644
--- a/bullet/problems/views/archive.py
+++ b/bullet/problems/views/archive.py
@@ -46,10 +46,12 @@ class ProblemStatementView(ArchiveCompetitionMixin, ListView):
template_name = "archive/problems.html"
def get_queryset(self):
- return ProblemStatement.objects.filter(
- problem__competition=self.competition, language=get_language()
- ).prefetch_related(
- "problem__category_problems", "problem__category_problems__category"
+ return (
+ ProblemStatement.objects.filter(
+ problem__competition=self.competition, language=get_language()
+ )
+ .order_by("problem__number")
+ .select_related("problem")
)
def inject_stats(self, object_list):
@@ -71,21 +73,13 @@ def inject_stats(self, object_list):
return new_list
- def order_problems(self, problem_list: list[ProblemStatement]):
- reference_category = (
- Category.objects.filter(competition=self.competition)
- .annotate(problem_count=Count("problems"))
- .order_by("-problem_count")
- .first()
- )
- problems = reference_category.problems.all()
- problem_order = {p.problem_id: p.number for p in problems}
- problem_list.sort(key=lambda p: problem_order.get(p.problem_id, 99999))
+ def get_categories(self):
+ return Category.objects.filter(competition=self.competition)
def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
ctx["object_list"] = self.inject_stats(ctx["object_list"])
- self.order_problems(ctx["object_list"])
+ ctx["categories"] = self.get_categories()
pdf_file = self.competition.secret_dir / f"problems-{get_language()}.pdf"
if default_storage.exists(pdf_file):
diff --git a/bullet/problems/views/results.py b/bullet/problems/views/results.py
index 00f8b778..b476d424 100644
--- a/bullet/problems/views/results.py
+++ b/bullet/problems/views/results.py
@@ -1,6 +1,6 @@
from bullet_admin.access import is_any_admin
from competitions.models import Category, Competition, Venue
-from django.http import Http404
+from django.http import Http404, HttpRequest
from django.shortcuts import get_object_or_404
from django.utils import timezone
from django.utils.decorators import method_decorator
@@ -10,6 +10,7 @@
from django_countries.fields import Country
from problems.logic.results import (
+ ResultsTime,
get_category_results,
get_country_results,
get_venue_results,
@@ -50,6 +51,38 @@ class ResultsViewMixin(CompetitionMixin):
def get_results(self):
raise NotImplementedError()
+ def get_category(self):
+ raise NotImplementedError()
+
+ def get_venue_timer(self) -> Venue | None:
+ return None
+
+ request: HttpRequest
+
+ def get_results_time(self) -> ResultsTime:
+ admin = False
+ if self.request.GET.get("admin") == "1" and self.request.user.is_authenticated:
+ admin = is_any_admin(
+ self.request.user, self.competition, allow_operator=True
+ )
+
+ start_time = None
+ venue = self.get_venue_timer()
+ if venue:
+ start_time = venue.start_time
+ elif venue_code := self.request.GET.get("venue_timer"):
+ venue: Venue | None = (
+ Venue.objects.for_competition(self.competition)
+ .filter(shortcode=venue_code)
+ .first()
+ )
+ if venue:
+ start_time = venue.start_time
+
+ return results_time(
+ self.competition, timezone.now(), is_admin=admin, start_time=start_time
+ )
+
def get_queryset(self):
qs = self.get_results()
@@ -74,6 +107,14 @@ def get_context_data(self, *, object_list=None, **kwargs):
ctx["start_index"] = ctx["page_obj"].start_index
ctx["hide_squares"] = self.request.GET.get("hide_squares") == "1"
ctx["hide_contestants"] = self.request.GET.get("hide_contestants") == "1"
+
+ category = self.get_category()
+ ctx["team_problem_count"] = category.problems_per_team
+ ctx["first_problem"] = category.first_problem
+ ctx["problem_count"] = (
+ category.competition.problem_count - category.first_problem + 1
+ )
+ ctx["results_time"] = self.get_results_time()
return ctx
@@ -81,6 +122,9 @@ def get_context_data(self, *, object_list=None, **kwargs):
class CategoryResultsView(ResultsViewMixin, ListView):
template_name = "problems/results.html"
+ def get_category(self):
+ return self.category
+
def dispatch(self, request, *args, **kwargs):
self.country: str = kwargs.get("country")
if self.country:
@@ -95,42 +139,19 @@ def dispatch(self, request, *args, **kwargs):
identifier=self.kwargs["category"],
)
- admin = False
- if request.GET.get("admin") == "1":
- admin = is_any_admin(
- self.request.user, self.competition, allow_operator=True
- )
-
- start_time = None
- if "venue_timer" in request.GET:
- start_time = (
- Venue.objects.for_competition(self.competition)
- .filter(shortcode=request.GET["venue_timer"])
- .first()
- )
- if start_time:
- start_time = start_time.start_time
-
- self.results_time = results_time(
- self.competition, timezone.now(), is_admin=admin, start_time=start_time
- )
-
return super().dispatch(request, *args, **kwargs)
def get_results(self):
if self.country:
return get_country_results(
- self.country.upper(), self.category, self.results_time.time
+ self.country.upper(), self.category, self.get_results_time().time
)
- return get_category_results(self.category, self.results_time.time)
+ return get_category_results(self.category, self.get_results_time().time)
def get_context_data(self, *, object_list=None, **kwargs):
ctx = super().get_context_data(object_list=object_list, **kwargs)
- ctx["team_problem_count"] = self.category.problems_per_team
- ctx["problem_count"] = self.category.problems.count()
- ctx["first_problem"] = self.category.first_problem
+
ctx["category"] = self.category
- ctx["results_time"] = self.results_time
ctx["country_name"] = (
Country(self.country).name if self.country else _("International")
@@ -150,34 +171,24 @@ def get_context_data(self, *, object_list=None, **kwargs):
class VenueResultsView(ResultsViewMixin, ListView):
template_name = "problems/results/venue.html"
+ def get_category(self):
+ return self.venue.category
+
+ def get_venue_timer(self) -> Venue | None:
+ return self.venue
+
def dispatch(self, request, *args, **kwargs):
self.venue = get_object_or_404(
Venue.objects.for_competition(self.competition),
shortcode=self.kwargs["venue"].upper(),
)
- admin = False
- if request.GET.get("admin") == "1":
- admin = is_any_admin(
- self.request.user, self.competition, allow_operator=True
- )
- self.results_time = results_time(
- self.competition,
- timezone.now(),
- start_time=self.venue.local_start,
- is_admin=admin,
- )
-
return super().dispatch(request, *args, **kwargs)
def get_results(self):
- return get_venue_results(self.venue, self.results_time.time)
+ return get_venue_results(self.venue, self.get_results_time().time)
def get_context_data(self, *, object_list=None, **kwargs):
ctx = super().get_context_data(object_list=object_list, **kwargs)
- ctx["team_problem_count"] = self.venue.category.problems_per_team
- ctx["problem_count"] = self.venue.category.problems.count()
- ctx["first_problem"] = self.venue.category.first_problem
ctx["venue"] = self.venue
- ctx["results_time"] = self.results_time
return ctx