Round out referee amounts/colors, and add bilingual (nl/en) news content
Referee display: drop the redundant "External" pill from the PDF form, round the event/dashboard "due" summary to 2 decimals (a fine-grained km rate like 0.083 was pushing the raw total to 3+ decimals), and theme the PDF's accent colors off the club's own primary/secondary colors instead of a hardcoded default. News: title/body stay the club's own-language (Dutch) text; new optional title_en/body_en carry a translation, with News.effective_title_en/ effective_body_en resolving the fallback to the original on read rather than copying it in at save time -- so editing the Dutch text later never leaves a stale English copy behind, and existing rows get correct fallback behaviour with no backfill. The news form lays both languages out side by side; the detail page only shows an English section when one was actually added. The public API returns both languages in one call (title_nl/body_nl/excerpt_nl alongside title_en/body_en/excerpt_en, the latter never blank) -- a breaking rename of the previously-unprefixed title/body/excerpt fields. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -522,10 +522,11 @@ class NewsForm(forms.ModelForm):
|
||||
|
||||
class Meta:
|
||||
model = News
|
||||
fields = ["title", "teams", "visibility", "body"]
|
||||
fields = ["title", "title_en", "teams", "visibility", "body", "body_en"]
|
||||
widgets = {
|
||||
"teams": forms.SelectMultiple(attrs={"data-searchable": "true", "data-search-placeholder": _("Type to filter teams...")}),
|
||||
"body": forms.Textarea(attrs={"rows": 8}),
|
||||
"body_en": forms.Textarea(attrs={"rows": 8}),
|
||||
}
|
||||
|
||||
def __init__(self, *args, club=None, **kwargs):
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
{{ referee.display_name }}
|
||||
{% if referee.is_external %}<span class="badge badge-neutral badge-xs">{% trans "External" %}</span>{% endif %}
|
||||
{% if referee.assigned_by %}<span class="text-xs opacity-60">— {% blocktrans with name=referee.assigned_by %}assigned by {{ name }}{% endblocktrans %}</span>{% endif %}
|
||||
{% if referee.total_payable %}<span class="text-xs opacity-60">— {% blocktrans with total=referee.total_payable %}€{{ total }} due{% endblocktrans %}</span>{% endif %}
|
||||
{% if referee.total_payable %}<span class="text-xs opacity-60">— {% blocktrans with total=referee.total_payable|floatformat:2 %}€{{ total }} due{% endblocktrans %}</span>{% endif %}
|
||||
</span>
|
||||
{% if can_manage_referees %}
|
||||
<div class="flex gap-1 shrink-0">
|
||||
|
||||
@@ -24,7 +24,12 @@
|
||||
color: #8a8a8a;
|
||||
}
|
||||
}
|
||||
:root { --accent: #3730a3; --accent-soft: #eef0fc; --ink: #16181d; --muted: #6b7280; --line: #d8dae0; }
|
||||
:root {
|
||||
--accent: {{ club.primary_color|default:"#3730a3" }};
|
||||
--accent-secondary: {{ club.secondary_color|default:"#be185d" }};
|
||||
--accent-soft: color-mix(in srgb, var(--accent-secondary) 14%, white);
|
||||
--ink: #16181d; --muted: #6b7280; --line: #d8dae0;
|
||||
}
|
||||
* { box-sizing: border-box; }
|
||||
body { font-family: sans-serif; font-size: 10pt; color: var(--ink); line-height: 1.45; }
|
||||
|
||||
@@ -51,8 +56,7 @@
|
||||
table.fees td { padding: 2.5mm 2mm 2.5mm 0; border-bottom: 0.75pt solid var(--line); vertical-align: top; }
|
||||
table.fees td.amount, table.fees th.amount { text-align: right; }
|
||||
table.fees tr.empty td { color: var(--muted); font-style: italic; }
|
||||
.badge-external { display: inline-block; font-size: 7pt; color: var(--accent); background: var(--accent-soft); border-radius: 2mm; padding: 0.3mm 1.5mm; margin-left: 1.5mm; }
|
||||
table.fees tr.total td { border-bottom: none; border-top: 1.5pt solid var(--ink); font-weight: 700; padding-top: 3mm; }
|
||||
table.fees tr.total td { border-bottom: none; border-top: 1.5pt solid var(--accent); font-weight: 700; padding-top: 3mm; }
|
||||
|
||||
.signatures { display: flex; gap: 8mm; margin-top: 4mm; }
|
||||
.sign-box { flex: 1; }
|
||||
@@ -120,10 +124,7 @@
|
||||
<tbody>
|
||||
{% for referee in referees %}
|
||||
<tr>
|
||||
<td>
|
||||
{{ referee.display_name }}
|
||||
{% if referee.is_external %}<span class="badge-external">{% trans "External" %}</span>{% endif %}
|
||||
</td>
|
||||
<td>{{ referee.display_name }}</td>
|
||||
<td class="amount">€{{ referee.fee|floatformat:2 }}</td>
|
||||
<td class="amount">{% if referee.km %}{{ referee.km }} km{% else %}—{% endif %}</td>
|
||||
<td class="amount">{% if referee.km %}€{{ referee.km_rate }}{% else %}—{% endif %}</td>
|
||||
|
||||
@@ -41,6 +41,16 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if news_item.title_en or news_item.body_en %}
|
||||
<div class="card bg-base-100 shadow mt-4">
|
||||
<div class="card-body">
|
||||
<h2 class="card-title text-base">{% trans "English" %}</h2>
|
||||
{% if news_item.title_en %}<p class="font-semibold">{{ news_item.title_en }}</p>{% endif %}
|
||||
{% if news_item.body_en %}<p class="whitespace-pre-line">{{ news_item.body_en }}</p>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="card bg-base-100 shadow mt-4">
|
||||
<div class="card-body">
|
||||
<div class="flex items-center justify-between">
|
||||
|
||||
@@ -19,10 +19,19 @@
|
||||
<p class="opacity-70 text-sm mb-2">{% trans "Photos can be added once the news item is created." %}</p>
|
||||
{% endif %}
|
||||
|
||||
<div class="grid grid-cols-1 gap-4">
|
||||
{% for field in form %}
|
||||
{% form_field field %}
|
||||
{% endfor %}
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
{% form_field form.title %}
|
||||
{% form_field form.title_en %}
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-1 gap-4 mt-4">
|
||||
{% form_field form.teams %}
|
||||
{% form_field form.visibility %}
|
||||
</div>
|
||||
|
||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 mt-4">
|
||||
{% form_field form.body %}
|
||||
{% form_field form.body_en %}
|
||||
</div>
|
||||
|
||||
<div class="card-actions justify-start pt-2 mt-2">
|
||||
|
||||
@@ -10,6 +10,7 @@ from allauth.mfa.models import Authenticator
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.core.cache import cache
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from django.template.loader import render_to_string
|
||||
from django.test import TestCase, override_settings
|
||||
from django.urls import NoReverseMatch, reverse
|
||||
from django.utils import timezone
|
||||
@@ -2726,6 +2727,44 @@ class NewsManagementTests(ManagementTestBase):
|
||||
self.assertRedirects(response, reverse("management:news_detail", args=[item.pk]))
|
||||
self.assertEqual(item.status, News.Status.DRAFT)
|
||||
|
||||
def test_an_english_translation_can_be_added_alongside_the_original(self):
|
||||
self.client.force_login(self.make_coach_manager())
|
||||
|
||||
self.club_post(
|
||||
"news_create",
|
||||
{"title": "Seizoensstart", "title_en": "Season kickoff", "body": "We beginnen het seizoen.", "body_en": "We're starting the season.", "visibility": News.Visibility.INTERNAL, "teams": [str(self.team.pk)]},
|
||||
)
|
||||
|
||||
item = News.objects.get(club=self.club, title="Seizoensstart")
|
||||
self.assertEqual(item.title_en, "Season kickoff")
|
||||
self.assertEqual(item.body_en, "We're starting the season.")
|
||||
|
||||
def test_the_english_translation_is_optional(self):
|
||||
self.client.force_login(self.make_coach_manager())
|
||||
|
||||
response = self.club_post("news_create", {"title": "Seizoensstart", "body": "We beginnen het seizoen.", "visibility": News.Visibility.INTERNAL, "teams": [str(self.team.pk)]})
|
||||
|
||||
item = News.objects.get(club=self.club, title="Seizoensstart")
|
||||
self.assertRedirects(response, reverse("management:news_detail", args=[item.pk]))
|
||||
self.assertEqual(item.title_en, "")
|
||||
|
||||
def test_detail_page_shows_the_english_translation_when_set(self):
|
||||
item = News.objects.create(club=self.club, title="Seizoensstart", body="We beginnen het seizoen.", title_en="Season kickoff", body_en="We're starting the season.")
|
||||
self.client.force_login(self.admin_user)
|
||||
|
||||
response = self.club_get("news_detail", item.pk)
|
||||
|
||||
self.assertContains(response, "Season kickoff")
|
||||
self.assertContains(response, "We're starting the season.")
|
||||
|
||||
def test_detail_page_hides_the_english_section_when_not_translated(self):
|
||||
item = News.objects.create(club=self.club, title="Seizoensstart", body="We beginnen het seizoen.")
|
||||
self.client.force_login(self.admin_user)
|
||||
|
||||
response = self.club_get("news_detail", item.pk)
|
||||
|
||||
self.assertNotContains(response, ">English<")
|
||||
|
||||
def test_plain_staff_cannot_create_news(self):
|
||||
self.client.force_login(self.make_plain_staff())
|
||||
|
||||
@@ -4170,6 +4209,18 @@ class EventRefereeManagementTests(ManagementTestBase):
|
||||
|
||||
self.assertContains(response, "25.00")
|
||||
|
||||
def test_the_total_due_is_shown_with_at_most_two_decimals(self):
|
||||
# A per-km rate like 0.083 pushes the raw total to 3+ decimals -- the
|
||||
# "due" summary must still round to money-style 2.
|
||||
game = self.make_game()
|
||||
EventReferee.objects.create(event=game, member=self.referee, assigned_by=self.admin_member, fee=Decimal("25.00"), km=Decimal("40"), km_rate=Decimal("0.083"))
|
||||
self.client.force_login(self.admin_user)
|
||||
|
||||
response = self.club_get("event_detail", game.pk)
|
||||
|
||||
self.assertContains(response, "28.32 due")
|
||||
self.assertNotContains(response, "28.320")
|
||||
|
||||
def test_a_coach_gets_403_setting_a_fee(self):
|
||||
game = self.make_game()
|
||||
assignment = EventReferee.objects.create(event=game, member=self.referee, assigned_by=self.admin_member)
|
||||
@@ -4234,6 +4285,56 @@ class EventRefereeFormPdfTests(ManagementTestBase):
|
||||
self.assertEqual(context["home_location"], self.home_ground)
|
||||
self.assertEqual(list(context["referees"]), [EventReferee.objects.get(event=game)])
|
||||
|
||||
def test_the_grand_total_sums_every_referees_total_payable(self):
|
||||
game = self.make_game()
|
||||
other_referee = Member.objects.create(first_name="Other", last_name="Ref")
|
||||
ClubMembership.objects.create(club=self.club, member=other_referee, season=self.season, status=ClubMembership.StatusChoices.ACTIVE)
|
||||
EventReferee.objects.create(event=game, member=self.referee, assigned_by=self.admin_member, fee=Decimal("25.00"), km=Decimal("40"), km_rate=Decimal("0.083"))
|
||||
EventReferee.objects.create(event=game, member=other_referee, assigned_by=self.admin_member, fee=Decimal("20.00"))
|
||||
self.client.force_login(self.admin_user)
|
||||
|
||||
with mock.patch("management.views.event_referee_form_pdf", return_value=b"%PDF-fake") as renderer:
|
||||
self.club_get("event_referee_form_pdf", game.pk)
|
||||
|
||||
self.assertEqual(renderer.call_args[0][0]["grand_total"], Decimal("48.320"))
|
||||
|
||||
def test_the_external_referee_pill_is_not_rendered(self):
|
||||
game = self.make_game()
|
||||
EventReferee.objects.create(event=game, external_name="Guest Referee", assigned_by=self.admin_member)
|
||||
|
||||
html = render_to_string("management/event_referee_form_pdf.html", {"club": self.club, "event": game, "referees": list(game.referees.all()), "home_location": self.home_ground, "grand_total": Decimal("0")})
|
||||
|
||||
self.assertIn("Guest Referee", html)
|
||||
self.assertNotIn("External", html)
|
||||
|
||||
def test_amounts_render_with_at_most_two_decimals(self):
|
||||
game = self.make_game()
|
||||
EventReferee.objects.create(event=game, member=self.referee, assigned_by=self.admin_member, fee=Decimal("25.00"), km=Decimal("40"), km_rate=Decimal("0.083"))
|
||||
|
||||
html = render_to_string("management/event_referee_form_pdf.html", {"club": self.club, "event": game, "referees": list(game.referees.all()), "home_location": self.home_ground, "grand_total": Decimal("28.320")})
|
||||
|
||||
self.assertIn("€28.32<", html)
|
||||
self.assertNotIn("28.320", html)
|
||||
|
||||
def test_the_pdf_uses_the_clubs_colours_when_set(self):
|
||||
self.club.primary_color = "#0f766e"
|
||||
self.club.secondary_color = "#f59e0b"
|
||||
self.club.save(update_fields=["primary_color", "secondary_color"])
|
||||
game = self.make_game()
|
||||
|
||||
html = render_to_string("management/event_referee_form_pdf.html", {"club": self.club, "event": game, "referees": [], "home_location": self.home_ground, "grand_total": Decimal("0")})
|
||||
|
||||
self.assertIn("--accent: #0f766e", html)
|
||||
self.assertIn("--accent-secondary: #f59e0b", html)
|
||||
|
||||
def test_the_pdf_falls_back_to_default_colours_when_unset(self):
|
||||
game = self.make_game()
|
||||
|
||||
html = render_to_string("management/event_referee_form_pdf.html", {"club": self.club, "event": game, "referees": [], "home_location": self.home_ground, "grand_total": Decimal("0")})
|
||||
|
||||
self.assertIn("--accent: #3730a3", html)
|
||||
self.assertIn("--accent-secondary: #be185d", html)
|
||||
|
||||
def test_a_missing_pdf_library_is_reported_rather_than_a_500(self):
|
||||
game = self.make_game()
|
||||
self.client.force_login(self.admin_user)
|
||||
|
||||
Reference in New Issue
Block a user