Build out Positions CRUD and rework the Roles page

Positions had list/create/edit already stubbed as list-only; give it real
forms, with a check mirroring the management_position_implies_staff_position
constraint so a bad combination reads as a form error, not a 500. Roles now
groups by role (excluding the MEMBER everyone holds automatically, which was
just noise), grants via a modal instead of a separate page, and its member
picker is a small typeahead combobox instead of a long native <select>.
This commit is contained in:
2026-08-03 18:45:28 +02:00
parent 9b0af5800a
commit ce35348b31
13 changed files with 500 additions and 82 deletions

View File

@@ -36,6 +36,8 @@ _NAV_SECTIONS = {
"membership_mark_fully_paid": "membership_list", "membership_mark_fully_paid": "membership_list",
"membership_record_payment": "membership_list", "membership_record_payment": "membership_list",
"position_list": "position_list", "position_list": "position_list",
"position_create": "position_list",
"position_update": "position_list",
"role_list": "role_list", "role_list": "role_list",
"role_create": "role_list", "role_create": "role_list",
"role_revoke": "role_list", "role_revoke": "role_list",

View File

@@ -7,7 +7,7 @@ from django.utils.translation import gettext_lazy as _
from club.models import ClubMembership, ClubRole, FeePayment from club.models import ClubMembership, ClubRole, FeePayment
from members.models import Family, FamilyMembership, Member from members.models import Family, FamilyMembership, Member
from members.services.family import find_member_by_email from members.services.family import find_member_by_email
from teams.models import Team from teams.models import Position, Team
User = get_user_model() User = get_user_model()
@@ -25,6 +25,20 @@ class TeamForm(forms.ModelForm):
fields = ["name", "short_name"] fields = ["name", "short_name"]
class PositionForm(forms.ModelForm):
class Meta:
model = Position
fields = ["name", "short_name", "ordering", "staff_position", "management_position"]
def clean(self):
cleaned = super().clean()
# Mirrors Position's management_position_implies_staff_position check
# constraint -- caught here so it reads as a form error, not a 500.
if cleaned.get("management_position") and not cleaned.get("staff_position"):
self.add_error("management_position", _("A management position must also be a staff position."))
return cleaned
class ClubRoleAssignForm(forms.ModelForm): class ClubRoleAssignForm(forms.ModelForm):
"""Grant a club-wide role to a member already affiliated with this club.""" """Grant a club-wide role to a member already affiliated with this club."""

View File

@@ -0,0 +1,38 @@
{% extends "management/base.html" %}
{% load i18n lucide ui %}
{% block heading %}{% if update_view %}{% blocktrans %}Edit {{ object }}{% endblocktrans %}{% else %}{% trans "New position" %}{% endif %}{% endblock heading %}
{% block panel %}
<div class="card w-full bg-base-100 shadow">
<div class="card-body">
<form method="post">
{% csrf_token %}
{% for error in form.non_field_errors %}
<div class="alert alert-error my-2">
<span>{{ error }}</span>
</div>
{% endfor %}
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
{% form_field form.name %}
{% form_field form.short_name %}
{% form_field form.ordering %}
</div>
<div class="divider"></div>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
{% form_field form.staff_position %}
{% form_field form.management_position %}
</div>
<div class="card-actions justify-start pt-2 mt-2">
<a class="btn btn-outline btn-neutral gap-2" href="{% url "management:position_list" %}">{% lucide "arrow-left" size=16 %} {% trans "Cancel" %}</a>
<button class="btn btn-primary gap-2" type="submit">{% lucide "save" size=16 %} {% trans "Save" %}</button>
</div>
</form>
</div>
</div>
{% endblock panel %}

View File

@@ -0,0 +1,55 @@
{% extends "management/base.html" %}
{% load i18n lucide %}
{% block heading %}{% trans "Positions" %}{% endblock heading %}
{% block actions %}
<a class="btn btn-primary gap-2" href="{% url 'management:position_create' %}">{% lucide "plus" size=16 %} {% trans "New position" %}</a>
{% endblock actions %}
{% block panel %}
<div class="card bg-base-100 shadow">
<div class="card-body">
<div class="overflow-x-auto">
<table class="table">
<thead>
<tr>
<th>{% trans "Ordering" %}</th>
<th>{% trans "Name" %}</th>
<th>{% trans "Short name" %}</th>
<th>{% trans "Staff position" %}</th>
<th>{% trans "Management position" %}</th>
<th></th>
</tr>
</thead>
<tbody>
{% for position in positions %}
<tr>
<td>{{ position.ordering }}</td>
<td>{{ position.name }}</td>
<td>{{ position.short_name }}</td>
<td>
<span class="badge badge-sm {% if position.staff_position %}badge-success{% else %}badge-neutral{% endif %}">
{% if position.staff_position %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}
</span>
</td>
<td>
<span class="badge badge-sm {% if position.management_position %}badge-success{% else %}badge-neutral{% endif %}">
{% if position.management_position %}{% trans "Yes" %}{% else %}{% trans "No" %}{% endif %}
</span>
</td>
<td class="text-right">
<a class="btn btn-outline btn-neutral btn-sm gap-2" href="{% url 'management:position_update' position.pk %}">{% lucide "pencil" size=14 %} {% trans "Edit" %}</a>
</td>
</tr>
{% empty %}
<tr>
<td colspan="6" class="text-center opacity-60">{% trans "No positions yet." %}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% endblock panel %}

