-
-
+ {% if grouping_question %}
+
+
+
+
+ Grouped by {{ grouping_question.name }}
+
+
+
+
+ View combined
+ View grouped
+
+
-
+
{% include "partials/_leaderboard_table.html" with teams=team_data %}
-
- {% include "partials/_leaderboard_table.html" with teams=team_data_true %}
-
-
- {% include "partials/_leaderboard_table.html" with teams=team_data_false %}
+
+ {% for group in leaderboard_groups %}
+
{{ group.label }}
+ {% include "partials/_leaderboard_table.html" with teams=group.teams %}
+ {% endfor %}
{% else %}
diff --git a/puzzlehunt/templates/partials/_leaderboard_table.html b/puzzlehunt/templates/partials/_leaderboard_table.html
index 748d416..081252e 100644
--- a/puzzlehunt/templates/partials/_leaderboard_table.html
+++ b/puzzlehunt/templates/partials/_leaderboard_table.html
@@ -2,8 +2,9 @@
@template: _leaderboard_table.html
@description: Reusable leaderboard table partial for displaying team rankings.
@context:
- teams: List of Team objects with computed_rank attribute
+ teams: List of Team objects with computed_rank and data_answer_values attributes
ruleset: List of LeaderboardRule objects defining the columns and ranking rules
+ data_questions: List of TeamDataQuestion objects visible on the leaderboard
hunt: The Hunt object being displayed
{% endcomment %}
@@ -21,6 +22,9 @@
{{ rule.display_name }}
{% endif %}
{% endfor %}
+ {% for question in data_questions %}
+
{{ question.name }}
+ {% endfor %}
{% for team in teams %}
@@ -43,6 +47,9 @@
{% endif %}
{% endif %}
{% endfor %}
+ {% for value in team.data_answer_values %}
+ {{ value }}
+ {% endfor %}
{% endfor %}
diff --git a/puzzlehunt/templates/partials/_team_data_question_list.html b/puzzlehunt/templates/partials/_team_data_question_list.html
new file mode 100644
index 0000000..04dad8f
--- /dev/null
+++ b/puzzlehunt/templates/partials/_team_data_question_list.html
@@ -0,0 +1,76 @@
+{% load crispy_forms_tags %}
+{% comment %}
+@template: _team_data_question_list.html
+@description: Renders the ordered list of TeamDataQuestion rows for a hunt, each editable/deletable/movable via HTMX.
+@context:
+ hunt: The Hunt object
+ questions: List of TeamDataQuestion objects for the hunt, ordered by question_order, each with an edit_form
+{% endcomment %}
+ {% if questions %}
+ {% for question in questions %}
+
+
+
+
+
+ {% if question.question_type == "TEXT" %}
+ Text
+ {% elif question.question_type == "BOOL" %}
+ Yes/No
+ {% else %}
+ Select
+ {% endif %}
+
+
+
{{ question.name }}
+ {% if question.description %}
{{ question.description }}
{% endif %}
+ {% if question.question_type == "SEL" %}
+
Options: {{ question.options|join:", " }}
+ {% endif %}
+
+ {% if question.required %}Required {% endif %}
+ {% if question.visible_on_leaderboard %}On Leaderboard {% endif %}
+ {% if question.used_for_grouping %}Groups Leaderboard {% endif %}
+
+
+
+
+
+
+ {% crispy question.edit_form %}
+ Cancel
+
+
+ {% endfor %}
+ {% else %}
+
No custom questions configured for this hunt.
+ {% endif %}
diff --git a/puzzlehunt/templates/staff_hunt_base.html b/puzzlehunt/templates/staff_hunt_base.html
index 6a55717..4cf4339 100644
--- a/puzzlehunt/templates/staff_hunt_base.html
+++ b/puzzlehunt/templates/staff_hunt_base.html
@@ -116,6 +116,10 @@
href="{% url 'puzzlehunt:staff:hunt_puzzles' hunt.id %}">
Puzzles
+
+ Team Data Questions
+
Hunt Template
diff --git a/puzzlehunt/templates/staff_participant_info.html b/puzzlehunt/templates/staff_participant_info.html
index 46697e2..734abbb 100644
--- a/puzzlehunt/templates/staff_participant_info.html
+++ b/puzzlehunt/templates/staff_participant_info.html
@@ -115,6 +115,31 @@ Search Participants
Enter search terms to find participants or teams
+
+
+ {% if data_questions %}
+
+
Team Data
+
+
+
+ Team
+ {% for question in data_questions %}
+ {{ question.name }}
+ {% endfor %}
+
+ {% for team in teams %}
+
+ {{ team.name }}
+ {% for value in team.data_answer_values %}
+ {{ value }}
+ {% endfor %}
+
+ {% endfor %}
+
+
+
+ {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/puzzlehunt/templates/staff_team_data_questions.html b/puzzlehunt/templates/staff_team_data_questions.html
new file mode 100644
index 0000000..1777679
--- /dev/null
+++ b/puzzlehunt/templates/staff_team_data_questions.html
@@ -0,0 +1,56 @@
+{% extends 'staff_hunt_base.html' %}
+{% load crispy_forms_tags %}
+{% comment %}
+@template: staff_team_data_questions.html
+@description: Staff interface for configuring per-hunt custom team data registration questions.
+@extends: staff_hunt_base.html
+@blocks:
+ staff_content: Displays the ordered question list and an "add question" modal
+@context:
+ hunt: The current Hunt object
+ questions: List of TeamDataQuestion objects for the hunt, ordered by question_order, each with an edit_form
+ create_form: TeamDataQuestionForm for adding a new question
+{% endcomment %}
+
+{% block title_meta_elements %}
+ {% with title="Staff Team Data Questions" %} {{ block.super }} {% endwith %}
+{% endblock title_meta_elements %}
+
+{% block staff_content %}
+
+
+
+
+
Team Data Questions
+
+
+
+ Add Question
+
+
+
+
+ These questions are shown to teams when they register or update their team, and can optionally be
+ shown as leaderboard columns or used to split the leaderboard into groups.
+
+
+
+ {% include "partials/_team_data_question_list.html" %}
+
+
+
+
+
+
+
+ {% crispy create_form %}
+
+
+
+
+
+{% endblock %}
diff --git a/puzzlehunt/tests/test_team_data_questions.py b/puzzlehunt/tests/test_team_data_questions.py
new file mode 100644
index 0000000..cace721
--- /dev/null
+++ b/puzzlehunt/tests/test_team_data_questions.py
@@ -0,0 +1,271 @@
+import pytest
+from django.core.exceptions import ValidationError
+from django.urls import reverse
+from django.utils import timezone
+
+from puzzlehunt.models import Hunt, Team, TeamDataAnswer, TeamDataQuestion
+
+pytestmark = pytest.mark.django_db
+
+
+@pytest.fixture
+def other_hunt():
+ """A second hunt, independent from basic_hunt, used for isolation checks."""
+ return Hunt.objects.create(
+ name="Other Hunt",
+ is_current_hunt=False,
+ team_size_limit=4,
+ start_date=timezone.now(),
+ end_date=timezone.now() + timezone.timedelta(days=1),
+ )
+
+
+# --- Model behavior ---
+
+def test_question_creation(basic_hunt):
+ question = TeamDataQuestion.objects.create(
+ hunt=basic_hunt, name="Fun Fact", question_type=TeamDataQuestion.QuestionType.TEXT, question_order=1
+ )
+ assert question.hunt == basic_hunt
+ assert question.question_type == "TEXT"
+
+
+def test_question_order_unique_per_hunt(basic_hunt):
+ TeamDataQuestion.objects.create(hunt=basic_hunt, name="Q1", question_order=1)
+ with pytest.raises(ValidationError):
+ q2 = TeamDataQuestion(hunt=basic_hunt, name="Q2", question_order=1)
+ q2.full_clean()
+
+
+def test_question_order_can_repeat_across_hunts(basic_hunt, other_hunt):
+ TeamDataQuestion.objects.create(hunt=basic_hunt, name="Q1", question_order=1)
+ # Should not raise - question_order is only unique within a hunt
+ TeamDataQuestion.objects.create(hunt=other_hunt, name="Q1", question_order=1)
+
+
+def test_select_question_requires_options(basic_hunt):
+ question = TeamDataQuestion(
+ hunt=basic_hunt, name="Size", question_type=TeamDataQuestion.QuestionType.SELECT,
+ question_order=1, options=[]
+ )
+ with pytest.raises(ValidationError):
+ question.full_clean()
+
+
+def test_non_select_question_rejects_options(basic_hunt):
+ question = TeamDataQuestion(
+ hunt=basic_hunt, name="Fun Fact", question_type=TeamDataQuestion.QuestionType.TEXT,
+ question_order=1, options=["A", "B"]
+ )
+ with pytest.raises(ValidationError):
+ question.full_clean()
+
+
+def test_answer_unique_per_question_and_team(basic_hunt):
+ question = TeamDataQuestion.objects.create(hunt=basic_hunt, name="Q1", question_order=1)
+ team = Team.objects.create(name="Team A", hunt=basic_hunt)
+ TeamDataAnswer.objects.create(question=question, team=team, value="hello")
+ with pytest.raises(ValidationError):
+ answer = TeamDataAnswer(question=question, team=team, value="world")
+ answer.full_clean()
+
+
+def test_deleting_question_cascades_to_answers(basic_hunt):
+ question = TeamDataQuestion.objects.create(hunt=basic_hunt, name="Q1", question_order=1)
+ team = Team.objects.create(name="Team A", hunt=basic_hunt)
+ TeamDataAnswer.objects.create(question=question, team=team, value="hello")
+ question.delete()
+ assert TeamDataAnswer.objects.count() == 0
+
+
+def test_deleting_team_cascades_to_answers(basic_hunt):
+ question = TeamDataQuestion.objects.create(hunt=basic_hunt, name="Q1", question_order=1)
+ team = Team.objects.create(name="Team A", hunt=basic_hunt)
+ TeamDataAnswer.objects.create(question=question, team=team, value="hello")
+ team.delete()
+ assert TeamDataAnswer.objects.count() == 0
+
+
+def test_boolean_answer_display_value(basic_hunt):
+ question = TeamDataQuestion.objects.create(
+ hunt=basic_hunt, name="First timer?", question_type=TeamDataQuestion.QuestionType.BOOLEAN, question_order=1
+ )
+ team = Team.objects.create(name="Team A", hunt=basic_hunt)
+ yes = TeamDataAnswer.objects.create(question=question, team=team, value="True")
+ assert yes.display_value == "Yes"
+
+
+# --- Registration form / per-hunt isolation ---
+
+def test_registration_form_only_shows_questions_for_current_hunt(client, basic_hunt, other_hunt, basic_user):
+ TeamDataQuestion.objects.create(hunt=basic_hunt, name="Current Hunt Question", question_order=1)
+ TeamDataQuestion.objects.create(hunt=other_hunt, name="Other Hunt Question", question_order=1)
+
+ client.force_login(basic_user)
+ response = client.get(reverse('puzzlehunt:team_create'))
+ content = response.content.decode()
+ assert "Current Hunt Question" in content
+ assert "Other Hunt Question" not in content
+
+
+def test_registration_rejects_invalid_select_option(client, basic_hunt, basic_user):
+ question = TeamDataQuestion.objects.create(
+ hunt=basic_hunt, name="Shirt Size", question_type=TeamDataQuestion.QuestionType.SELECT,
+ options=["S", "M", "L"], question_order=1, required=True
+ )
+ client.force_login(basic_user)
+ response = client.post(reverse('puzzlehunt:team_create'), {
+ 'name': 'Test Team',
+ f'question_{question.pk}': 'XL', # not a valid option
+ })
+ assert response.status_code == 200
+ assert not Team.objects.filter(name='Test Team').exists()
+
+
+def test_registration_saves_multiple_question_types(client, basic_hunt, basic_user):
+ q_text = TeamDataQuestion.objects.create(hunt=basic_hunt, name="Motto", question_order=1)
+ q_bool = TeamDataQuestion.objects.create(
+ hunt=basic_hunt, name="First timer?", question_type=TeamDataQuestion.QuestionType.BOOLEAN, question_order=2
+ )
+ q_sel = TeamDataQuestion.objects.create(
+ hunt=basic_hunt, name="Size", question_type=TeamDataQuestion.QuestionType.SELECT,
+ options=["S", "M", "L"], question_order=3
+ )
+
+ client.force_login(basic_user)
+ response = client.post(reverse('puzzlehunt:team_create'), {
+ 'name': 'Multi Team',
+ f'question_{q_text.pk}': 'Puzzles are fun',
+ f'question_{q_bool.pk}': 'on',
+ f'question_{q_sel.pk}': 'M',
+ })
+ assert response.status_code == 302
+
+ team = Team.objects.get(name='Multi Team')
+ answers = {a.question_id: a.value for a in team.teamdataanswer_set.all()}
+ assert answers[q_text.pk] == 'Puzzles are fun'
+ assert answers[q_bool.pk] == 'True'
+ assert answers[q_sel.pk] == 'M'
+
+
+# --- Staff CRUD views ---
+
+def test_staff_can_create_question(client, basic_hunt, staff_user):
+ client.force_login(staff_user)
+ response = client.post(
+ reverse('puzzlehunt:staff:team_data_question_create', args=[basic_hunt.pk]),
+ {'name': 'Dietary Restrictions', 'question_type': 'TEXT'},
+ )
+ assert response.status_code in (200, 302)
+ assert TeamDataQuestion.objects.filter(hunt=basic_hunt, name='Dietary Restrictions').exists()
+
+
+def test_non_staff_cannot_create_question(client, basic_hunt, basic_user):
+ client.force_login(basic_user)
+ response = client.post(
+ reverse('puzzlehunt:staff:team_data_question_create', args=[basic_hunt.pk]),
+ {'name': 'Dietary Restrictions', 'question_type': 'TEXT'},
+ )
+ assert response.status_code in (302, 403)
+ assert not TeamDataQuestion.objects.filter(hunt=basic_hunt).exists()
+
+
+def test_staff_create_select_without_options_is_rejected(client, basic_hunt, staff_user):
+ client.force_login(staff_user)
+ client.post(
+ reverse('puzzlehunt:staff:team_data_question_create', args=[basic_hunt.pk]),
+ {'name': 'Size', 'question_type': 'SEL', 'options': ''},
+ )
+ assert not TeamDataQuestion.objects.filter(hunt=basic_hunt, name='Size').exists()
+
+
+def test_staff_update_question(client, basic_hunt, staff_user):
+ question = TeamDataQuestion.objects.create(hunt=basic_hunt, name="Old Name", question_order=1)
+ client.force_login(staff_user)
+ client.post(
+ reverse('puzzlehunt:staff:team_data_question_update', args=[basic_hunt.pk, question.pk]),
+ {'name': 'New Name', 'question_type': 'TEXT'},
+ )
+ question.refresh_from_db()
+ assert question.name == 'New Name'
+
+
+def test_staff_delete_question(client, basic_hunt, staff_user):
+ question = TeamDataQuestion.objects.create(hunt=basic_hunt, name="Q1", question_order=1)
+ client.force_login(staff_user)
+ client.post(reverse('puzzlehunt:staff:team_data_question_delete', args=[basic_hunt.pk, question.pk]))
+ assert not TeamDataQuestion.objects.filter(pk=question.pk).exists()
+
+
+def test_staff_move_question_swaps_order(client, basic_hunt, staff_user):
+ q1 = TeamDataQuestion.objects.create(hunt=basic_hunt, name="Q1", question_order=1)
+ q2 = TeamDataQuestion.objects.create(hunt=basic_hunt, name="Q2", question_order=2)
+
+ client.force_login(staff_user)
+ client.post(
+ reverse('puzzlehunt:staff:team_data_question_move', args=[basic_hunt.pk, q2.pk]),
+ {'direction': 'up'},
+ )
+ q1.refresh_from_db()
+ q2.refresh_from_db()
+ assert q2.question_order == 1
+ assert q1.question_order == 2
+
+
+def test_used_for_grouping_is_exclusive_per_hunt(client, basic_hunt, staff_user):
+ q1 = TeamDataQuestion.objects.create(hunt=basic_hunt, name="Q1", question_order=1, used_for_grouping=True)
+ q2 = TeamDataQuestion.objects.create(hunt=basic_hunt, name="Q2", question_order=2)
+
+ client.force_login(staff_user)
+ client.post(
+ reverse('puzzlehunt:staff:team_data_question_update', args=[basic_hunt.pk, q2.pk]),
+ {'name': 'Q2', 'question_type': 'TEXT', 'used_for_grouping': 'on'},
+ )
+ q1.refresh_from_db()
+ q2.refresh_from_db()
+ assert q1.used_for_grouping is False
+ assert q2.used_for_grouping is True
+
+
+# --- Leaderboard ---
+
+def test_leaderboard_shows_visible_columns_only(client, basic_hunt, basic_user):
+ TeamDataQuestion.objects.create(
+ hunt=basic_hunt, name="Shown Question", question_order=1, visible_on_leaderboard=True
+ )
+ TeamDataQuestion.objects.create(
+ hunt=basic_hunt, name="Hidden Question", question_order=2, visible_on_leaderboard=False
+ )
+ Team.objects.create(name="Team A", hunt=basic_hunt)
+
+ client.force_login(basic_user)
+ response = client.get(reverse('puzzlehunt:hunt_leaderboard', args=[basic_hunt.pk]))
+ content = response.content.decode()
+ assert "Shown Question" in content
+ assert "Hidden Question" not in content
+
+
+def test_leaderboard_groups_by_select_question(client, basic_hunt, basic_user):
+ question = TeamDataQuestion.objects.create(
+ hunt=basic_hunt, name="Division", question_type=TeamDataQuestion.QuestionType.SELECT,
+ options=["Rookie", "Veteran"], question_order=1, used_for_grouping=True
+ )
+ t1 = Team.objects.create(name="Team A", hunt=basic_hunt)
+ t2 = Team.objects.create(name="Team B", hunt=basic_hunt)
+ TeamDataAnswer.objects.create(question=question, team=t1, value="Rookie")
+ TeamDataAnswer.objects.create(question=question, team=t2, value="Veteran")
+
+ client.force_login(basic_user)
+ response = client.get(reverse('puzzlehunt:hunt_leaderboard', args=[basic_hunt.pk]))
+ content = response.content.decode()
+ assert "Grouped by Division" in content
+ assert "Rookie" in content
+ assert "Veteran" in content
+
+
+def test_leaderboard_no_grouping_when_no_question_configured(client, basic_hunt, basic_user):
+ Team.objects.create(name="Team A", hunt=basic_hunt)
+ client.force_login(basic_user)
+ response = client.get(reverse('puzzlehunt:hunt_leaderboard', args=[basic_hunt.pk]))
+ content = response.content.decode()
+ assert "Grouped by" not in content
diff --git a/puzzlehunt/tests/test_team_views.py b/puzzlehunt/tests/test_team_views.py
index a4ea82c..ae735b8 100644
--- a/puzzlehunt/tests/test_team_views.py
+++ b/puzzlehunt/tests/test_team_views.py
@@ -10,8 +10,7 @@ def test_team_create_view_success(client, basic_hunt, basic_user):
url = reverse('puzzlehunt:team_create')
response = client.post(url, {
- 'name': 'View Test Team',
- 'custom_data': ''
+ 'name': 'View Test Team'
})
assert response.status_code == 302 # Redirect after success
@@ -31,8 +30,7 @@ def test_team_create_view_duplicate_name(client, basic_hunt, basic_user):
url = reverse('puzzlehunt:team_create')
response = client.post(url, {
- 'name': 'Existing Team',
- 'custom_data': ''
+ 'name': 'Existing Team'
})
assert response.status_code == 200 # Returns to form with errors
assert Team.objects.count() == 1 # No new team created
@@ -44,8 +42,7 @@ def test_team_create_view_invalid_name(client, basic_hunt, basic_user):
url = reverse('puzzlehunt:team_create')
response = client.post(url, {
- 'name': '!@#$%',
- 'custom_data': ''
+ 'name': '!@#$%'
})
assert response.status_code == 200 # Returns to form with errors
assert Team.objects.count() == 0
@@ -63,8 +60,7 @@ def test_team_update_view_success(client, basic_hunt, basic_user):
url = reverse('puzzlehunt:team_update', kwargs={'pk': team.pk})
response = client.post(url, {
- 'name': 'Updated Via View',
- 'custom_data': ''
+ 'name': 'Updated Via View'
}, HTTP_HX_REQUEST='true')
assert response.status_code == 200
@@ -88,8 +84,7 @@ def test_team_update_view_duplicate_name(client, basic_hunt, basic_user):
url = reverse('puzzlehunt:team_update', kwargs={'pk': team.pk})
response = client.post(url, {
- 'name': 'Existing Team',
- 'custom_data': ''
+ 'name': 'Existing Team'
}, HTTP_HX_REQUEST='true')
assert response.status_code == 200
@@ -113,8 +108,7 @@ def test_team_update_view_unauthorized(client, basic_hunt, basic_user):
url = reverse('puzzlehunt:team_update', kwargs={'pk': team.pk})
response = client.post(url, {
- 'name': 'Should Not Update',
- 'custom_data': ''
+ 'name': 'Should Not Update'
})
assert response.status_code == 403
@@ -358,7 +352,6 @@ def test_team_update_view_invalid_non_htmx(client, basic_hunt, basic_user):
response = client.post(url, {
'name': '!@#$%', # Invalid name
- 'custom_data': ''
})
# The view redirects even with invalid data - this appears to be a bug in the view
@@ -379,8 +372,7 @@ def test_team_update_view_success_non_htmx(client, basic_hunt, basic_user):
url = reverse('puzzlehunt:team_update', kwargs={'pk': team.pk})
response = client.post(url, {
- 'name': 'Updated Via View',
- 'custom_data': ''
+ 'name': 'Updated Via View'
})
assert response.status_code == 302 # Redirect after success
@@ -400,8 +392,7 @@ def test_team_create_view_already_has_team(client, basic_hunt, basic_user):
url = reverse('puzzlehunt:team_create')
response = client.post(url, {
- 'name': 'New Team',
- 'custom_data': ''
+ 'name': 'New Team'
})
assert response.status_code == 302 # Redirects to existing team
assert Team.objects.count() == 1 # No new team created
diff --git a/puzzlehunt/tests/test_user_flows.py b/puzzlehunt/tests/test_user_flows.py
index 414ec3f..32d21ce 100644
--- a/puzzlehunt/tests/test_user_flows.py
+++ b/puzzlehunt/tests/test_user_flows.py
@@ -90,7 +90,6 @@ def test_hunt_experience(client, setup_puzzles, normal_user):
# Test 3: Create and join team
response = client.post(reverse('puzzlehunt:team_create'), {
'name': 'Test Team',
- 'custom_data': ''
})
assert response.status_code == 302
team = Team.objects.get(name='Test Team')
diff --git a/puzzlehunt/urls.py b/puzzlehunt/urls.py
index 36e9692..fa9bb8c 100644
--- a/puzzlehunt/urls.py
+++ b/puzzlehunt/urls.py
@@ -88,6 +88,11 @@
path('hunt/
/template/preview/', staff_views.preview_template, name='preview_template'),
path('hunt//config/', staff_views.hunt_config, name='hunt_config'),
path('hunt//config-tester/', staff_views.config_tester, name='config_tester'),
+ path('hunt//team-data/', staff_views.team_data_questions, name='team_data_questions'),
+ path('hunt//team-data/create/', staff_views.team_data_question_create, name='team_data_question_create'),
+ path('hunt//team-data//update/', staff_views.team_data_question_update, name='team_data_question_update'),
+ path('hunt//team-data//delete/', staff_views.team_data_question_delete, name='team_data_question_delete'),
+ path('hunt//team-data//move/', staff_views.team_data_question_move, name='team_data_question_move'),
path('hunt//puzzles/', staff_views.hunt_puzzles, name='hunt_puzzles'),
path('hunt//set_current/', staff_views.hunt_set_current, name='hunt_set_current'),
path('hunt//export/', staff_views.export_hunt, name='hunt_export'),
diff --git a/puzzlehunt/utils.py b/puzzlehunt/utils.py
index 4013abc..da7cb7f 100644
--- a/puzzlehunt/utils.py
+++ b/puzzlehunt/utils.py
@@ -15,7 +15,7 @@
from django.core.files import File
from django_eventstream.channelmanager import DefaultChannelManager
from .models import PuzzleFile, SolutionFile, HuntFile, PrepuzzleFile, Puzzle, Hunt, Prepuzzle, Team, TeamRankingRule, \
- CannedHint, Response, Hint, Update, PuzzleStatus, Submission, User
+ CannedHint, Response, Hint, Update, PuzzleStatus, Submission, User, TeamDataQuestion, TeamDataAnswer
from django.core.files.storage import default_storage
@@ -196,6 +196,7 @@ def create_hunt_export_zip(hunt, zip_path, include_activity=False):
models_to_export = {
'hunt.json': Hunt.objects.filter(pk=hunt.pk),
'ranking_rules.json': TeamRankingRule.objects.filter(hunt=hunt),
+ 'team_data_questions.json': TeamDataQuestion.objects.filter(hunt=hunt),
'puzzles.json': Puzzle.objects.filter(hunt=hunt),
'puzzle_files.json': PuzzleFile.objects.filter(parent__hunt=hunt).select_related('parent'),
'solution_files.json': SolutionFile.objects.filter(parent__hunt=hunt).select_related('parent'),
@@ -213,6 +214,7 @@ def create_hunt_export_zip(hunt, zip_path, include_activity=False):
'updates.json': Update.objects.filter(hunt=hunt).select_related('hunt', 'puzzle'),
'puzzle_statuses.json': PuzzleStatus.objects.filter(puzzle__hunt=hunt).select_related('puzzle', 'team', 'team__hunt'),
'submissions.json': Submission.objects.filter(puzzle__hunt=hunt).select_related('puzzle', 'team', 'team__hunt', 'puzzle__hunt'),
+ 'team_data_answers.json': TeamDataAnswer.objects.filter(team__hunt=hunt).select_related('team', 'team__hunt', 'question'),
}
models_to_export.update(activity_models)
@@ -291,6 +293,7 @@ def validate_hunt_zip(zip_path: str | Path, include_activity: bool = False) -> N
'file_references.json',
'hunt.json',
'ranking_rules.json',
+ 'team_data_questions.json',
'puzzles.json',
'puzzle_files.json',
'solution_files.json',
@@ -306,7 +309,8 @@ def validate_hunt_zip(zip_path: str | Path, include_activity: bool = False) -> N
'hints.json',
'updates.json',
'puzzle_statuses.json',
- 'submissions.json'
+ 'submissions.json',
+ 'team_data_answers.json'
}
with zipfile.ZipFile(zip_path, 'r') as zip_file:
@@ -468,7 +472,7 @@ def import_hunt_from_zip(zip_path: str | Path, include_activity: bool = False) -
print(f"Prepuzzle file {file_obj.relative_name} not found in zip")
# 5. Import remaining models that don't need special handling
- for filename in ['responses.json', 'canned_hints.json', 'ranking_rules.json']:
+ for filename in ['responses.json', 'canned_hints.json', 'ranking_rules.json', 'team_data_questions.json']:
for obj in serializers.deserialize('json', zip_file.read(filename)):
obj.save()
@@ -479,7 +483,8 @@ def import_hunt_from_zip(zip_path: str | Path, include_activity: bool = False) -
'updates.json', # Updates depend on Hunt and optionally Puzzle
'puzzle_statuses.json', # PuzzleStatus depends on Team and Puzzle
'submissions.json', # Submissions depend on Team and Puzzle
- 'hints.json' # Hints depend on Team and Puzzle
+ 'hints.json', # Hints depend on Team and Puzzle
+ 'team_data_answers.json' # TeamDataAnswer depends on Team and TeamDataQuestion
]
for filename in activity_order:
for obj in serializers.deserialize('json', zip_file.read(filename)):
diff --git a/server/settings/base_settings.py b/server/settings/base_settings.py
index a7bdfba..7c2a7c5 100644
--- a/server/settings/base_settings.py
+++ b/server/settings/base_settings.py
@@ -223,10 +223,6 @@
CONSTANCE_CONFIG = {
# Site Settings
'SITE_TITLE': ('PuzzleSpring', 'The title of the site'),
- 'TEAM_CUSTOM_DATA_NAME': ('', 'The name of the team custom data field'),
- 'TEAM_CUSTOM_DATA_DESCRIPTION': ('', 'The description of the team custom data field'),
- 'TEAM_CUSTOM_DATA_TYPE': ('text', 'The type of the team custom data field', 'team_data_type'),
- 'SPLIT_LEADERBOARD_BY_CUSTOM_DATA': (False, "If enabled and TEAM_CUSTOM_DATA_TYPE is boolean,\n the leaderboard will show separate tabs"),
# Hunt Display Settings
'SINGLE_HUNT_MODE': (False, 'If enabled, only one hunt will be visible and accessible'), # Not yet implemented
@@ -259,10 +255,6 @@
'widget': 'puzzlehunt.widgets.ImageWidget',
'required': False,
}],
- 'team_data_type': ['django.forms.fields.ChoiceField', {
- 'widget': 'django.forms.Select',
- 'choices': (('text', 'Text Input'), ('boolean', 'Checkbox')),
- }],
}
CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend'
CONSTANCE_DATABASE_CACHE_BACKEND = 'default'