Build the D5 events calendar, redesign event forms, and polish the events UI
Adds the Week/Month/Season calendar to the Events page (team/group-scoped visibility, kind-colored blocks, a repeating-series indicator) alongside the existing table as a List view, and redesigns event/event-series creation around a kind-first picker with progressive disclosure instead of one long flat form. Also: an accessible radio-based kind picker (no redundant select-next-to-cards), a fixed week-grid layout bug, a filterable single-list redesign of the event detail page's RSVP/responses modal, a tidied-up recurrence field layout, and assorted button/field height and width fixes across the referee panel and event forms. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01ECGMEwrc2k4D8VQuwjstj9
This commit is contained in:
@@ -90,7 +90,8 @@
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<button class="btn btn-outline btn-sm gap-2" type="submit">{% lucide "user-plus" size=14 %} {% trans "Assign" %}</button>
|
||||
{# No btn-sm: .select is height:2.25rem, matching plain .btn -- btn-sm would sit 6px shorter and misalign in the row. #}
|
||||
<button class="btn btn-outline gap-2" type="submit">{% lucide "user-plus" size=14 %} {% trans "Assign" %}</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<p class="text-sm text-muted">
|
||||
@@ -103,7 +104,8 @@
|
||||
{% csrf_token %}
|
||||
{% if next_url %}<input type="hidden" name="next" value="{{ next_url }}">{% endif %}
|
||||
<input type="text" name="name" class="input w-56" placeholder="{% trans 'External referee name' %}">
|
||||
<button class="btn btn-outline btn-sm gap-2" type="submit">{% lucide "user-plus" size=14 %} {% trans "Add external" %}</button>
|
||||
{# No btn-sm: .input is height:2.25rem, matching plain .btn -- btn-sm would sit 6px shorter and misalign in the row. #}
|
||||
<button class="btn btn-outline gap-2" type="submit">{% lucide "user-plus" size=14 %} {% trans "Add external" %}</button>
|
||||
</form>
|
||||
|
||||
<p class="text-xs text-muted">{% trans "⚠ = also expected at another event around this time -- shown as a warning, not blocked." %}</p>
|
||||
|
||||
@@ -192,41 +192,55 @@
|
||||
|
||||
{% if has_attendance_rows %}
|
||||
<dialog id="rsvp_modal" class="modal">
|
||||
<div class="modal-box max-w-2xl">
|
||||
<div class="modal-box max-w-3xl">
|
||||
<h3 class="text-lg font-bold text-ink">{% trans "Who responded" %}</h3>
|
||||
<div class="mt-2 flex flex-col gap-2">
|
||||
|
||||
{# One flat, filterable list beats a stack of collapsed accordions you have to open one at a time to see the full picture -- these pills just show/hide rows client-side, no reload. #}
|
||||
<div class="mt-3 flex flex-wrap gap-1.5">
|
||||
<button type="button" class="btn btn-primary btn-sm gap-1.5 rsvp-filter" data-status="">
|
||||
{% trans "All" %} <span class="badge badge-sm badge-ghost">{{ attendance_row_count }}</span>
|
||||
</button>
|
||||
{% for group in attendance_groups %}
|
||||
{% if group.rows %}
|
||||
<details class="collapse-arrow rounded-lg border border-line bg-white">
|
||||
<summary class="flex cursor-pointer items-center gap-2 px-3 py-2 text-sm font-medium text-ink">
|
||||
<span class="badge badge-sm
|
||||
{% if group.value == "present" %}badge-success
|
||||
{% elif group.value == "absent" %}badge-error
|
||||
{% elif group.value == "excused" %}badge-warning
|
||||
{% elif group.value == "selected" %}badge-info
|
||||
{% elif group.value == "maybe" %}badge-warning
|
||||
{% elif group.value == "not_selected" %}badge-neutral
|
||||
{% else %}badge-outline{% endif %}">
|
||||
{{ group.label }}
|
||||
</span>
|
||||
<span class="text-muted">({{ group.rows|length }})</span>
|
||||
</summary>
|
||||
<div class="overflow-x-auto border-t border-rule">
|
||||
<table class="table">
|
||||
<tbody>
|
||||
{% for row in group.rows %}
|
||||
<tr>
|
||||
<td>{{ row.member }}</td>
|
||||
<td class="text-sm text-muted">{{ row.note|default:"—" }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</details>
|
||||
<button type="button" class="btn btn-outline btn-sm gap-1.5 rsvp-filter" data-status="{{ group.value }}">
|
||||
{{ group.label }} <span class="badge badge-sm badge-ghost">{{ group.rows|length }}</span>
|
||||
</button>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
<div class="mt-3 max-h-96 overflow-y-auto rounded-lg border border-line">
|
||||
<table class="table">
|
||||
<tbody>
|
||||
{% for group in attendance_groups %}
|
||||
{% for row in group.rows %}
|
||||
<tr data-status="{{ group.value }}">
|
||||
<td class="w-px">
|
||||
<span class="avatar avatar-placeholder shrink-0">
|
||||
<div class="h-7 w-7 rounded-full text-xs">{{ row.member.first_name|slice:":1" }}{{ row.member.last_name|slice:":1" }}</div>
|
||||
</span>
|
||||
</td>
|
||||
<td class="font-semibold text-ink">{{ row.member }}</td>
|
||||
<td>
|
||||
<span class="badge badge-sm
|
||||
{% if group.value == "present" %}badge-success
|
||||
{% elif group.value == "absent" %}badge-error
|
||||
{% elif group.value == "excused" %}badge-warning
|
||||
{% elif group.value == "selected" %}badge-info
|
||||
{% elif group.value == "maybe" %}badge-warning
|
||||
{% elif group.value == "not_selected" %}badge-neutral
|
||||
{% else %}badge-outline{% endif %}">
|
||||
{{ group.label }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="text-sm text-muted">{{ row.note|default:"—" }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="modal-action">
|
||||
<form method="dialog">
|
||||
<button class="btn btn-outline gap-2">{% lucide "x" size=16 %} {% trans "Close" %}</button>
|
||||
@@ -237,5 +251,21 @@
|
||||
<button>close</button>
|
||||
</form>
|
||||
</dialog>
|
||||
<script>
|
||||
(() => {
|
||||
const modal = document.getElementById("rsvp_modal");
|
||||
const pills = modal.querySelectorAll(".rsvp-filter");
|
||||
const rows = modal.querySelectorAll("tbody tr[data-status]");
|
||||
pills.forEach((pill) => {
|
||||
pill.addEventListener("click", () => {
|
||||
pills.forEach((other) => {
|
||||
other.classList.toggle("btn-primary", other === pill);
|
||||
other.classList.toggle("btn-outline", other !== pill);
|
||||
});
|
||||
rows.forEach((row) => row.classList.toggle("hidden", pill.dataset.status !== "" && row.dataset.status !== pill.dataset.status));
|
||||
});
|
||||
});
|
||||
})();
|
||||
</script>
|
||||
{% endif %}
|
||||
{% endblock extra_body %}
|
||||
|
||||
@@ -4,38 +4,96 @@
|
||||
{% block heading %}{% if update_view %}{% blocktrans %}Edit {{ object }}{% endblocktrans %}{% else %}{% trans "New event" %}{% endif %}{% endblock heading %}
|
||||
|
||||
{% block panel %}
|
||||
<div class="card w-full">
|
||||
<div class="card-body">
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
<form method="post" class="flex flex-col gap-4">
|
||||
{% csrf_token %}
|
||||
|
||||
{% for error in form.non_field_errors %}
|
||||
<div class="alert alert-error">
|
||||
<span>{{ error }}</span>
|
||||
{% for error in form.non_field_errors %}
|
||||
<div class="alert alert-error">
|
||||
<span>{{ error }}</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="event-section-header">
|
||||
<span class="event-section-icon">{% lucide "clipboard-list" size=18 %}</span>
|
||||
<div>
|
||||
<div class="event-section-title">{% trans "What's happening?" %}</div>
|
||||
<div class="event-section-hint">{% trans "Pick a kind to reveal only the fields that matter for it." %}</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
{% form_field form.title %}
|
||||
{% form_field form.kind %}
|
||||
</div>
|
||||
|
||||
<div class="my-5 border-t border-line"></div>
|
||||
<h3 class="mb-3 font-display text-xs font-extrabold tracking-[.12em] text-muted uppercase">{% trans "Audience" %}</h3>
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-3">
|
||||
<div class="mb-4">
|
||||
{# Real radios, not a JS-synced facade over a hidden <select> -- each card IS the field's own input, so keyboard/tab/arrow-key operation and screen readers get native radiogroup semantics for free, and there's no second visible control for the same field. #}
|
||||
<div class="kind-grid" role="radiogroup" aria-label="{{ form.fields.kind.label|capfirst }}">
|
||||
{% for value, label in form.fields.kind.choices %}
|
||||
<label class="kind-card" data-kind="{{ value }}">
|
||||
<input type="radio" name="{{ form.kind.html_name }}" value="{{ value }}" class="sr-only" {% if form.kind.value == value %}checked{% endif %} required>
|
||||
{% if value == "training" %}{% lucide "dumbbell" size=20 %}
|
||||
{% elif value == "game" %}{% lucide "swords" size=20 %}
|
||||
{% elif value == "tournament" %}{% lucide "trophy" size=20 %}
|
||||
{% elif value == "meeting" %}{% lucide "message-square" size=20 %}
|
||||
{% elif value == "social" %}{% lucide "party-popper" size=20 %}
|
||||
{% elif value == "other" %}{% lucide "circle-ellipsis" size=20 %}
|
||||
{% else %}{% lucide "calendar" size=20 %}
|
||||
{% endif %}
|
||||
<span class="kind-card-label">{{ label }}</span>
|
||||
</label>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% if form.kind.errors %}
|
||||
<p class="mt-2 text-xs text-club-dark">{{ form.kind.errors|join:" " }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="w-full">
|
||||
{% form_field form.title %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card event-summary">
|
||||
<span class="event-summary-icon">{% lucide "sparkles" size=16 %}</span>
|
||||
<span id="event-summary-text">{% trans "This line updates live as you fill in the form below." %}</span>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="event-section-header">
|
||||
<span class="event-section-icon">{% lucide "users" size=18 %}</span>
|
||||
<div>
|
||||
<div class="event-section-title">{% trans "Who's invited" %}</div>
|
||||
<div class="event-section-hint">{% trans "Teams and groups invite every current member automatically." %}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if "club_wide" in form.fields %}
|
||||
<div class="event-clubwide-toggle">
|
||||
{% form_field form.club_wide show_as_toggle=True %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
{% form_field form.teams %}
|
||||
{% form_field form.groups %}
|
||||
{% if "club_wide" in form.fields %}
|
||||
{% form_field form.club_wide %}
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="mt-4 grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
{% form_field form.invited_members %}
|
||||
{% form_field form.excluded_members %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="event-section-header">
|
||||
<span class="event-section-icon">{% lucide "calendar-clock" size=18 %}</span>
|
||||
<div>
|
||||
<div class="event-section-title">{% trans "Where & when" %}</div>
|
||||
<div class="event-section-hint">{% trans "Venue and the times members see on their invite." %}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="my-5 border-t border-line"></div>
|
||||
<h3 class="mb-3 font-display text-xs font-extrabold tracking-[.12em] text-muted uppercase">{% trans "Where" %}</h3>
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
{% form_field form.location %}
|
||||
<div class="game-only">
|
||||
@@ -43,59 +101,100 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="my-5 border-t border-line"></div>
|
||||
<h3 class="mb-3 font-display text-xs font-extrabold tracking-[.12em] text-muted uppercase">{% trans "When" %}</h3>
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-4">
|
||||
<div class="mt-4 grid grid-cols-1 gap-4 border-t border-rule pt-4 md:grid-cols-4">
|
||||
{% form_field form.start %}
|
||||
{% form_field form.end %}
|
||||
{% form_field form.gathering %}
|
||||
{% form_field form.deadline %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="game-details-section" class="game-only">
|
||||
<div class="my-5 border-t border-line"></div>
|
||||
<h3 class="mb-3 font-display text-xs font-extrabold tracking-[.12em] text-muted uppercase">{% trans "Game" %}</h3>
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-3">
|
||||
{% form_field form.competition %}
|
||||
{% form_field form.external_game_id %}
|
||||
{% form_field form.max_referees %}
|
||||
{% if update_view %}
|
||||
{% comment %}
|
||||
Score/live status only exist to record once a game has
|
||||
actually been created -- the add form leaves them out
|
||||
entirely (see EventForm's editing=False path).
|
||||
{% endcomment %}
|
||||
|
||||
{% form_field form.score_for %}
|
||||
{% form_field form.score_against %}
|
||||
{% form_field form.is_live %}
|
||||
{% endif %}
|
||||
<div id="game-details-section" class="card game-only">
|
||||
<div class="card-body">
|
||||
<div class="event-section-header">
|
||||
<span class="event-section-icon event-section-icon-accent">{% lucide "swords" size=18 %}</span>
|
||||
<div>
|
||||
<div class="event-section-title">{% trans "Game details" %}</div>
|
||||
<div class="event-section-hint">{% trans "Only used for games -- competition, referees and, once played, the score." %}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card-actions justify-start pt-4">
|
||||
<a class="btn btn-outline gap-2" href="{% if update_view %}{% url "management:event_detail" object.pk %}{% else %}{% url "management:event_list" %}{% endif %}">{% 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 class="grid grid-cols-1 gap-4 md:grid-cols-3">
|
||||
{% form_field form.competition %}
|
||||
{% form_field form.external_game_id %}
|
||||
{% form_field form.max_referees %}
|
||||
</div>
|
||||
</form>
|
||||
{% if update_view %}
|
||||
{% comment %}
|
||||
Score/live status only exist to record once a game has
|
||||
actually been created -- the add form leaves them out
|
||||
entirely (see EventForm's editing=False path).
|
||||
{% endcomment %}
|
||||
<div class="mt-4 grid grid-cols-1 gap-4 md:grid-cols-3">
|
||||
{% form_field form.score_for %}
|
||||
{% form_field form.score_against %}
|
||||
{% form_field form.is_live show_as_toggle=True %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-wrap items-center gap-3">
|
||||
<a class="btn btn-outline gap-2" href="{% if update_view %}{% url "management:event_detail" object.pk %}{% else %}{% url "management:event_list" %}{% endif %}">{% 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>
|
||||
{% endblock panel %}
|
||||
|
||||
{% block extra_body %}
|
||||
<script src="{% static 'js/searchable-select.js' %}"></script>
|
||||
<script>
|
||||
(() => {
|
||||
// Progressive enhancement only -- the fields stay in the form and post
|
||||
// normally either way, this just hides them when they don't apply so a
|
||||
// training/social/etc. event isn't cluttered with opponent/score/competition
|
||||
// inputs. Anything gated on "only makes sense for a game" carries this class.
|
||||
const kindField = document.getElementById("id_kind");
|
||||
// Progressive enhancement only -- every field still posts normally
|
||||
// either way. The kind cards are the real "kind" radios (see the
|
||||
// template) -- selecting one is what drives (a) the .game-only
|
||||
// show/hide (opponent, and the whole Game details card -- anything
|
||||
// that only makes sense for a game carries this class) and (b) the
|
||||
// live summary line up top. No JS is needed to keep a picker in sync
|
||||
// with a hidden field, because there isn't one.
|
||||
const kindInputs = document.querySelectorAll('input[name="kind"]');
|
||||
const titleField = document.getElementById("id_title");
|
||||
const startField = document.getElementById("id_start");
|
||||
const gameOnlyElements = document.querySelectorAll(".game-only");
|
||||
if (!kindField || !gameOnlyElements.length) return;
|
||||
const summary = document.getElementById("event-summary-text");
|
||||
if (!kindInputs.length) return;
|
||||
|
||||
const sync = () => gameOnlyElements.forEach((element) => element.classList.toggle("hidden", kindField.value !== "game"));
|
||||
kindField.addEventListener("change", sync);
|
||||
const NO_TITLE = "{% trans "Untitled event" %}";
|
||||
const NO_DATE = "{% trans "no date set yet" %}";
|
||||
|
||||
const formatStart = (value) => {
|
||||
if (!value) return NO_DATE;
|
||||
const date = new Date(value);
|
||||
if (Number.isNaN(date.getTime())) return NO_DATE;
|
||||
return date.toLocaleString(undefined, { weekday: "short", day: "numeric", month: "short", hour: "2-digit", minute: "2-digit" });
|
||||
};
|
||||
|
||||
const checkedKind = () => document.querySelector('input[name="kind"]:checked');
|
||||
|
||||
const updateSummary = () => {
|
||||
if (!summary) return;
|
||||
const checked = checkedKind();
|
||||
const kindLabel = checked ? checked.closest(".kind-card").querySelector(".kind-card-label").textContent.trim() : "";
|
||||
const title = (titleField && titleField.value.trim()) || NO_TITLE;
|
||||
const when = formatStart(startField ? startField.value : "");
|
||||
summary.textContent = `${kindLabel} – ${title} – ${when}`;
|
||||
};
|
||||
|
||||
const sync = () => {
|
||||
const checked = checkedKind();
|
||||
gameOnlyElements.forEach((element) => element.classList.toggle("hidden", !checked || checked.value !== "game"));
|
||||
updateSummary();
|
||||
};
|
||||
|
||||
kindInputs.forEach((input) => input.addEventListener("change", sync));
|
||||
if (titleField) titleField.addEventListener("input", updateSummary);
|
||||
if (startField) startField.addEventListener("input", updateSummary);
|
||||
sync();
|
||||
})();
|
||||
</script>
|
||||
|
||||
@@ -14,111 +14,266 @@
|
||||
{% endblock actions %}
|
||||
|
||||
{% block filter_strip %}
|
||||
<form method="get" class="flex flex-wrap items-center gap-2 border-b border-line bg-white px-7 py-3">
|
||||
<select name="season" class="select w-auto">
|
||||
{% for season in seasons %}
|
||||
<option value="{{ season.pk }}" {% if season.pk == selected_season.pk %}selected{% endif %}>{% trans "Season" %} {{ season.start_date|date:"Y" }}–{{ season.end_date|date:"Y" }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<select name="kind" class="select w-auto">
|
||||
<option value="">{% trans "All kinds" %}</option>
|
||||
{% for value, label in event_kinds %}
|
||||
<option value="{{ value }}" {% if value == selected_kind %}selected{% endif %}>{{ label }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<label class="flex cursor-pointer items-center gap-2 text-sm text-slate">
|
||||
<input type="checkbox" name="show_past" value="1" class="checkbox" {% if show_past %}checked{% endif %} onchange="this.form.submit()">
|
||||
{% trans "Show past events" %}
|
||||
</label>
|
||||
<button class="btn btn-outline btn-sm gap-2" type="submit">{% lucide "filter" size=14 %} {% trans "View" %}</button>
|
||||
</form>
|
||||
<div class="flex flex-wrap items-center gap-3 border-b border-line bg-white px-7 py-3">
|
||||
<form method="get" class="flex flex-wrap items-center gap-2">
|
||||
{% if view_mode != "calendar" %}<input type="hidden" name="view" value="{{ view_mode }}">{% endif %}
|
||||
{% if calendar_range != "week" %}<input type="hidden" name="range" value="{{ calendar_range }}">{% endif %}
|
||||
{% if view_mode == "calendar" and calendar_range != "season" %}<input type="hidden" name="date" value="{{ anchor|date:"Y-m-d" }}">{% endif %}
|
||||
<select name="season" class="select w-auto">
|
||||
{% for season in seasons %}
|
||||
<option value="{{ season.pk }}" {% if season.pk == selected_season.pk %}selected{% endif %}>{% trans "Season" %} {{ season.start_date|date:"Y" }}–{{ season.end_date|date:"Y" }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<select name="kind" class="select w-auto">
|
||||
<option value="">{% trans "All kinds" %}</option>
|
||||
{% for value, label in event_kinds %}
|
||||
<option value="{{ value }}" {% if value == selected_kind %}selected{% endif %}>{{ label }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
{% if view_mode == "list" %}
|
||||
<label class="flex cursor-pointer items-center gap-2 text-sm text-slate">
|
||||
<input type="checkbox" name="show_past" value="1" class="checkbox" {% if show_past %}checked{% endif %} onchange="this.form.submit()">
|
||||
{% trans "Show past events" %}
|
||||
</label>
|
||||
{% endif %}
|
||||
<button class="btn btn-outline btn-sm gap-2" type="submit">{% lucide "filter" size=14 %} {% trans "View" %}</button>
|
||||
</form>
|
||||
|
||||
<div class="flex-1"></div>
|
||||
|
||||
{% if view_mode == "calendar" %}
|
||||
<div class="flex items-center gap-1 rounded-full bg-steel p-1">
|
||||
<a href="{% querystring range="week" %}" class="rounded-full px-3 py-1.5 font-display text-xs font-bold tracking-[.08em] uppercase {% if calendar_range == "week" %}bg-white text-ink{% else %}text-on-dark hover:text-white{% endif %}">{% trans "Week" %}</a>
|
||||
<a href="{% querystring range="month" %}" class="rounded-full px-3 py-1.5 font-display text-xs font-bold tracking-[.08em] uppercase {% if calendar_range == "month" %}bg-white text-ink{% else %}text-on-dark hover:text-white{% endif %}">{% trans "Month" %}</a>
|
||||
<a href="{% querystring range="season" %}" class="rounded-full px-3 py-1.5 font-display text-xs font-bold tracking-[.08em] uppercase {% if calendar_range == "season" %}bg-white text-ink{% else %}text-on-dark hover:text-white{% endif %}">{% trans "Season" %}</a>
|
||||
</div>
|
||||
|
||||
{% if calendar_range != "season" %}
|
||||
<div class="flex items-center gap-1">
|
||||
<a href="{% querystring date=nav.prev|date:"Y-m-d" %}" class="btn btn-square btn-outline btn-sm" aria-label="{% trans 'Previous' %}">{% lucide "chevron-left" size=14 %}</a>
|
||||
<a href="{% querystring date=today|date:"Y-m-d" %}" class="btn btn-outline btn-sm">{% trans "Today" %}</a>
|
||||
<a href="{% querystring date=nav.next|date:"Y-m-d" %}" class="btn btn-square btn-outline btn-sm" aria-label="{% trans 'Next' %}">{% lucide "chevron-right" size=14 %}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{# Calendar/List segmented toggle -- member_list.html's Members/Guardians/Both pattern. #}
|
||||
<div class="flex items-center gap-1 rounded-full bg-steel p-1">
|
||||
<a href="{% querystring view="calendar" %}" class="flex items-center gap-1.5 rounded-full px-3 py-1.5 font-display text-xs font-bold tracking-[.08em] uppercase {% if view_mode == "calendar" %}bg-white text-ink{% else %}text-on-dark hover:text-white{% endif %}">{% lucide "calendar" size=13 %} {% trans "Calendar" %}</a>
|
||||
<a href="{% querystring view="list" %}" class="flex items-center gap-1.5 rounded-full px-3 py-1.5 font-display text-xs font-bold tracking-[.08em] uppercase {% if view_mode == "list" %}bg-white text-ink{% else %}text-on-dark hover:text-white{% endif %}">{% lucide "list" size=13 %} {% trans "List" %}</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock filter_strip %}
|
||||
|
||||
{% block panel %}
|
||||
<div class="card overflow-hidden">
|
||||
<div class="overflow-x-auto">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{% trans "Title" %}</th>
|
||||
<th>{% trans "Kind" %}</th>
|
||||
<th>{% trans "When" %}</th>
|
||||
<th>{% trans "Teams" %}</th>
|
||||
<th>{% trans "Location" %}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for event in events %}
|
||||
{% if view_mode == "list" %}
|
||||
<div class="card overflow-hidden">
|
||||
<div class="overflow-x-auto">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>
|
||||
<a class="link link-hover font-semibold text-ink" href="{% url 'management:event_detail' event.pk %}">{{ event.title }}</a>
|
||||
{% if event.series_id %}
|
||||
<span class="ml-1 inline-flex align-middle text-dim" title="{% trans 'Part of a series' %}" aria-label="{% trans 'Part of a series' %}">{% lucide "repeat" size=12 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge badge-sm {% if event.kind == "game" %}badge-error{% elif event.kind == "training" %}badge-info{% elif event.kind == "tournament" %}badge-warning{% elif event.kind == "meeting" %}badge-neutral{% elif event.kind == "social" %}border-violet/30 bg-violet/10 text-violet{% else %}badge-outline{% endif %}">
|
||||
{{ event.get_kind_display }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="font-mono text-xs text-ink">{{ event.start|date:"D j M Y H:i" }}</td>
|
||||
<td>{% for team in event.teams.all %}{{ team.short_name }}{% if not forloop.last %}, {% endif %}{% empty %}<span class="text-dim">—</span>{% endfor %}</td>
|
||||
<td>{{ event.location.name|default:"—" }}</td>
|
||||
<td class="text-right">
|
||||
{% if event.can_manage %}
|
||||
<div class="flex justify-end gap-1">
|
||||
<a class="btn btn-outline btn-sm" href="{% url 'management:event_detail' event.pk %}" aria-label="{% trans 'Edit' %}">{% lucide "pencil" size=14 %} {% trans "Edit" %}</a>
|
||||
<button class="btn btn-sm btn-outline btn-error" type="button" onclick="document.getElementById('{{ event.pk|dom_id:"event_delete_modal" }}').showModal()" aria-label="{% trans 'Delete' %}">{% lucide "trash-2" size=14 %} {% trans "Delete" %}</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
</td>
|
||||
<th>{% trans "Title" %}</th>
|
||||
<th>{% trans "Kind" %}</th>
|
||||
<th>{% trans "When" %}</th>
|
||||
<th>{% trans "Teams" %}</th>
|
||||
<th>{% trans "Location" %}</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
{% empty %}
|
||||
<tr>
|
||||
<td colspan="6" class="py-8 text-center text-muted">{% trans "No events." %}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for event in events %}
|
||||
<tr>
|
||||
<td>
|
||||
<a class="link link-hover font-semibold text-ink" href="{% url 'management:event_detail' event.pk %}">{{ event.title }}</a>
|
||||
{% if event.series_id %}
|
||||
<span class="ml-1 inline-flex align-middle text-dim" title="{% trans 'Part of a series' %}" aria-label="{% trans 'Part of a series' %}">{% lucide "repeat" size=12 %}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge badge-sm {% if event.kind == "game" %}badge-error{% elif event.kind == "training" %}badge-info{% elif event.kind == "tournament" %}badge-warning{% elif event.kind == "meeting" %}badge-neutral{% elif event.kind == "social" %}border-violet/30 bg-violet/10 text-violet{% else %}badge-outline{% endif %}">
|
||||
{{ event.get_kind_display }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="font-mono text-xs text-ink">{{ event.start|date:"D j M Y H:i" }}</td>
|
||||
<td>{% for team in event.teams.all %}{{ team.short_name }}{% if not forloop.last %}, {% endif %}{% empty %}<span class="text-dim">—</span>{% endfor %}</td>
|
||||
<td>{{ event.location.name|default:"—" }}</td>
|
||||
<td class="text-right">
|
||||
{% if event.can_manage %}
|
||||
<div class="flex justify-end gap-1">
|
||||
<a class="btn btn-outline btn-sm" href="{% url 'management:event_detail' event.pk %}" aria-label="{% trans 'Edit' %}">{% lucide "pencil" size=14 %} {% trans "Edit" %}</a>
|
||||
<button class="btn btn-sm btn-outline btn-error" type="button" onclick="document.getElementById('{{ event.pk|dom_id:"event_delete_modal" }}').showModal()" aria-label="{% trans 'Delete' %}">{% lucide "trash-2" size=14 %} {% trans "Delete" %}</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% empty %}
|
||||
<tr>
|
||||
<td colspan="6" class="py-8 text-center text-muted">{% trans "No events." %}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% include "management/_pagination.html" %}
|
||||
{% include "management/_pagination.html" %}
|
||||
|
||||
{% comment %} Dialogs live outside the table: <tbody> may only contain <tr> elements. {% endcomment %}
|
||||
{% for event in events %}
|
||||
{% if event.can_manage %}
|
||||
<dialog id="{{ event.pk|dom_id:"event_delete_modal" }}" class="modal">
|
||||
<div class="modal-box">
|
||||
<h3 class="text-lg font-bold text-ink">
|
||||
{% if event.series_id %}{% trans "Cancel occurrence" %}{% else %}{% trans "Delete event" %}{% endif %}
|
||||
</h3>
|
||||
<form method="post" action="{% url 'management:event_delete' event.pk %}" id="{{ event.pk|dom_id:"event_delete_form" }}">
|
||||
{% csrf_token %}
|
||||
{% if event.series_id %}
|
||||
{% blocktrans with name=event.title asvar delete_body %}Removes “{{ name }}” from the schedule. It won't be regenerated.{% endblocktrans %}
|
||||
<p class="py-2 text-sm text-muted">{{ delete_body }}</p>
|
||||
<label class="flex cursor-pointer items-start gap-2 text-sm text-slate">
|
||||
<input type="checkbox" name="keep_record" class="checkbox mt-0.5">
|
||||
<span>{% trans "Keep a record of it (marks it cancelled instead of deleting it)" %}</span>
|
||||
</label>
|
||||
{% else %}
|
||||
{% blocktrans with name=event.title asvar delete_body %}Delete “{{ name }}”? This cannot be undone.{% endblocktrans %}
|
||||
<p class="py-2 text-sm text-muted">{{ delete_body }}</p>
|
||||
{% endif %}
|
||||
</form>
|
||||
<div class="modal-action">
|
||||
<form method="dialog">
|
||||
<button class="btn btn-outline gap-2">{% lucide "x" size=16 %} {% trans "Cancel" %}</button>
|
||||
{% comment %} Dialogs live outside the table: <tbody> may only contain <tr> elements. {% endcomment %}
|
||||
{% for event in events %}
|
||||
{% if event.can_manage %}
|
||||
<dialog id="{{ event.pk|dom_id:"event_delete_modal" }}" class="modal">
|
||||
<div class="modal-box">
|
||||
<h3 class="text-lg font-bold text-ink">
|
||||
{% if event.series_id %}{% trans "Cancel occurrence" %}{% else %}{% trans "Delete event" %}{% endif %}
|
||||
</h3>
|
||||
<form method="post" action="{% url 'management:event_delete' event.pk %}" id="{{ event.pk|dom_id:"event_delete_form" }}">
|
||||
{% csrf_token %}
|
||||
{% if event.series_id %}
|
||||
{% blocktrans with name=event.title asvar delete_body %}Removes “{{ name }}” from the schedule. It won't be regenerated.{% endblocktrans %}
|
||||
<p class="py-2 text-sm text-muted">{{ delete_body }}</p>
|
||||
<label class="flex cursor-pointer items-start gap-2 text-sm text-slate">
|
||||
<input type="checkbox" name="keep_record" class="checkbox mt-0.5">
|
||||
<span>{% trans "Keep a record of it (marks it cancelled instead of deleting it)" %}</span>
|
||||
</label>
|
||||
{% else %}
|
||||
{% blocktrans with name=event.title asvar delete_body %}Delete “{{ name }}”? This cannot be undone.{% endblocktrans %}
|
||||
<p class="py-2 text-sm text-muted">{{ delete_body }}</p>
|
||||
{% endif %}
|
||||
</form>
|
||||
<button class="btn btn-error gap-2" type="submit" form="{{ event.pk|dom_id:"event_delete_form" }}">{% lucide "trash-2" size=16 %} {% trans "Confirm" %}</button>
|
||||
<div class="modal-action">
|
||||
<form method="dialog">
|
||||
<button class="btn btn-outline gap-2">{% lucide "x" size=16 %} {% trans "Cancel" %}</button>
|
||||
</form>
|
||||
<button class="btn btn-error gap-2" type="submit" form="{{ event.pk|dom_id:"event_delete_form" }}">{% lucide "trash-2" size=16 %} {% trans "Confirm" %}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<form method="dialog" class="modal-backdrop">
|
||||
<button>close</button>
|
||||
</form>
|
||||
</dialog>
|
||||
<form method="dialog" class="modal-backdrop">
|
||||
<button>close</button>
|
||||
</form>
|
||||
</dialog>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% elif calendar_range == "week" %}
|
||||
<div class="card overflow-hidden">
|
||||
<div class="border-b border-line px-4 py-2.5 font-display text-sm font-extrabold tracking-[.08em] text-ink uppercase">
|
||||
{% blocktrans with start=calendar.week_start|date:"j M" end=calendar.week_end|date:"j M Y" %}{{ start }} – {{ end }}{% endblocktrans %}
|
||||
</div>
|
||||
<div class="overflow-x-auto">
|
||||
{% with hours_span=calendar.hours|length|add:"-1" %}
|
||||
<div class="cal-week-inner">
|
||||
<div class="cal-week-header">
|
||||
<div class="cal-week-gutter-spacer"></div>
|
||||
{% for day in calendar.days %}
|
||||
<div class="cal-week-daycol-header {% if day.is_today %}is-today{% endif %}">
|
||||
<span class="cal-daycol-dow">{{ day.date|date:"D" }}</span>
|
||||
<span class="cal-daycol-num">{{ day.date|date:"j" }}</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<div class="cal-week-body" style="height: calc({{ hours_span }} * 3.5rem)">
|
||||
<div class="cal-week-gridlines" aria-hidden="true">
|
||||
{% for hour in calendar.hours %}
|
||||
<div class="cal-hour-line" style="top: {% widthratio forloop.counter0 hours_span 100 %}%"></div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<div class="cal-week-gutter">
|
||||
{% for hour in calendar.hours %}
|
||||
<span class="cal-hour-label" style="top: {% widthratio forloop.counter0 hours_span 100 %}%">{{ hour|stringformat:"02d" }}:00</span>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% for day in calendar.days %}
|
||||
<div class="cal-week-daycol {% if day.is_today %}is-today{% endif %}">
|
||||
{% for block in day.blocks %}
|
||||
<div class="cal-block-slot" style="top: {{ block.top_pct }}%; height: {{ block.height_pct }}%; left: {{ block.left_pct }}%; width: {{ block.width_pct }}%">
|
||||
<a class="cal-block cal-block-{{ block.event.kind }}" href="{% url 'management:event_detail' block.event.pk %}" title="{{ block.event.title }}">
|
||||
<span class="flex items-center gap-1">
|
||||
<span class="cal-block-time">{{ block.start|date:"H:i" }}</span>
|
||||
{% if block.event.series_id %}<span class="shrink-0" title="{% trans 'Part of a series' %}" aria-label="{% trans 'Part of a series' %}">{% lucide "repeat" size=10 %}</span>{% endif %}
|
||||
</span>
|
||||
<span class="cal-block-title">{{ block.event.title }}</span>
|
||||
</a>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% endwith %}
|
||||
</div>
|
||||
</div>
|
||||
{% elif calendar_range == "month" %}
|
||||
<div class="card overflow-hidden">
|
||||
<div class="border-b border-line px-4 py-2.5 font-display text-sm font-extrabold tracking-[.08em] text-ink uppercase">
|
||||
{{ anchor|date:"F Y" }}
|
||||
</div>
|
||||
<div class="cal-month-daynames">
|
||||
{% for cell in calendar.weeks.0 %}
|
||||
<div class="cal-month-dayname">{{ cell.date|date:"D" }}</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<div class="cal-month-grid">
|
||||
{% for week in calendar.weeks %}
|
||||
{% for cell in week %}
|
||||
<div class="cal-month-cell {% if not cell.in_month %}is-outside{% endif %} {% if cell.is_today %}is-today{% endif %}">
|
||||
<div class="cal-month-cell-num">{{ cell.date|date:"j" }}</div>
|
||||
<div class="cal-month-cell-events">
|
||||
{% for event in cell.events|slice:":3" %}
|
||||
<a class="cal-chip cal-chip-{{ event.kind }}" href="{% url 'management:event_detail' event.pk %}" title="{{ event.title }}">
|
||||
<span class="cal-dot cal-dot-{{ event.kind }}"></span>
|
||||
<span class="truncate">{{ event.title }}</span>
|
||||
{% if event.series_id %}<span class="shrink-0" title="{% trans 'Part of a series' %}" aria-label="{% trans 'Part of a series' %}">{% lucide "repeat" size=10 %}</span>{% endif %}
|
||||
</a>
|
||||
{% endfor %}
|
||||
{% if cell.events|length > 3 %}
|
||||
{% with extra_count=cell.events|length|add:"-3" %}
|
||||
<a class="cal-chip-more" href="{% querystring view="calendar" range="week" date=cell.date|date:"Y-m-d" %}">
|
||||
{% blocktrans count counter=extra_count %}+{{ counter }} more{% plural %}+{{ counter }} more{% endblocktrans %}
|
||||
</a>
|
||||
{% endwith %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% elif calendar_range == "season" %}
|
||||
{% if not calendar %}
|
||||
<div class="alert alert-warning">
|
||||
{% lucide "calendar-x" size=20 %}
|
||||
<span>{% trans "Pick a season above to see its calendar." %}</span>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
|
||||
{% for month in calendar.months %}
|
||||
<div class="card p-3">
|
||||
<div class="mb-2 font-display text-xs font-extrabold tracking-[.08em] text-ink uppercase">{{ month.label|date:"F Y" }}</div>
|
||||
<div class="cal-season-daynames">
|
||||
{% for cell in month.weeks.0 %}
|
||||
<span class="cal-season-dayname">{{ cell.date|date:"D"|slice:":1" }}</span>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<div class="cal-season-grid">
|
||||
{% for week in month.weeks %}
|
||||
{% for cell in week %}
|
||||
{% if cell.count %}
|
||||
<a class="cal-season-cell has-events {% if not cell.in_month %}is-outside{% endif %} {% if cell.is_today %}is-today{% endif %}" href="{% querystring view="calendar" range="week" date=cell.date|date:"Y-m-d" %}">
|
||||
<span class="cal-season-daynum">{{ cell.date|date:"j" }}</span>
|
||||
<span class="cal-season-count">{{ cell.count }}</span>
|
||||
</a>
|
||||
{% else %}
|
||||
<span class="cal-season-cell {% if not cell.in_month %}is-outside{% endif %} {% if cell.is_today %}is-today{% endif %}">
|
||||
<span class="cal-season-daynum">{{ cell.date|date:"j" }}</span>
|
||||
</span>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
{% empty %}
|
||||
<p class="col-span-full py-6 text-center text-sm text-muted">{% trans "This season has no months to show." %}</p>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endblock panel %}
|
||||
|
||||
@@ -4,78 +4,197 @@
|
||||
{% block heading %}{% if update_view %}{% blocktrans %}Edit {{ object }}{% endblocktrans %}{% else %}{% trans "New series" %}{% endif %}{% endblock heading %}
|
||||
|
||||
{% block panel %}
|
||||
<div class="card w-full">
|
||||
<div class="card-body">
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
<form method="post" class="flex flex-col gap-4">
|
||||
{% csrf_token %}
|
||||
|
||||
{% for error in form.non_field_errors %}
|
||||
<div class="alert alert-error">
|
||||
<span>{{ error }}</span>
|
||||
{% for error in form.non_field_errors %}
|
||||
<div class="alert alert-error">
|
||||
<span>{{ error }}</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="event-section-header">
|
||||
<span class="event-section-icon">{% lucide "clipboard-list" size=18 %}</span>
|
||||
<div>
|
||||
<div class="event-section-title">{% trans "What's happening?" %}</div>
|
||||
<div class="event-section-hint">{% trans "Pick a kind to reveal only the fields that matter for it -- it applies to every occurrence this series generates." %}</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
{% form_field form.title %}
|
||||
{% form_field form.kind %}
|
||||
</div>
|
||||
|
||||
<div class="my-5 border-t border-line"></div>
|
||||
<h3 class="mb-3 font-display text-xs font-extrabold tracking-[.12em] text-muted uppercase">{% trans "Repeats" %}</h3>
|
||||
<div class="mb-4">
|
||||
{# Real radios, not a JS-synced facade over a hidden <select> -- each card IS the field's own input, so keyboard/tab/arrow-key operation and screen readers get native radiogroup semantics for free, and there's no second visible control for the same field. #}
|
||||
<div class="kind-grid" role="radiogroup" aria-label="{{ form.fields.kind.label|capfirst }}">
|
||||
{% for value, label in form.fields.kind.choices %}
|
||||
<label class="kind-card" data-kind="{{ value }}">
|
||||
<input type="radio" name="{{ form.kind.html_name }}" value="{{ value }}" class="sr-only" {% if form.kind.value == value %}checked{% endif %} required>
|
||||
{% if value == "training" %}{% lucide "dumbbell" size=20 %}
|
||||
{% elif value == "game" %}{% lucide "swords" size=20 %}
|
||||
{% elif value == "tournament" %}{% lucide "trophy" size=20 %}
|
||||
{% elif value == "meeting" %}{% lucide "message-square" size=20 %}
|
||||
{% elif value == "social" %}{% lucide "party-popper" size=20 %}
|
||||
{% elif value == "other" %}{% lucide "circle-ellipsis" size=20 %}
|
||||
{% else %}{% lucide "calendar" size=20 %}
|
||||
{% endif %}
|
||||
<span class="kind-card-label">{{ label }}</span>
|
||||
</label>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% if form.kind.errors %}
|
||||
<p class="mt-2 text-xs text-club-dark">{{ form.kind.errors|join:" " }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="w-full">
|
||||
{% form_field form.title %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card event-summary">
|
||||
<span class="event-summary-icon">{% lucide "sparkles" size=16 %}</span>
|
||||
<span id="event-summary-text">{% trans "This line updates live as you fill in the form below." %}</span>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="event-section-header">
|
||||
<span class="event-section-icon">{% lucide "repeat" size=18 %}</span>
|
||||
<div>
|
||||
<div class="event-section-title">{% trans "Repeats" %}</div>
|
||||
<div class="event-section-hint">{% trans "The friendly pattern below, or drop into a raw recurrence rule for anything unusual." %}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% trans "Only used for a weekly pattern -- a monthly one repeats on the same day of the month as the first occurrence below." as weekdays_help %}
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-3">
|
||||
{% form_field form.frequency %}
|
||||
{% form_field form.interval %}
|
||||
{% form_field form.weekdays help_text=weekdays_help %}
|
||||
{% form_field form.dtstart %}
|
||||
{% form_field form.until %}
|
||||
</div>
|
||||
{% trans "Only used for a weekly pattern -- a monthly one repeats on the same day of the month as the first occurrence above." as weekdays_help %}
|
||||
{% form_field form.weekdays help_text=weekdays_help %}
|
||||
<details class="collapse-arrow mt-3 rounded-lg border border-line bg-white">
|
||||
<summary class="cursor-pointer px-3 py-2 text-sm font-medium text-ink">{% trans "Advanced: raw recurrence rule" %}</summary>
|
||||
<div class="border-t border-rule p-3">
|
||||
{% form_field form.advanced_rrule %}
|
||||
</div>
|
||||
</details>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="my-5 border-t border-line"></div>
|
||||
<h3 class="mb-3 font-display text-xs font-extrabold tracking-[.12em] text-muted uppercase">{% trans "Audience" %}</h3>
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-3">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="event-section-header">
|
||||
<span class="event-section-icon">{% lucide "users" size=18 %}</span>
|
||||
<div>
|
||||
<div class="event-section-title">{% trans "Who's invited" %}</div>
|
||||
<div class="event-section-hint">{% trans "Teams and groups invite every current member automatically." %}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if "club_wide" in form.fields %}
|
||||
<div class="event-clubwide-toggle">
|
||||
{% form_field form.club_wide show_as_toggle=True %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
{% form_field form.teams %}
|
||||
{% form_field form.groups %}
|
||||
{% if "club_wide" in form.fields %}
|
||||
{% form_field form.club_wide %}
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="mt-4 grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
{% form_field form.invited_members %}
|
||||
{% form_field form.excluded_members %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="my-5 border-t border-line"></div>
|
||||
<h3 class="mb-3 font-display text-xs font-extrabold tracking-[.12em] text-muted uppercase">{% trans "Where" %}</h3>
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
{% form_field form.location %}
|
||||
{% form_field form.opponent %}
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="event-section-header">
|
||||
<span class="event-section-icon">{% lucide "calendar-clock" size=18 %}</span>
|
||||
<div>
|
||||
<div class="event-section-title">{% trans "Where & timing" %}</div>
|
||||
<div class="event-section-hint">{% trans "Venue, and how long each occurrence runs relative to its start." %}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="my-5 border-t border-line"></div>
|
||||
<h3 class="mb-3 font-display text-xs font-extrabold tracking-[.12em] text-muted uppercase">{% trans "Timing" %}</h3>
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-4">
|
||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||
{% form_field form.location %}
|
||||
<div class="game-only">
|
||||
{% form_field form.opponent %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mt-4 grid grid-cols-1 gap-4 border-t border-rule pt-4 md:grid-cols-4">
|
||||
{% form_field form.duration_hours %}
|
||||
{% form_field form.duration_minutes %}
|
||||
{% form_field form.gathering_minutes_before %}
|
||||
{% form_field form.deadline_minutes_before %}
|
||||
</div>
|
||||
|
||||
<div class="card-actions justify-start pt-4">
|
||||
<a class="btn btn-outline gap-2" href="{% if update_view %}{% url "management:event_series_detail" object.pk %}{% else %}{% url "management:event_list" %}{% endif %}">{% 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>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-wrap items-center gap-3">
|
||||
<a class="btn btn-outline gap-2" href="{% if update_view %}{% url "management:event_series_detail" object.pk %}{% else %}{% url "management:event_list" %}{% endif %}">{% 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>
|
||||
{% endblock panel %}
|
||||
|
||||
{% block extra_body %}
|
||||
<script src="{% static 'js/searchable-select.js' %}"></script>
|
||||
<script>
|
||||
(() => {
|
||||
// Same mechanism as event_form.html's own copy of this script (see
|
||||
// its comment) -- the kind cards are the real "kind" radios, which
|
||||
// drive .game-only (here just the opponent field -- a series has no
|
||||
// separate "Game details" section to show/hide) and the live
|
||||
// summary line. No hidden field to keep in sync with a picker.
|
||||
const kindInputs = document.querySelectorAll('input[name="kind"]');
|
||||
const titleField = document.getElementById("id_title");
|
||||
const dtstartField = document.getElementById("id_dtstart");
|
||||
const frequencyField = document.getElementById("id_frequency");
|
||||
const gameOnlyElements = document.querySelectorAll(".game-only");
|
||||
const summary = document.getElementById("event-summary-text");
|
||||
if (!kindInputs.length) return;
|
||||
|
||||
const NO_TITLE = "{% trans "Untitled series" %}";
|
||||
const NO_DATE = "{% trans "no start date set yet" %}";
|
||||
|
||||
const formatStart = (value) => {
|
||||
if (!value) return NO_DATE;
|
||||
const date = new Date(value);
|
||||
if (Number.isNaN(date.getTime())) return NO_DATE;
|
||||
return date.toLocaleString(undefined, { weekday: "short", day: "numeric", month: "short", hour: "2-digit", minute: "2-digit" });
|
||||
};
|
||||
|
||||
const checkedKind = () => document.querySelector('input[name="kind"]:checked');
|
||||
|
||||
const updateSummary = () => {
|
||||
if (!summary) return;
|
||||
const checked = checkedKind();
|
||||
const kindLabel = checked ? checked.closest(".kind-card").querySelector(".kind-card-label").textContent.trim() : "";
|
||||
const title = (titleField && titleField.value.trim()) || NO_TITLE;
|
||||
const selectedFrequency = frequencyField ? frequencyField.options[frequencyField.selectedIndex] : null;
|
||||
const frequencyLabel = selectedFrequency ? selectedFrequency.text : "";
|
||||
const when = formatStart(dtstartField ? dtstartField.value : "");
|
||||
summary.textContent = `${kindLabel} – ${title} – ${frequencyLabel}, ${when}`;
|
||||
};
|
||||
|
||||
const sync = () => {
|
||||
const checked = checkedKind();
|
||||
gameOnlyElements.forEach((element) => element.classList.toggle("hidden", !checked || checked.value !== "game"));
|
||||
updateSummary();
|
||||
};
|
||||
|
||||
kindInputs.forEach((input) => input.addEventListener("change", sync));
|
||||
if (titleField) titleField.addEventListener("input", updateSummary);
|
||||
if (dtstartField) dtstartField.addEventListener("input", updateSummary);
|
||||
if (frequencyField) frequencyField.addEventListener("change", updateSummary);
|
||||
sync();
|
||||
})();
|
||||
</script>
|
||||
{% endblock extra_body %}
|
||||
|
||||
@@ -4634,6 +4634,28 @@ class EventManagementTests(ManagementTestBase):
|
||||
self.assertContains(response, reverse("management:event_delete", args=[own_event.pk]))
|
||||
self.assertNotContains(response, reverse("management:event_delete", args=[other_event.pk]))
|
||||
|
||||
def test_the_week_calendar_marks_a_series_occurrence_with_the_repeat_icon(self):
|
||||
series = EventSeries.objects.create(club=self.club, title="Weekly Training", kind=Event.EventKind.TRAINING, dtstart=timezone.now(), rrule="FREQ=WEEKLY;COUNT=1")
|
||||
occurrence = Event.objects.create(club=self.club, title="Weekly Training", start=timezone.now(), series=series)
|
||||
occurrence.teams.add(self.own_team)
|
||||
standalone = Event.objects.create(club=self.club, title="One-off Training", start=timezone.now() + datetime.timedelta(hours=1))
|
||||
standalone.teams.add(self.own_team)
|
||||
self.client.force_login(self.own_team_coach)
|
||||
|
||||
response = self.club_get("event_list") # default view=calendar, range=week
|
||||
|
||||
self.assertContains(response, 'aria-label="Part of a series"', count=1)
|
||||
|
||||
def test_the_month_calendar_marks_a_series_occurrence_with_the_repeat_icon(self):
|
||||
series = EventSeries.objects.create(club=self.club, title="Weekly Training", kind=Event.EventKind.TRAINING, dtstart=timezone.now(), rrule="FREQ=WEEKLY;COUNT=1")
|
||||
occurrence = Event.objects.create(club=self.club, title="Weekly Training", start=timezone.now(), series=series)
|
||||
occurrence.teams.add(self.own_team)
|
||||
self.client.force_login(self.own_team_coach)
|
||||
|
||||
response = self.club_get("event_list", params={"range": "month"})
|
||||
|
||||
self.assertContains(response, 'aria-label="Part of a series"', count=1)
|
||||
|
||||
def test_a_manager_only_sees_events_for_teams_they_manage(self):
|
||||
own_event = Event.objects.create(club=self.club, title="My event", start=timezone.now() + datetime.timedelta(days=1))
|
||||
own_event.teams.add(self.own_team)
|
||||
@@ -5003,14 +5025,25 @@ class EventDetailDisplayTests(ManagementTestBase):
|
||||
self.assertContains(response, "Peter Player")
|
||||
self.assertContains(response, "Bringing the kit bag")
|
||||
|
||||
def test_the_rsvp_modal_groups_responses_into_collapsible_status_sections(self):
|
||||
def test_the_rsvp_modal_offers_a_filter_pill_per_status_with_responses(self):
|
||||
event = self.make_event()
|
||||
Attendance.objects.filter(event=event, member=self.player).update(status=Attendance.AttendanceStatus.PRESENT)
|
||||
|
||||
response = self.club_get("event_detail", event.pk)
|
||||
|
||||
self.assertContains(response, "<details")
|
||||
self.assertContains(response, "collapse-arrow")
|
||||
# One pill per status that actually has a response ("Present"), none for
|
||||
# the others (Absent, Excused, ... all sit at 0 for this single-player event).
|
||||
self.assertContains(response, 'data-status="present"')
|
||||
self.assertNotContains(response, 'data-status="absent"')
|
||||
self.assertContains(response, 'data-status=""') # the "All" pill
|
||||
|
||||
def test_the_rsvp_modal_tags_each_row_with_its_status_for_client_side_filtering(self):
|
||||
event = self.make_event()
|
||||
Attendance.objects.filter(event=event, member=self.player).update(status=Attendance.AttendanceStatus.PRESENT)
|
||||
|
||||
response = self.club_get("event_detail", event.pk)
|
||||
|
||||
self.assertContains(response, '<tr data-status="present">')
|
||||
|
||||
def test_the_details_card_shows_gathering_and_deadline_even_when_unset(self):
|
||||
event = self.make_event()
|
||||
|
||||
@@ -2290,6 +2290,7 @@ class EventDetailView(ClubStaffRequiredMixin, DetailView):
|
||||
referee_management_needed=referee_management_needed,
|
||||
attendance_groups=attendance_groups,
|
||||
has_attendance_rows=any(group["rows"] for group in attendance_groups),
|
||||
attendance_row_count=sum(len(group["rows"]) for group in attendance_groups),
|
||||
referees=referees,
|
||||
referee_candidates=referee_candidates,
|
||||
referees_full=referees_full,
|
||||
|
||||
Reference in New Issue
Block a user