View File

@@ -1,29 +0,0 @@
{% extends "management/base.html" %}
{% load i18n lucide ui %}
{% block heading %}{% trans "Grant role" %}{% endblock heading %}
{% block panel %}
<div class="card w-full max-w-xl bg-base-100 shadow">
<div class="card-body">
<form method="post">
{% csrf_token %}
{% for error in form.non_field_errors %}
<div class="alert alert-error my-2">
<span>{{ error }}</span>
</div>
{% endfor %}
{% for field in form %}
{% form_field field %}
{% endfor %}
<div class="card-actions justify-start pt-2 mt-2">
<a class="btn btn-outline btn-neutral gap-2" href="{% url "management:role_list" %}">{% lucide "arrow-left" size=16 %} {% trans "Cancel" %}</a>
<button class="btn btn-primary gap-2" type="submit">{% lucide "save" size=16 %} {% trans "Save" %}</button>
</div>
</form>
</div>
</div>
{% endblock panel %}

View File

@@ -1,29 +1,40 @@
{% extends "management/base.html" %} {% extends "management/base.html" %}
{% load i18n lucide %} {% load i18n lucide %}
{% comment %}
One section per non-MEMBER role (management.views.ClubRoleListView) -- the
plain MEMBER role every active club member holds automatically is excluded
entirely, since listing it here would just be noise. "Grant role" opens a
modal (controlpanel/_modal_form.html) rather than a separate page -- role_create
is POST-only, see ClubRoleCreateView.
{% endcomment %}
{% block heading %}{% trans "Roles" %}{% endblock heading %} {% block heading %}{% trans "Roles" %}{% endblock heading %}
{% block actions %} {% block actions %}
<a class="btn btn-primary gap-2" href="{% url 'management:role_create' %}">{% lucide "plus" size=16 %} {% trans "Grant role" %}</a> <button class="btn btn-primary gap-2" type="button" onclick="document.getElementById('grant_role_modal').showModal()">{% lucide "plus" size=16 %} {% trans "Grant role" %}</button>
{% endblock actions %} {% endblock actions %}
{% block panel %} {% block panel %}
<div class="flex flex-col gap-4">
{% for value, label, description, roles_for_section in sections %}
{% with role_label=label|capfirst %}
<div class="card bg-base-100 shadow"> <div class="card bg-base-100 shadow">
<div class="card-body"> <div class="card-body">
<h2 class="card-title text-base">{{ role_label }}</h2>
{% if description %}<p class="text-sm opacity-70">{{ description }}</p>{% endif %}
<div class="overflow-x-auto"> <div class="overflow-x-auto">
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<th>{% trans "Member" %}</th> <th>{% trans "Member" %}</th>
<th>{% trans "Role" %}</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for role in roles %} {% for role in roles_for_section %}
<tr> <tr>
<td>{{ role.member }}</td> <td>{{ role.member }}</td>
<td>{{ role.get_role_display }}</td>
<td class="text-right"> <td class="text-right">
<form method="post" action="{% url 'management:role_revoke' role.pk %}"> <form method="post" action="{% url 'management:role_revoke' role.pk %}">
{% csrf_token %} {% csrf_token %}
@@ -33,7 +44,7 @@
</tr> </tr>
{% empty %} {% empty %}
<tr> <tr>
<td colspan="3" class="text-center opacity-60">{% trans "No roles granted yet." %}</td> <td colspan="2" class="text-center opacity-60">{% blocktrans %}No one has the {{ role_label }} role yet.{% endblocktrans %}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
@@ -41,4 +52,103 @@
</div> </div>
</div> </div>
</div> </div>
{% endwith %}
{% endfor %}
</div>
{% trans "Grant role" as grant_role_label %}
{% url 'management:role_create' as role_create_url %}
{% include "controlpanel/_modal_form.html" with modal_id="grant_role_modal" title=grant_role_label form=role_form action_url=role_create_url submit_label=grant_role_label submit_icon="shield-check" %}
{% endblock panel %} {% endblock panel %}
{% block extra_body %}
{% trans "Type a name to search..." as search_placeholder %}
<script>
(() => {
// Progressive enhancement: the plain <select name="member"> in the "Grant
// role" modal still works with no JS -- this hides it and drives it from a
// small typeahead combobox instead (a select2-alike without the dependency):
// type to filter, click or Enter to pick, the hidden <select> still carries
// the actual value the form submits.
const select = document.querySelector("#grant_role_modal select[name='member']");
if (!select) return;
const options = Array.from(select.options).filter((option) => option.value !== "");
const wrapper = document.createElement("div");
wrapper.className = "relative";
const input = document.createElement("input");
input.type = "text";
input.className = "input input-bordered w-full";
input.placeholder = "{{ search_placeholder }}";
input.autocomplete = "off";
const list = document.createElement("ul");
list.className = "menu absolute z-10 mt-1 w-full rounded-box bg-base-100 shadow max-h-60 overflow-y-auto flex-nowrap hidden";
select.parentNode.insertBefore(wrapper, select);
wrapper.append(input, list, select);
select.classList.add("hidden");
let highlighted = -1;
const choose = (option) => {
select.value = option.value;
input.value = option.text;
list.classList.add("hidden");
};
const render = (query) => {
const needle = query.trim().toLowerCase();
const matches = needle ? options.filter((option) => option.text.toLowerCase().includes(needle)) : options;
list.innerHTML = "";
matches.forEach((option) => {
const item = document.createElement("li");
const link = document.createElement("a");
link.textContent = option.text;
// mousedown, not click: it fires before the input's blur, so the
// list is still in the DOM (and un-hidden) when the pick is applied.
link.addEventListener("mousedown", (event) => {
event.preventDefault();
choose(option);
});
item.appendChild(link);
list.appendChild(item);
});
highlighted = -1;
list.classList.toggle("hidden", matches.length === 0);
return matches;
};
input.addEventListener("input", () => render(input.value));
input.addEventListener("focus", () => render(input.value));
input.addEventListener("blur", () => list.classList.add("hidden"));
input.addEventListener("keydown", (event) => {
const items = Array.from(list.querySelectorAll("a"));
if (event.key === "ArrowDown" || event.key === "ArrowUp") {
event.preventDefault();
if (!items.length) return;
highlighted = event.key === "ArrowDown" ? (highlighted + 1) % items.length : (highlighted - 1 + items.length) % items.length;
items.forEach((item, index) => item.classList.toggle("menu-active", index === highlighted));
items[highlighted].scrollIntoView({ block: "nearest" });
} else if (event.key === "Enter" && highlighted >= 0 && items[highlighted]) {
event.preventDefault();
items[highlighted].dispatchEvent(new Event("mousedown"));
} else if (event.key === "Escape") {
list.classList.add("hidden");
}
});
// Redisplayed after a validation error elsewhere in the modal: keep
// whatever member was already chosen visible in the text input.
if (select.value) {
const selected = options.find((option) => option.value === select.value);
if (selected) input.value = selected.text;
}
})();
</script>
{% endblock extra_body %}

