Skip to content

fixed time filter not working when date is empty #1026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 23, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions tcf_website/models/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -666,9 +666,12 @@ def filter_by_time(cls, days=None, start_time=None, end_time=None):
"""Filter courses by available times."""
query = cls.objects.all()

# Get the latest semester
current_semester = Semester.latest()

section_conditions = Q(section__semester=current_semester)

if days:
# Get the latest semester
current_semester = Semester.latest()

# Map day codes to field names
day_map = {
Expand All @@ -680,21 +683,18 @@ def filter_by_time(cls, days=None, start_time=None, end_time=None):
}

# Get unavailable days
unavailable_days = {day_map[d] for d in days if d in day_map} # {monday, wednesday}
unavailable_days = {day_map[d] for d in days if d in day_map}

# Filter for sections that don't meet on unavailable days
section_conditions = Q(section__semester=current_semester)

for day in unavailable_days:
section_conditions &= Q(**{f"section__sectiontime__{day}": False})

if start_time:
section_conditions &= Q(section__sectiontime__start_time__gte=start_time)
if end_time:
section_conditions &= Q(section__sectiontime__end_time__lte=end_time)

query = query.filter(section_conditions)
if start_time:
section_conditions &= Q(section__sectiontime__start_time__gte=start_time)
if end_time:
section_conditions &= Q(section__sectiontime__end_time__lte=end_time)

query = query.filter(section_conditions)
return query.distinct()

class Meta:
Expand Down
Loading