Show lecture attendance for fall lectures

It's unclear if the fall lecture series will continue into the future,
but so long as it *does* exist, it can be helpful to show which people
have been recorded as having completed lectures for the *next* winter
school year.

Author: DavidCain

ws/models.py

@@ -491,7 +491,14 @@ def from_user(
             return None
 
     def attended_lectures(self, year: int) -> bool:
-        return self.lectureattendance_set.filter(year=year).exists()
+        # Special case: in 2024 and 2025 (and *maybe* into the future?),
+        # we ran special lectures in November and December for next year's winter.
+        return any(
+            attendance.year >= year
+            for attendance in
+            # Use `.all()` to make prefetching work
+            self.lectureattendance_set.all()
+        )
 
     def missed_lectures(self, year: int) -> bool:
         """Whether the participant missed WS lectures in the given year."""
@@ -547,7 +554,7 @@ def _cannot_attend_because_missed_lectures(self, trip: "Trip") -> bool:
         the current year's lectures in any UI that surfaces that information).
         """
         if not self.missed_lectures_for(trip):
-            return False  # Attended this year
+            return False  # Attended this year *or* it's just not a winter trip.
 
         # For Winter School leaders, we have a carve-out if you've attended lectures recently
         if not self.can_lead(enums.Program.WINTER_SCHOOL):

ws/templates/for_templatetags/lecture_attendance.html

@@ -9,7 +9,7 @@ <h3>Lecture Attendance</h3>
     {% else %}
       {{ participant.name }} has
     {% endif %}
-    attended this year's lectures!
+    attended WS {{ lecture_year }} lectures!
   </p>
 {% elif can_set_attendance %}  {# User (or chair) can mark attendance. #}
   <form method="post" action="{% url 'lecture_attendance' %}">
@@ -30,8 +30,8 @@ <h3>Lecture Attendance</h3>
           {% if past_attendance %}
             <p>
             Past years' attendance:
-            {% for record in past_attendance %}
-              <span class="label label-success"><i class="fas fa-fw fa-check"></i><span>{{ record.year }}</span></span>
+            {% for year in past_attendance %}
+              <span class="label label-success"><i class="fas fa-fw fa-check"></i><span>{{ year }}</span></span>
             {% endfor %}
             </p>
           {% endif %}
@@ -64,8 +64,8 @@ <h3>Lecture Attendance</h3>
   {% if past_attendance %}
     <p>
     Past years' attendance:
-    {% for record in past_attendance %}
-      <span class="label label-success"><i class="fas fa-fw fa-check"></i>{{ record.year }}</span>
+    {% for year in past_attendance %}
+      <span class="label label-success"><i class="fas fa-fw fa-check"></i>{{ year }}</span>
     {% endfor %}
     </p>
   {% endif %}

ws/templatetags/ws_tags.py

@@ -23,15 +23,19 @@ def lecture_attendance(
      - The activity chair marks them manually as having attended
      - The user marks themselves during the allowed window
     """
-    attendance = participant.lectureattendance_set
+    years = sorted(
+        attendance.year for attendance in participant.lectureattendance_set.all()
+    )
+    max_year = years[-1] if years else None
     this_year = ws_year()
     form = AttendedLecturesForm(initial={"participant": participant})
     form.fields["participant"].widget = HiddenInput()  # Will be checked by view
     return {
         "form": form,
         "participant": participant,
         "user_viewing": user_viewing,
-        "attended_lectures": attendance.filter(year=this_year).exists(),
-        "past_attendance": attendance.exclude(year=this_year),
+        "attended_lectures": max_year and max_year >= this_year,
+        "lecture_year": max_year,
+        "past_attendance": [year for year in years if year < this_year],
         "can_set_attendance": can_set_attendance,
     }

ws/tests/templatetags/test_ws_tags.py

@@ -110,6 +110,23 @@ def test_leader_viewing_other_participant_has_attended(self):
         self.assertTrue(soup.find(string="Attended", class_="label-success"))
         self.assertFalse(soup.find("form"))
 
+    @freeze_time("Nov 28 2025 20:30:00 EST")
+    def test_next_year_lectures_recorded(self) -> None:
+        participant = factories.ParticipantFactory.create()
+        factories.LectureAttendanceFactory.create(participant=participant, year=2026)
+        html_template = Template(
+            "{% load ws_tags %}{% lecture_attendance par user_viewing can_set %}"
+        )
+        context = Context({"par": participant, "user_viewing": False, "can_set": False})
+        soup = BeautifulSoup(html_template.render(context), "html.parser")
+
+        paragraph = soup.find("p")
+        assert paragraph is not None
+        self.assertEqual(
+            strip_whitespace(paragraph.text),
+            "Attended Test Participant has attended WS 2026 lectures!",
+        )
+
     @freeze_time("Jan 12 2019 20:30:00 EST")
     def test_self_has_attended(self):
         """We affirm that participants have attended lectures during the first week!"""
@@ -125,7 +142,7 @@ def test_self_has_attended(self):
         paragraph = BeautifulSoup(html, "html.parser").find("p")
         self.assertEqual(
             strip_whitespace(paragraph.text),
-            "Attended You have attended this year's lectures!",
+            "Attended You have attended WS 2019 lectures!",
         )
 
         # We tell the participant they've attended (whether or not the form is open)

ws/tests/views/test_participant.py

@@ -91,7 +91,7 @@ def test_success_is_shown_in_week_one(self):
         attendance = soup.find("h3", string="Lecture Attendance")
         self.assertEqual(
             strip_whitespace(attendance.find_next("p").text),
-            "Attended You have attended this year's lectures!",
+            "Attended You have attended WS 2022 lectures!",
         )
 
     def test_warn_if_missing_after_lectures(self):
@@ -118,7 +118,7 @@ def test_warn_if_missing_after_lectures(self):
         attendance = soup.find("h3", string="Lecture Attendance")
         self.assertEqual(
             strip_whitespace(attendance.find_next("p").text),
-            "Attended You have attended this year's lectures!",
+            "Attended You have attended WS 2022 lectures!",
         )
 
     def test_attendance_not_shown_in_week_two(self):

ws/views/participant.py

@@ -316,7 +316,7 @@ def get_queryset(self) -> QuerySet[models.Participant]:
             "emergency_info__emergency_contact",
             "car",
             "lotteryinfo",
-        )
+        ).prefetch_related("lectureattendance_set")
 
     def get_trips(self) -> GroupedTrips:
         participant = self.object or self.get_object()
