Skip to content
11 changes: 11 additions & 0 deletions djangoproject/templates/foundation/meeting_snippet.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,14 @@ <h4>
</li>
{% endfor %}
</ul>
<p>
{% blocktranslate trimmed %}
Board meetings are generally the second Thursday of the month but are
occasionally rescheduled for attendance.
{% endblocktranslate %}
{% if next_meeting_date %}
{% translate "Next meeting scheduled for: " context "Following meetings schedule" %}
{{next_meeting_date|date:"DATE_FORMAT"}}
{% endif %}

</p>
18 changes: 18 additions & 0 deletions foundation/migrations/0008_meeting_next_meeting_date.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 5.2 on 2025-09-12 09:54

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('foundation', '0007_boardmember_account_protect'),
]

operations = [
migrations.AddField(
model_name='meeting',
name='next_meeting_date',
field=models.DateField(blank=True, null=True),
),
]
1 change: 1 addition & 0 deletions foundation/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class Meeting(models.Model):
)
treasurer_report = models.TextField(blank=True)
treasurer_report_html = models.TextField(editable=False)
next_meeting_date = models.DateField(null=True, blank=True)

def __str__(self):
return "{}, {}".format(self.title, date_format(self.date, "F j, Y"))
Expand Down
3 changes: 2 additions & 1 deletion foundation/templatetags/meetings.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
@register.inclusion_tag("foundation/meeting_snippet.html")
def render_latest_meeting_minute_entries(num):
meetings = Meeting.objects.order_by("-date").prefetch_related("business")[:num]
return {"meetings": meetings}
next_meeting_date = meetings[0].next_meeting_date if meetings else None
return {"meetings": meetings, "next_meeting_date": next_meeting_date}
5 changes: 4 additions & 1 deletion foundation/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ def test_latest_meeting_minutes(self):
"title": "DSF Board monthly meeting",
}
latest_meeting = Meeting.objects.create(
date=date(2023, 5, 12), **common_meeting_data
date=date(2023, 5, 12),
next_meeting_date=date(2023, 6, 13),
**common_meeting_data
)
previous_meeting = Meeting.objects.create(
date=date(2023, 4, 12), **common_meeting_data
Expand All @@ -104,6 +106,7 @@ def test_latest_meeting_minutes(self):
self.assertContains(response, "Latest DSF meeting minutes")

self.assertContains(response, "DSF Board monthly meeting, May 12, 2023")
self.assertContains(response, "Next meeting scheduled for: June 13, 2023")
self.assertContains(response, latest_meeting.get_absolute_url())
self.assertContains(response, "DSF Board monthly meeting, April 12, 2023")
self.assertContains(response, previous_meeting.get_absolute_url())
Expand Down