View File

@@ -256,6 +256,43 @@ class TeamManagementTests(ManagementTestBase):
self.assertRedirects(response, reverse("management:team_detail", args=[team.pk])) self.assertRedirects(response, reverse("management:team_detail", args=[team.pk]))
class PositionManagementTests(ManagementTestBase):
def setUp(self):
super().setUp()
self.client.force_login(self.admin_user)
def test_position_list_is_scoped_to_the_club(self):
other_club = Club.objects.create(name="Rival FC", slug="rival-fc")
Position.objects.create(club=other_club, name="Rival Coach", short_name="RC", staff_position=True)
response = self.club_get("position_list")
self.assertNotContains(response, "Rival Coach")
def test_creating_a_position(self):
response = self.club_post("position_create", {"name": "Physio", "short_name": "PH", "ordering": 0, "staff_position": "on", "management_position": ""})
position = Position.objects.get(club=self.club, name="Physio")
self.assertRedirects(response, reverse("management:position_list"))
self.assertTrue(position.staff_position)
self.assertFalse(position.management_position)
def test_updating_a_position(self):
position = Position.objects.create(club=self.club, name="Old name", short_name="ON")
self.club_post("position_update", {"name": "New name", "short_name": "NN", "ordering": 0}, position.pk)
position.refresh_from_db()
self.assertEqual(position.name, "New name")
def test_a_management_position_must_also_be_a_staff_position(self):
response = self.club_post("position_create", {"name": "Bad", "short_name": "B", "ordering": 0, "management_position": "on"})
self.assertEqual(response.status_code, 200)
self.assertFalse(Position.objects.filter(club=self.club, name="Bad").exists())
self.assertFormError(response.context["form"], "management_position", "A management position must also be a staff position.")
class ClubRoleManagementTests(ManagementTestBase): class ClubRoleManagementTests(ManagementTestBase):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
@@ -279,6 +316,37 @@ class ClubRoleManagementTests(ManagementTestBase):
self.assertFalse(ClubRole.objects.filter(pk=role.pk).exists()) self.assertFalse(ClubRole.objects.filter(pk=role.pk).exists())
def test_the_plain_member_role_never_appears_on_the_list(self):
# self.admin_member and self.member both hold an implicit MEMBER role --
# noise this page must never show. (self.member's name still legitimately
# appears once, in the "Grant role" modal's member picker.)
response = self.club_get("role_list")
self.assertContains(response, "No one has the Editor role yet.")
def test_a_granted_role_appears_under_its_own_section(self):
self.club_post("role_create", {"member": str(self.member.pk), "role": ClubRole.Roles.EDITOR})
response = self.club_get("role_list")
self.assertContains(response, "Future Editor")
def test_grant_role_is_a_modal_on_the_list_page(self):
response = self.club_get("role_list")
self.assertContains(response, 'id="grant_role_modal"')
def test_each_section_explains_what_the_role_grants(self):
response = self.club_get("role_list")
self.assertContains(response, "Full control over the club")
self.assertContains(response, "Can create and edit events")
def test_an_invalid_submission_redirects_back_to_the_list_instead_of_a_page(self):
response = self.club_post("role_create", {"member": "", "role": ClubRole.Roles.EDITOR})
self.assertRedirects(response, reverse("management:role_list"))
class FamilyManagementTests(ManagementTestBase): class FamilyManagementTests(ManagementTestBase):
def setUp(self): def setUp(self):

