|
{% if guess.correct %}
- {{ guess.guess }}
+ {{ puzzle.answer | upper }}
{% else %}
{{ guess.guess }}
{% endif %}
diff --git a/myus/myus/templatetags/duration.py b/myus/myus/templatetags/duration.py
new file mode 100644
index 0000000..a21ca82
--- /dev/null
+++ b/myus/myus/templatetags/duration.py
@@ -0,0 +1,12 @@
+from django import template
+
+register = template.Library()
+
+
+@register.filter
+def duration(td):
+ seconds = int(td.total_seconds())
+ (days, seconds) = divmod(seconds, 3600 * 24)
+ (hours, seconds) = divmod(seconds, 3600)
+ (minutes, seconds) = divmod(seconds, 60)
+ return "{} days {:02}:{:02}:{:02}".format(days, hours, minutes, seconds)
diff --git a/myus/myus/tests.py b/myus/myus/tests.py
index e540cd9..50d8ef6 100644
--- a/myus/myus/tests.py
+++ b/myus/myus/tests.py
@@ -4,7 +4,7 @@
from django.urls import reverse
from django.test import TestCase
-from myus.forms import HuntForm
+from myus.forms import NewHuntForm
from myus.models import Hunt, Puzzle, User
@@ -108,8 +108,8 @@ def test_view_puzzle_with_ids_and_wrong_slugs_redirects_to_ids_and_correct_slugs
self.assertRedirects(res, self.correct_url)
-class TestHuntForm(TestCase):
- """Test the HuntForm"""
+class TestNewHuntForm(TestCase):
+ """Test the NewHuntForm"""
def setUp(self):
self.shared_test_data = {
@@ -120,59 +120,59 @@ def setUp(self):
}
def test_hunt_form_accepts_start_time_in_iso_format(self):
- """The HuntForm accepts the start_time field in ISO format (YYYY-MM-DDTHH:MM:SS)"""
+ """The NewHuntForm accepts the start_time field in ISO format (YYYY-MM-DDTHH:MM:SS)"""
test_data = self.shared_test_data.copy()
start_time = datetime(2024, 3, 15, 1, 2, tzinfo=timezone.utc)
test_data["start_time"] = start_time.isoformat()
- form = HuntForm(data=test_data)
+ form = NewHuntForm(data=test_data)
self.assertTrue(form.is_valid(), msg=form.errors)
hunt = form.save()
self.assertEqual(hunt.start_time, start_time)
def test_hunt_form_accepts_start_time_without_seconds(self):
- """The HuntForm accepts the start_time field without seconds specified
+ """The NewHuntForm accepts the start_time field without seconds specified
The out-of-the-box datetime-local input appears to provide data in this format
"""
test_data = self.shared_test_data.copy()
start_time = datetime(2024, 3, 15, 1, 2, tzinfo=timezone.utc)
test_data["start_time"] = start_time.strftime("%Y-%m-%dT%H:%M")
- form = HuntForm(data=test_data)
+ form = NewHuntForm(data=test_data)
self.assertTrue(form.is_valid(), msg=form.errors)
hunt = form.save()
self.assertEqual(hunt.start_time, start_time)
def test_hunt_form_start_time_uses_datetime_local_input(self):
- """The HuntForm uses a datetime-local input for the start_time field"""
- form = HuntForm(data=self.shared_test_data)
+ """The NewHuntForm uses a datetime-local input for the start_time field"""
+ form = NewHuntForm(data=self.shared_test_data)
start_time_field = form.fields["start_time"]
self.assertEqual(start_time_field.widget.input_type, "datetime-local")
def test_hunt_form_accepts_end_time_in_iso_format(self):
- """The HuntForm accepts the end_time field in ISO format (YYYY-MM-DDTHH:MM:SS)"""
+ """The NewHuntForm accepts the end_time field in ISO format (YYYY-MM-DDTHH:MM:SS)"""
test_data = self.shared_test_data.copy()
end_time = datetime(2024, 3, 15, 1, 2, tzinfo=timezone.utc)
test_data["end_time"] = end_time.isoformat()
- form = HuntForm(data=test_data)
+ form = NewHuntForm(data=test_data)
self.assertTrue(form.is_valid(), msg=form.errors)
hunt = form.save()
self.assertEqual(hunt.end_time, end_time)
def test_hunt_form_accepts_end_time_without_seconds(self):
- """The HuntForm accepts the end_time field without seconds specified
+ """The NewHuntForm accepts the end_time field without seconds specified
The out-of-the-box datetime-local input appears to provide data in this format
"""
test_data = self.shared_test_data.copy()
end_time = datetime(2024, 3, 15, 1, 2, tzinfo=timezone.utc)
test_data["end_time"] = end_time.strftime("%Y-%m-%dT%H:%M")
- form = HuntForm(data=test_data)
+ form = NewHuntForm(data=test_data)
self.assertTrue(form.is_valid(), msg=form.errors)
hunt = form.save()
self.assertEqual(hunt.end_time, end_time)
def test_hunt_form_end_time_displays_datetime_local_widget(self):
- """The HuntForm uses a datetime-local input for the end_time field"""
- form = HuntForm(data=self.shared_test_data)
+ """The NewHuntForm uses a datetime-local input for the end_time field"""
+ form = NewHuntForm(data=self.shared_test_data)
end_time_field = form.fields["end_time"]
self.assertEqual(end_time_field.widget.input_type, "datetime-local")
diff --git a/myus/myus/urls.py b/myus/myus/urls.py
index cb7d17c..de7273e 100644
--- a/myus/myus/urls.py
+++ b/myus/myus/urls.py
@@ -23,6 +23,8 @@
),
path("register", views.register, name="register"),
path("new", views.new_hunt, name="new_hunt"),
+ path("hunt//edit", views.edit_hunt, name="edit_hunt"),
+ path("hunt/-/edit", views.edit_hunt, name="edit_hunt"),
path("hunt/", views.view_hunt, name="view_hunt"),
path("hunt/-", views.view_hunt, name="view_hunt"),
path("hunt//team", views.my_team, name="my_team"),
diff --git a/myus/myus/views.py b/myus/myus/views.py
index b7af6df..fdadc72 100644
--- a/myus/myus/views.py
+++ b/myus/myus/views.py
@@ -3,20 +3,22 @@
from django import urls
from django.contrib.auth.decorators import login_required
-from django.db.models import OuterRef, Sum, Subquery, Count, Q
-from django.db.models.functions import Coalesce
+from django.db.models import OuterRef, Sum, Subquery, Count, Q, F
+from django.db.models.functions import Coalesce, Greatest
from django.http import Http404, JsonResponse
from django.http import HttpResponse
from django.shortcuts import render, redirect, get_object_or_404
from django.template.loader import render_to_string
from django.views.decorators.csrf import csrf_exempt
+from django.core.exceptions import PermissionDenied
import django.urls as urls
import django.forms as forms
from .forms import (
GuessForm,
- HuntForm,
+ NewHuntForm,
+ EditHuntForm,
InviteMemberForm,
PuzzleForm,
RegisterForm,
@@ -54,7 +56,7 @@ def register(request):
@login_required
def new_hunt(request):
if request.method == "POST":
- form = HuntForm(request.POST)
+ form = NewHuntForm(request.POST)
if form.is_valid():
hunt = form.save()
@@ -63,7 +65,7 @@ def new_hunt(request):
return redirect(urls.reverse("view_hunt", args=[hunt.pk, hunt.slug]))
else:
- form = HuntForm()
+ form = NewHuntForm()
return render(
request,
@@ -207,13 +209,22 @@ def leaderboard(request, hunt_id: int, slug: Optional[str] = None):
.order_by("-time")[:1]
.values("time")
),
- ).order_by("-score", "-solve_count", "last_solve")
+ created_or_start=Greatest(F("creation_time"), hunt.start_time),
+ solve_time=Coalesce(F("last_solve"), F("created_or_start"))
+ - F("created_or_start"),
+ )
- print(teams.query)
+ # print(teams.query)
+ if hunt.leaderboard_style == Hunt.LeaderboardStyle.SPEEDRUN:
+ teams = teams.order_by("-score", "-solve_count", "solve_time")
+ template = "leaderboard_SPD.html"
+ else:
+ teams = teams.order_by("-score", "-solve_count", "last_solve")
+ template = "leaderboard.html"
return render(
request,
- "leaderboard.html",
+ template,
{
"hunt": hunt,
"team": team,
@@ -551,6 +562,35 @@ def edit_puzzle(
)
+@login_required
+@redirect_from_hunt_id_to_hunt_id_and_slug
+def edit_hunt(
+ request,
+ hunt_id: int,
+ slug: Optional[str] = None,
+):
+ user = request.user
+ hunt = get_object_or_404(Hunt, id=hunt_id)
+ if not hunt.organizers.filter(id=user.id).exists():
+ raise PermissionDenied
+
+ if request.method == "POST":
+ form = EditHuntForm(request.POST, instance=hunt)
+ if form.is_valid():
+ hunt = form.save()
+ return redirect(urls.reverse("view_hunt", args=[hunt.pk, hunt.slug]))
+ else:
+ form = EditHuntForm(instance=hunt)
+
+ return render(
+ request,
+ "edit_hunt.html",
+ {
+ "form": form,
+ },
+ )
+
+
@csrf_exempt
def preview_markdown(request):
if request.method == "POST":
|