+ {% if event.registration_url %}
+
+ Register
+
+ {% endif %}
+ {% if event.external_url %}
+
+ More Info
+
+ {% endif %}
+ {% if not event.registration_url and not event.external_url %}
+
No external links available
+ {% endif %}
+
+
+
+
+
+
+
+
+ {% if event.description %}
+
+
+
Description
+
+
+
+ {{ event.description_text|linebreaks }}
+
+
+
+ {% endif %}
+
+
+{% endblock %}
diff --git a/tcf_website/templatetags/custom_tags.py b/tcf_website/templatetags/custom_tags.py
index 816baf0c7..d24412be3 100644
--- a/tcf_website/templatetags/custom_tags.py
+++ b/tcf_website/templatetags/custom_tags.py
@@ -1,4 +1,6 @@
-""" custom tags to be used in templates """
+"""Custom template tags for the website."""
+
+import hashlib
from django import template
@@ -15,3 +17,58 @@ def get_item(dictionary, key):
def remove_email(value):
"""This filter will remove the professors email from the string"""
return str(value).split("(", maxsplit=1)[0]
+
+
+@register.filter
+def tag_color(tag_name):
+ """Returns a consistent Bootstrap color class for a given tag name"""
+ if not tag_name:
+ return "bg-secondary"
+
+ # Normalize tag name for comparison
+ normalized_tag = tag_name.lower().strip().replace('-', ' ').replace('_', ' ')
+
+ # Special color mappings for common tags
+ special_colors = {
+ "first year": "bg-danger", # Dark red color
+ "second year": "bg-warning", # Orange color
+ "third year": "bg-info",
+ "fourth year": "bg-success",
+ "graduate": "bg-dark",
+ "undergraduate": "bg-secondary",
+ "social": "bg-success",
+ "academic": "bg-info",
+ "professional": "bg-dark",
+ "cultural": "bg-danger",
+ "sports": "bg-primary",
+ "volunteer": "bg-success",
+ "leadership": "bg-warning",
+ "networking": "bg-info",
+ "workshop": "bg-secondary",
+ "seminar": "bg-dark",
+ "meeting": "bg-primary",
+ "event": "bg-success",
+ "fundraiser": "bg-danger",
+ "community": "bg-info",
+ }
+
+ # Check for special mappings first
+ if normalized_tag in special_colors:
+ return special_colors[normalized_tag]
+
+ # Define available Bootstrap color classes for fallback
+ colors = [
+ "bg-primary",
+ "bg-success",
+ "bg-info",
+ "bg-warning",
+ "bg-danger",
+ "bg-dark",
+ "bg-secondary"
+ ]
+
+ # Create a hash of the tag name to get consistent color
+ tag_hash = int(hashlib.md5(normalized_tag.encode()).hexdigest(), 16)
+ color_index = tag_hash % len(colors)
+
+ return colors[color_index]
diff --git a/tcf_website/tests/test_calendar_overview.py b/tcf_website/tests/test_calendar_overview.py
new file mode 100644
index 000000000..5cbe56823
--- /dev/null
+++ b/tcf_website/tests/test_calendar_overview.py
@@ -0,0 +1,51 @@
+"""Tests for calendar overview functionality."""
+
+from unittest.mock import patch
+
+from django.test import TestCase, Client
+
+
+class CalendarOverviewTests(TestCase):
+ """Tests for calendar overview functionality."""
+
+ def setUp(self):
+ self.client = Client()
+
+ def test_calendar_route_ok(self):
+ """Test that the calendar route is reachable."""
+ resp = self.client.get("/clubs/calendar/")
+ self.assertIn(resp.status_code, (200, 302))
+
+ @patch('tcf_website.views.calendar.presence.get_events')
+ def test_events_sorted_by_date(self, mock_get_events):
+ """Test that events are sorted ascending by start date."""
+ # Mock events out of order
+ mock_events = [
+ {
+ "eventName": "Event C",
+ "organizationName": "Org C",
+ "uri": "c",
+ "startDateTimeUtc": "2026-01-03T10:00:00Z",
+ },
+ {
+ "eventName": "Event A",
+ "organizationName": "Org A",
+ "uri": "a",
+ "startDateTimeUtc": "2026-01-01T10:00:00Z",
+ },
+ {
+ "eventName": "Event B",
+ "organizationName": "Org B",
+ "uri": "b",
+ "startDateTimeUtc": "2026-01-02T10:00:00Z",
+ },
+ ]
+ mock_get_events.return_value = mock_events
+
+ resp = self.client.get("/clubs/calendar/")
+ self.assertEqual(resp.status_code, 200)
+
+ # Check context has sorted groups
+ upcoming_groups = resp.context['upcoming_groups']
+ dates = list(upcoming_groups.keys())
+ self.assertEqual(dates, ['2026-01-01', '2026-01-02', '2026-01-03'])
diff --git a/tcf_website/tests/test_event_detail.py b/tcf_website/tests/test_event_detail.py
new file mode 100644
index 000000000..8f4ea0078
--- /dev/null
+++ b/tcf_website/tests/test_event_detail.py
@@ -0,0 +1,30 @@
+"""Tests for event detail functionality."""
+
+from unittest.mock import patch
+
+
+from django.test import TestCase, Client
+
+
+class EventDetailTests(TestCase):
+ """Tests for event detail functionality."""
+
+ def setUp(self):
+ self.client = Client()
+
+
+ @patch('tcf_website.views.calendar.presence.get_event_details')
+ def test_event_detail_not_found_on_exception(self, mock_get_details):
+ """Test that event detail raises 404 on service exception."""
+ mock_get_details.side_effect = Exception("Service error")
+
+ resp = self.client.get("/clubs/calendar/event/test-uri/")
+ self.assertEqual(resp.status_code, 404)
+
+ @patch('tcf_website.views.calendar.presence.get_event_details')
+ def test_event_detail_not_found_on_none(self, mock_get_details):
+ """Test that event detail raises 404 when service returns None."""
+ mock_get_details.return_value = None
+
+ resp = self.client.get("/clubs/calendar/event/test-uri/")
+ self.assertEqual(resp.status_code, 404)
diff --git a/tcf_website/urls.py b/tcf_website/urls.py
index b23ed4578..fda531913 100644
--- a/tcf_website/urls.py
+++ b/tcf_website/urls.py
@@ -123,4 +123,6 @@
path("login/", views.auth.login, name="login"),
path("cognito-callback/", views.auth.cognito_callback, name="cognito_callback"),
path("logout/", views.auth.logout, name="logout"),
+ path("clubs/calendar/", views.calendar_overview, name="calendar_overview"),
+ path("clubs/calendar/event//", views.event_detail, name="event_detail"),
]
diff --git a/tcf_website/views/__init__.py b/tcf_website/views/__init__.py
index f83dec6b5..6bee4f07b 100644
--- a/tcf_website/views/__init__.py
+++ b/tcf_website/views/__init__.py
@@ -40,3 +40,4 @@
view_select_schedules_modal,
)
from .search import search
+from .calendar import calendar_overview, event_detail
diff --git a/tcf_website/views/browse.py b/tcf_website/views/browse.py
index 4aaceacb2..853772e66 100644
--- a/tcf_website/views/browse.py
+++ b/tcf_website/views/browse.py
@@ -65,13 +65,18 @@ def browse(request):
},
)
- clas = School.objects.get(name="College of Arts & Sciences")
- seas = School.objects.get(name="School of Engineering & Applied Science")
-
- excluded_list = [clas.pk, seas.pk]
-
- # Other schools besides CLAS, SEAS, and Misc.
- other_schools = School.objects.exclude(pk__in=excluded_list).order_by("name")
+ # School data may be missing in fresh/empty DB (e.g. local dev without dump)
+ try:
+ clas = School.objects.get(name="College of Arts & Sciences")
+ seas = School.objects.get(name="School of Engineering & Applied Science")
+ excluded_list = [clas.pk, seas.pk]
+ other_schools = School.objects.exclude(pk__in=excluded_list).order_by("name")
+ schools_loaded = True
+ except School.DoesNotExist:
+ clas = None
+ seas = None
+ other_schools = School.objects.none()
+ schools_loaded = False
return render(
request,
@@ -82,6 +87,7 @@ def browse(request):
"CLAS": clas,
"SEAS": seas,
"other_schools": other_schools,
+ "schools_loaded": schools_loaded,
},
)
@@ -106,6 +112,8 @@ def department(request, dept_id: int, course_recency=None):
# Setting up sorting and course age variables
latest_semester = Semester.latest()
+ if latest_semester is None:
+ raise Http404("No semester data loaded. Run migrations and ensure the database has semester data.")
last_five_years = get_object_or_404(Semester, number=latest_semester.number - 50)
# Fetch season and year (either current semester or 5 years previous)
season, year = course_recency.upper().split()
diff --git a/tcf_website/views/calendar.py b/tcf_website/views/calendar.py
new file mode 100644
index 000000000..6553dafbb
--- /dev/null
+++ b/tcf_website/views/calendar.py
@@ -0,0 +1,182 @@
+"""Calendar views for displaying club events."""
+
+from datetime import datetime, timedelta, timezone
+
+from django.conf import settings
+from django.http import Http404
+from django.shortcuts import render
+from django.utils.html import strip_tags
+
+from tcf_website.services import presence
+
+
+def _safe_text(html):
+ """Strip HTML tags from text and remove leading/trailing whitespace."""
+ return strip_tags(html or "").strip()
+
+
+def _sort_key(evt):
+ """Return the sort key for an event based on its start time."""
+ return evt.get("start_utc") or "9999-12-31T23:59:59Z"
+
+
+def _format_datetime(dt_string):
+ """Format UTC datetime string for display"""
+ if not dt_string:
+ return "TBD"
+ try:
+ dt = datetime.fromisoformat(dt_string.replace('Z', '+00:00'))
+ return dt.strftime("%A, %B %d, %Y at %I:%M %p")
+ except (ValueError, AttributeError):
+ return dt_string
+
+
+def _is_upcoming(dt_string):
+ """Check if event is upcoming (today or later)"""
+ if not dt_string:
+ return True # Treat events without dates as upcoming
+
+ try:
+ event_dt = datetime.fromisoformat(dt_string.replace('Z', '+00:00'))
+ today = datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
+ return event_dt.date() >= today.date()
+ except (ValueError, AttributeError):
+ return True
+
+
+def _sample_events_for_dev():
+ """Return sample events for local dev when the Presence API is unavailable."""
+ now = datetime.now(timezone.utc)
+ samples = []
+ for i, (name, org, tags) in enumerate(
+ [
+ ("Sample Club Meetup", "Example Club", ["social", "meetup"]),
+ ("Dev Workshop", "CS Department", ["workshop", "tech"]),
+ ("Coffee & Code", "Engineering Council", ["social", "tech"]),
+ ],
+ 1,
+ ):
+ start = (now + timedelta(days=i)).replace(hour=18, minute=0, second=0, microsecond=0)
+ end = start + timedelta(hours=1)
+ iso = lambda dt: dt.strftime("%Y-%m-%dT%H:%M:%SZ")
+ samples.append(
+ {
+ "name": name,
+ "org": org,
+ "uri": f"sample-event-{i}",
+ "location": "TBD",
+ "start_utc": iso(start),
+ "end_utc": iso(end),
+ "tags": tags,
+ "desc_text": "Sample event for local development. Load real events by using the Presence API in production.",
+ }
+ )
+ return samples
+
+
+def calendar_overview(request):
+ """Display an overview of upcoming and past club events."""
+ raw = presence.get_events()
+ events = []
+ for e in raw or []:
+ events.append(
+ {
+ "name": e.get("eventName"),
+ "org": e.get("organizationName"),
+ "uri": e.get("uri"),
+ "location": e.get("location"),
+ "start_utc": e.get("startDateTimeUtc"),
+ "end_utc": e.get("endDateTimeUtc"),
+ "tags": e.get("tags") or [],
+ "desc_text": _safe_text(e.get("description")),
+ }
+ )
+
+ # Only in dev, when API returns no events (e.g. still 403), show sample data so the calendar UI is visible
+ if settings.DEBUG and not events:
+ events = _sample_events_for_dev()
+
+ events.sort(key=_sort_key)
+
+ # Collect unique tags for filtering
+ all_tags = set()
+ for ev in events:
+ all_tags.update(ev["tags"])
+ unique_tags = sorted(list(all_tags))
+
+ # Separate upcoming and past events
+ upcoming_events = []
+ past_events = []
+
+ for ev in events:
+ if _is_upcoming(ev["start_utc"]):
+ upcoming_events.append(ev)
+ else:
+ past_events.append(ev)
+
+ # Group upcoming events by date
+ upcoming_groups = {}
+ for ev in upcoming_events:
+ dt = ev["start_utc"] or ""
+ date_key = dt[:10] if len(dt) >= 10 else "TBD"
+ upcoming_groups.setdefault(date_key, []).append(ev)
+
+ # Group past events by date
+ past_groups = {}
+ for ev in past_events:
+ dt = ev["start_utc"] or ""
+ date_key = dt[:10] if len(dt) >= 10 else "TBD"
+ past_groups.setdefault(date_key, []).append(ev)
+
+ # Sort groups by date (oldest first)
+ sorted_upcoming = dict(sorted(upcoming_groups.items(),
+ key=lambda x: x[0] if x[0] != "TBD" else "9999-12-31"))
+ sorted_past = dict(sorted(past_groups.items(),
+ key=lambda x: x[0] if x[0] != "TBD" else "9999-12-31"))
+
+ return render(
+ request,
+ "calendar/calendar_overview.html",
+ {
+ "upcoming_groups": sorted_upcoming,
+ "past_groups": sorted_past,
+ "unique_tags": unique_tags,
+ },
+ )
+def event_detail(request, event_uri):
+ """Display detailed information for a specific event"""
+ try:
+ event_data = presence.get_event_details(event_uri)
+ except Exception as exc:
+ raise Http404("Event not found") from exc
+
+ if not event_data:
+ raise Http404("Event not found")
+
+ # Format event data for display
+ event = {
+ "name": event_data.get("eventName", "Untitled Event"),
+ "org": event_data.get("organizationName", "Unknown Organization"),
+ "location": event_data.get("location", "Location TBD"),
+ "start_formatted": _format_datetime(event_data.get("startDateTimeUtc")),
+ "end_formatted": _format_datetime(event_data.get("endDateTimeUtc")),
+ "description": event_data.get("description", ""),
+ "description_text": _safe_text(event_data.get("description", "")),
+ "tags": event_data.get("tags", []),
+ "uri": event_data.get("uri"),
+ "contact_email": event_data.get("contactEmail"),
+ "contact_phone": event_data.get("contactPhone"),
+ "registration_url": event_data.get("registrationUrl"),
+ "external_url": event_data.get("externalUrl"),
+ "capacity": event_data.get("capacity"),
+ "cost": event_data.get("cost"),
+ "event_type": event_data.get("eventType"),
+ }
+
+ return render(
+ request,
+ "calendar/event_detail.html",
+ {
+ "event": event,
+ },
+ )