View File

@@ -30,6 +30,8 @@ urlpatterns = [
path("families/<uuid:family_pk>/members/<uuid:member_pk>/role/", views.FamilyMembershipRoleUpdateView.as_view(), name="family_membership_role_update"), path("families/<uuid:family_pk>/members/<uuid:member_pk>/role/", views.FamilyMembershipRoleUpdateView.as_view(), name="family_membership_role_update"),
# Club setup (admin only) # Club setup (admin only)
path("positions/", views.PositionListView.as_view(), name="position_list"), path("positions/", views.PositionListView.as_view(), name="position_list"),
path("positions/new/", views.PositionCreateView.as_view(), name="position_create"),
path("positions/<uuid:pk>/edit/", views.PositionUpdateView.as_view(), name="position_update"),
path("roles/", views.ClubRoleListView.as_view(), name="role_list"), path("roles/", views.ClubRoleListView.as_view(), name="role_list"),
path("roles/new/", views.ClubRoleCreateView.as_view(), name="role_create"), path("roles/new/", views.ClubRoleCreateView.as_view(), name="role_create"),
path("roles/<uuid:pk>/revoke/", views.ClubRoleRevokeView.as_view(), name="role_revoke"), path("roles/<uuid:pk>/revoke/", views.ClubRoleRevokeView.as_view(), name="role_revoke"),

View File

@@ -24,7 +24,20 @@ from shop.models import Discount, Invoice, Order, Product
from teams.models import Position, StaffAssignment, Team, TeamMembership from teams.models import Position, StaffAssignment, Team, TeamMembership
from .bulk_import import build_member_import_template, parse_member_import_rows, read_member_import_workbook from .bulk_import import build_member_import_template, parse_member_import_rows, read_member_import_workbook
from .forms import AddChildForm, AddParentForm, AttachToFamilyForm, ClubMembershipForm, ClubRoleAssignForm, FamilyCreateForm, GrantLoginForm, MemberForm, MemberImportUploadForm, RecordFeePaymentForm, TeamForm from .forms import (
AddChildForm,
AddParentForm,
AttachToFamilyForm,
ClubMembershipForm,
ClubRoleAssignForm,
FamilyCreateForm,
GrantLoginForm,
MemberForm,
MemberImportUploadForm,
PositionForm,
RecordFeePaymentForm,
TeamForm,
)
from .pdf import PDFExportError, membership_list_pdf from .pdf import PDFExportError, membership_list_pdf
@@ -707,18 +720,38 @@ class TeamDetailView(ClubStaffRequiredMixin, DetailView):
# granted or taken away) ------------------------------------------------------------- # granted or taken away) -------------------------------------------------------------
#: What each non-default role actually grants -- shown on the roles overview so an
#: admin granting one knows what they're handing out. See club/services/access.py.
ROLE_DESCRIPTIONS = {
ClubRole.Roles.ADMIN: _("Full control over the club: memberships, positions, roles, teams, shop, and every event."),
ClubRole.Roles.EDITOR: _("Can create and edit events, but not memberships, positions, roles, or shop settings."),
}
class ClubRoleListView(ClubAdminRequiredMixin, ListView): class ClubRoleListView(ClubAdminRequiredMixin, ListView):
"""Every non-default role holder, grouped by role. The plain MEMBER role is
excluded entirely -- every active club member holds it automatically
(club/signals.py), so listing it here would just be noise; this page is for
the roles someone was actually *granted*. ClubRole.Roles has few enough
values that a section per role reads better than one flat table."""
template_name = "management/role_list.html" template_name = "management/role_list.html"
context_object_name = "roles" context_object_name = "roles"
def get_queryset(self): def get_queryset(self):
return ClubRole.objects.filter(club=self.request.club).select_related("member") return ClubRole.objects.filter(club=self.request.club).exclude(role=ClubRole.Roles.MEMBER).select_related("member")
def get_context_data(self, **kwargs):
sections = [(value, label, ROLE_DESCRIPTIONS.get(value, ""), [role for role in self.object_list if role.role == value]) for value, label in ClubRole.Roles.choices if value != ClubRole.Roles.MEMBER]
return super().get_context_data(sections=sections, role_form=ClubRoleAssignForm(club=self.request.club), **kwargs)
class ClubRoleCreateView(ClubAdminRequiredMixin, CreateView): class ClubRoleCreateView(ClubAdminRequiredMixin, RedirectOnInvalidMixin, FormView):
model = ClubRole """Reachable only via the "Grant role" modal on the roles overview."""
form_class = ClubRoleAssignForm form_class = ClubRoleAssignForm
template_name = "management/role_form.html" http_method_names = ["post"]
invalid_redirect_url_name = "management:role_list"
def get_form_kwargs(self): def get_form_kwargs(self):
return super().get_form_kwargs() | {"club": self.request.club} return super().get_form_kwargs() | {"club": self.request.club}
@@ -729,17 +762,14 @@ class ClubRoleCreateView(ClubAdminRequiredMixin, CreateView):
# so granting ADMIN/EDITOR promotes that existing row rather than inserting a # so granting ADMIN/EDITOR promotes that existing row rather than inserting a
# second one, exactly like controlpanel.services.admins.grant_club_admin. # second one, exactly like controlpanel.services.admins.grant_club_admin.
member, role = form.cleaned_data["member"], form.cleaned_data["role"] member, role = form.cleaned_data["member"], form.cleaned_data["role"]
self.object, created = ClubRole.objects.get_or_create(club=self.request.club, member=member, defaults={"role": role}) role_obj, created = ClubRole.objects.get_or_create(club=self.request.club, member=member, defaults={"role": role})
if not created and self.object.role != role: if not created and role_obj.role != role:
self.object.role = role role_obj.role = role
self.object.save(update_fields=["role"]) role_obj.save(update_fields=["role"])
body = _("%(member)s” is now %(role)s.") % {"member": member, "role": self.object.get_role_display()} body = _("%(member)s” is now %(role)s.") % {"member": member, "role": role_obj.get_role_display()}
notify(self.request, f"s|{_('Role granted')}|{body}") notify(self.request, f"s|{_('Role granted')}|{body}")
return redirect(self.get_success_url()) return redirect("management:role_list")
def get_success_url(self):
return reverse("management:role_list")
class ClubRoleRevokeView(ClubAdminRequiredMixin, View): class ClubRoleRevokeView(ClubAdminRequiredMixin, View):
@@ -875,13 +905,51 @@ class FamilyAddParentView(ClubAdminRequiredMixin, RedirectOnInvalidMixin, FormVi
return redirect("management:family_detail", pk=family.pk) return redirect("management:family_detail", pk=family.pk)
class PositionListView(ClubAdminRequiredMixin, StubListMixin, ListView): class PositionListView(ClubAdminRequiredMixin, ListView):
page_title = _("Positions") template_name = "management/position_list.html"
context_object_name = "positions"
def get_queryset(self): def get_queryset(self):
return Position.objects.filter(club=self.request.club) return Position.objects.filter(club=self.request.club)
class PositionCreateView(ClubAdminRequiredMixin, CreateView):
model = Position
form_class = PositionForm
template_name = "management/position_form.html"
def form_valid(self, form):
form.instance.club = self.request.club
response = super().form_valid(form)
body = _("%(position)s” created.") % {"position": self.object}
notify(self.request, f"s|{_('Position created')}|{body}")
return response
def get_success_url(self):
return reverse("management:position_list")
class PositionUpdateView(ClubAdminRequiredMixin, UpdateView):
model = Position
form_class = PositionForm
template_name = "management/position_form.html"
def get_queryset(self):
return Position.objects.filter(club=self.request.club)
def form_valid(self, form):
response = super().form_valid(form)
body = _("%(position)s” updated.") % {"position": self.object}
notify(self.request, f"s|{_('Position updated')}|{body}")
return response
def get_success_url(self):
return reverse("management:position_list")
def get_context_data(self, **kwargs):
return super().get_context_data(update_view=True, **kwargs)
class RosterListView(ClubStaffRequiredMixin, StubListMixin, ListView): class RosterListView(ClubStaffRequiredMixin, StubListMixin, ListView):
page_title = _("Roster") page_title = _("Roster")

View File

@@ -2213,9 +2213,15 @@
} }
} }
} }
.absolute {
position: absolute;
}
.fixed { .fixed {
position: fixed; position: fixed;
} }
.relative {
position: relative;
}
.static { .static {
position: static; position: static;
} }
@@ -2250,6 +2256,12 @@
} }
} }
} }
.top-1 {
top: var(--spacing);
}
.left-1 {
left: var(--spacing);
}
.file-input { .file-input {
@layer daisyui.l1.l2.l3 { @layer daisyui.l1.l2.l3 {
cursor: pointer; cursor: pointer;
@@ -2620,6 +2632,9 @@
.z-10 { .z-10 {
z-index: 10; z-index: 10;
} }
.col-span-full {
grid-column: 1 / -1;
}
.hero { .hero {
@layer daisyui.l1.l2.l3 { @layer daisyui.l1.l2.l3 {
display: grid; display: grid;
@@ -3060,6 +3075,9 @@
.table { .table {
display: table; display: table;
} }
.aspect-square {
aspect-ratio: 1 / 1;
}
.h-12 { .h-12 {
height: calc(var(--spacing) * 12); height: calc(var(--spacing) * 12);
} }
@@ -3075,6 +3093,9 @@
.h-screen { .h-screen {
height: 100vh; height: 100vh;
} }
.max-h-60 {
max-height: calc(var(--spacing) * 60);
}
.min-h-6 { .min-h-6 {
min-height: calc(var(--spacing) * 6); min-height: calc(var(--spacing) * 6);
} }
@@ -3156,12 +3177,18 @@
.grid-cols-1 { .grid-cols-1 {
grid-template-columns: repeat(1, minmax(0, 1fr)); grid-template-columns: repeat(1, minmax(0, 1fr));
} }
.grid-cols-2 {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
.flex-col { .flex-col {
flex-direction: column; flex-direction: column;
} }
.flex-row { .flex-row {
flex-direction: row; flex-direction: row;
} }
.flex-nowrap {
flex-wrap: nowrap;
}
.flex-wrap { .flex-wrap {
flex-wrap: wrap; flex-wrap: wrap;
} }
@@ -3434,6 +3461,9 @@
.object-contain { .object-contain {
object-fit: contain; object-fit: contain;
} }
.object-cover {
object-fit: cover;
}
.p-2 { .p-2 {
padding: calc(var(--spacing) * 2); padding: calc(var(--spacing) * 2);
} }
@@ -3564,6 +3594,9 @@
.whitespace-nowrap { .whitespace-nowrap {
white-space: nowrap; white-space: nowrap;
} }
.whitespace-pre-line {
white-space: pre-line;
}
.alert-error { .alert-error {
@layer daisyui.l1.l2 { @layer daisyui.l1.l2 {
color: var(--color-error-content); color: var(--color-error-content);
@@ -3717,6 +3750,10 @@
outline-style: var(--tw-outline-style); outline-style: var(--tw-outline-style);
outline-width: 1px; outline-width: 1px;
} }
.blur {
--tw-blur: blur(8px);
filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
}
.filter { .filter {
filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,); filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
} }
@@ -3799,6 +3836,13 @@
--btn-soft-bg: initial; --btn-soft-bg: initial;
} }
} }
.btn-xs {
@layer daisyui.l1.l2 {
--fontsize: 0.6875rem;
--btn-p: 0.5rem;
--size: calc(var(--size-field, 0.25rem) * 6);
}
}
.badge-accent { .badge-accent {
@layer daisyui.l1.l2 { @layer daisyui.l1.l2 {
--badge-color: var(--color-accent); --badge-color: var(--color-accent);
@@ -3881,6 +3925,11 @@
grid-template-columns: repeat(2, minmax(0, 1fr)); grid-template-columns: repeat(2, minmax(0, 1fr));
} }
} }
.md\:grid-cols-3 {
@media (width >= 48rem) {
grid-template-columns: repeat(3, minmax(0, 1fr));
}
}
.md\:grid-cols-4 { .md\:grid-cols-4 {
@media (width >= 48rem) { @media (width >= 48rem) {
grid-template-columns: repeat(4, minmax(0, 1fr)); grid-template-columns: repeat(4, minmax(0, 1fr));

View File

@@ -0,0 +1,23 @@
# Generated by Django 6.0.6 on 2026-08-03 15:55
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('teams', '0004_position_created_position_modified_and_more'),
]
operations = [
migrations.AlterField(
model_name='position',
name='management_position',
field=models.BooleanField(default=False, help_text='A staff position with management authority over the team (e.g. head coach) -- requires staff position to also be checked.', verbose_name='management position'),
),
migrations.AlterField(
model_name='position',
name='staff_position',
field=models.BooleanField(default=False, help_text='Coach, manager, physio, ... -- assignable via a StaffAssignment rather than a team roster spot.', verbose_name='staff position'),
),
]

View File

@@ -0,0 +1,18 @@
# Generated by Django 6.0.6 on 2026-08-03 15:58
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('teams', '0005_alter_position_management_position_and_more'),
]
operations = [
migrations.AlterField(
model_name='position',
name='ordering',
field=models.PositiveSmallIntegerField(default=0, help_text="Lower numbers are listed first (e.g. on a team's roster). Positions with the same number are ordered by name.", verbose_name='ordering'),
),
]

View File

@@ -25,10 +25,10 @@ class Team(ClubScopedModel):
class Position(ClubScopedModel): class Position(ClubScopedModel):
name = models.CharField(_("name"), max_length=255) name = models.CharField(_("name"), max_length=255)
short_name = models.CharField(_("short name"), max_length=255) short_name = models.CharField(_("short name"), max_length=255)
ordering = models.PositiveSmallIntegerField(_("ordering"), default=0) ordering = models.PositiveSmallIntegerField(_("ordering"), default=0, help_text=_("Lower numbers are listed first (e.g. on a team's roster). Positions with the same number are ordered by name."))
staff_position = models.BooleanField(_("staff position"), default=False) staff_position = models.BooleanField(_("staff position"), default=False, help_text=_("Coach, manager, physio, ... -- assignable via a StaffAssignment rather than a team roster spot."))
management_position = models.BooleanField(_("management position"), default=False) management_position = models.BooleanField(_("management position"), default=False, help_text=_("A staff position with management authority over the team (e.g. head coach) -- requires staff position to also be checked."))
class Meta: class Meta:
verbose_name = _("position") verbose_name = _("position")