-
-
+ {% else %}
+
- 
-
-
-
+ {% endfor %}
+ {{ event.title }}
-{{ event.description }}
-- Date: {{ event.start_date }} - {% if event.end_date and event.end_date != event.start_date %}– {{ event.end_date }}{% endif %} -
-- Contributors: {{ event.contributors }} -
+ {% regroup events by start_date.year as year_groups %} + {% if year_groups %} +
+ {% for year_group in year_groups %}
+
- {% endfor %}
-
+
- {{ year_group.grouper }}
+
+ {% for event in year_group.list %}
+
+
+ {% endfor %}
+
+
+ 
+
+
+
+
+
+
+ {{ event.title }}
++ {{ event.start_date }} + {% if event.end_date and event.end_date != event.start_date %}– {{ event.end_date }}{% endif %} + {% if event.location %} + {{ event.location }} + {% endif %} +
+{{ event.description|truncatewords:35 }}
+ {% if event.contributors %} ++ {{ event.contributors }} +
+ {% endif %} + {% if event.event_link or event.blog %} +
+ {% if event.event_link %}
+
+ Event page
+
+ {% endif %}
+ {% if event.blog %}
+
+ Blog post
+
+ {% endif %}
+
+ {% endif %}
+ No events yet.
+ {% endif %} {% endblock content %} diff --git a/main/views/page_views.py b/main/views/page_views.py index e3273a25..37931acc 100644 --- a/main/views/page_views.py +++ b/main/views/page_views.py @@ -1,6 +1,5 @@ """Views for the page-related pages of the main app.""" -import csv import json import logging from collections.abc import Mapping @@ -12,7 +11,6 @@ import nh3 import requests from django.shortcuts import get_object_or_404 -from django.templatetags.static import static from django.utils.decorators import method_decorator from django.utils.safestring import mark_safe from django.views.decorators.cache import cache_page @@ -21,6 +19,7 @@ from ..models import ( CompetencyDomain, + Event, LearningResource, Skill, SkillLevel, @@ -118,32 +117,10 @@ class EventsPageView(TemplateView): template_name = "main/pages/events.html" - def get_context_data(self, **kwargs: Mapping[str, Any]) -> dict[str, Any]: - """Add events from CSV to the template context.""" + def get_context_data(self, **kwargs: Mapping[str, object]) -> dict[str, object]: + """Add events from the database to the template context.""" context = super().get_context_data(**kwargs) - csv_path = Path("data/events.csv") - events = [] - - if csv_path.exists(): - with open(csv_path, newline="", encoding="utf-8") as csvfile: - reader = csv.DictReader(csvfile) - for row in reader: - events.append( - { - "title": row.get("Title", ""), - "start_date": row.get("Start Date", ""), - "end_date": row.get("End Date", ""), - "description": row.get("Description", ""), - "contributors": row.get("Contributors", ""), - "image": static( - row.get("Image", "assets/img/blog/single/image.jpg") - ), - } - ) - - events.sort(key=lambda e: e["start_date"], reverse=True) - - context["events"] = events + context["events"] = Event.objects.all() return context diff --git a/tests/main/conftest.py b/tests/main/conftest.py index 393eeac6..dfca97b4 100644 --- a/tests/main/conftest.py +++ b/tests/main/conftest.py @@ -5,6 +5,7 @@ from main.models import ( Competency, CompetencyDomain, + Event, LearningResource, Provider, Skill, @@ -103,3 +104,18 @@ def skill_level() -> SkillLevel: def user_skill(user, skill: Skill, skill_level: SkillLevel) -> UserSkill: """Fixture for creating a UserSkill instance.""" return UserSkill.objects.create(user=user, skill=skill, skill_level=skill_level) + + +@pytest.fixture +def event() -> Event: + """Fixture for creating an Event instance.""" + return Event.objects.create( + title="Collaborations Workshop", + start_date="2026-04-01", + end_date="2026-04-02", + location="Manchester", + description="A workshop about the framework.", + event_link="https://example.com/event", + blog="https://example.com/blog", + contributors="Test Contributor", + ) diff --git a/tests/main/test_community_models.py b/tests/main/test_community_models.py new file mode 100644 index 00000000..782942b2 --- /dev/null +++ b/tests/main/test_community_models.py @@ -0,0 +1,25 @@ +"""Test suite for the community related models.""" + +import pytest + +from main.models import Event + + +@pytest.mark.django_db +def test_event_model(event: Event) -> None: + """Test the Event model.""" + assert event.title == "Collaborations Workshop" + assert str(event) == "Collaborations Workshop (2026-04-01)" + assert event.location == "Manchester" + assert event.description == "A workshop about the framework." + assert event.event_link == "https://example.com/event" + assert event.blog == "https://example.com/blog" + assert event.contributors == "Test Contributor" + assert event.image == "" + + +@pytest.mark.django_db +def test_event_ordering(event: Event) -> None: + """Test that events are ordered by most recent start date first.""" + earlier_event = Event.objects.create(title="Earlier Event", start_date="2023-01-01") + assert list(Event.objects.all()) == [event, earlier_event] diff --git a/tests/main/test_main_views.py b/tests/main/test_main_views.py index 12815bad..29db8776 100644 --- a/tests/main/test_main_views.py +++ b/tests/main/test_main_views.py @@ -443,12 +443,13 @@ class TestEventsPageView(TemplateOkMixin): def _get_url(self): return reverse("events") + @pytest.mark.django_db def test_provides_required_context(self, client): """Test that the events view provides the events context.""" response = client.get(self._get_url()) assert response.status_code == HTTPStatus.OK assert "events" in response.context - assert isinstance(response.context["events"], list) + assert isinstance(response.context["events"], QuerySet) class TestAccountOverviewView(LoginRequiredMixin):