@@ -399,6 +399,50 @@ def count(
 
         return stats
 
+    def _show_lecture_attendance(
+        self,
+        participant: models.Participant,
+        *,
+        attendance_years: set[int],
+        user_viewing: bool,
+        can_set_attendance: bool,
+    ) -> bool:
+        """Determine if we should render whether or not the participant attended lectures.
+
+        This is surprisingly complicated.
+
+        There are a few times of year where it's important to show "yes, you attended"
+        1. The enrollment period where participants can record attendance (2nd lecture)
+        2. The first week of WS, after lectures but before weekend trips
+           (this is when participants may not have recorded attendance correctly)
+           In later weeks, we'll enforce lecture attendance as part of trip signup.
+        3. The participant was recorded *early* as having attended a year's lecture
+           (applicable in 2024 and 2025, when special fall lectures were held)
+        """
+        if not date_utils.is_currently_iap():
+            # Outside of WS, there's only one time it's relevant to show attendance.
+            # That's in the fall, when we've supported recording *next* year's attendance.
+            # (we did this in 2024 and 2025, and may or may not do it going forward)
+            current_year = date_utils.local_now().year
+            return any(year > current_year for year in attendance_years)
+
+        show_attendance = can_set_attendance or date_utils.ws_lectures_complete()
+
+        # We don't need to tell participants "You attended lectures!" later in WS.
+        # This is because signup rules enforce lecture attendance *after* week 1.
+        if (
+            show_attendance
+            and user_viewing
+            and models.Trip.objects.filter(
+                program=enums.Program.WINTER_SCHOOL.value,
+                trip_date__gte=date_utils.jan_1(),
+                trip_date__lt=date_utils.local_date(),
+            )
+        ):
+            return False
+
+        return show_attendance
+
     def _lecture_info(
         self,
         participant: models.Participant,
@@ -407,33 +451,20 @@ def _lecture_info(
         """Describe the participant's lecture attendance, if applicable."""
         can_set_attendance = self.can_set_attendance(participant)
 
-        # There are only *two* times of year where it's important to show "yes, you attended"
-        # 1. The enrollment period where participants can record attendance (2nd lecture)
-        # 2. The first week of WS, after lectures but before weekend trips
-        #    (this is when participants may not have recorded attendance correctly)
-        #    In later weeks, we'll enforce lecture attendance as part of trip signup.
-        show_attendance = date_utils.is_currently_iap() and (
-            can_set_attendance or date_utils.ws_lectures_complete()
+        attendance_years = {
+            attendance.year for attendance in participant.lectureattendance_set.all()
+        }
+        show_attendance = self._show_lecture_attendance(
+            participant,
+            user_viewing=user_viewing,
+            attendance_years=attendance_years,
+            can_set_attendance=can_set_attendance,
         )
 
-        if show_attendance:
-            attended_lectures = participant.attended_lectures(date_utils.ws_year())
-
-            # We don't need to tell participants "You attended lectures!" later in WS.
-            # This is because signup rules enforce lecture attendance *after* week 1.
-            if user_viewing and models.Trip.objects.filter(
-                program=enums.Program.WINTER_SCHOOL.value,
-                trip_date__gte=date_utils.jan_1(),
-                trip_date__lt=date_utils.local_date(),
-            ):
-                show_attendance = False
-        else:  # Skip unnecessary db queries
-            attended_lectures = False  # Maybe they actually did, but we're not showing.
-
         return {
             "can_set_attendance": can_set_attendance,
             "show_attendance": show_attendance,
-            "attended_lectures": attended_lectures,
+            "attended_lectures": participant.attended_lectures(date_utils.ws_year()),
         }
 
     def get_context_data(self, **kwargs: Any) -> dict[str, Any]: