Merge pull request #998 from thecourseforum/mvp-enhanced-search

MVP for Enhanced Search

Author: barrettruth

tcf_core/context_processors.py

@@ -4,7 +4,7 @@
 
 from django.conf import settings
 
-from tcf_website.models import Semester
+from tcf_website.models import Discipline, Semester, Subdepartment
 
 
 def base(request):
@@ -41,3 +41,26 @@ def history_cookies(request):
         "previous_path_titles": previous_paths_titles,
         "previous_paths_and_titles": previous_paths_and_titles,
     }
+
+
+def searchbar_context(request):
+    """Provide context for the search bar."""
+    latest_semester = Semester.latest()
+    recent_semesters = Semester.objects.filter(
+        number__gte=latest_semester.number - 50  # 50 = 5 years * 10 semesters
+    ).order_by("-number")
+
+    # Get saved filters from the session (or use defaults)
+    saved_filters = request.session.get("search_filters", {})
+
+    context = {
+        "disciplines": Discipline.objects.all().order_by("name"),
+        "subdepartments": Subdepartment.objects.all().order_by("mnemonic"),
+        "semesters": recent_semesters,
+        "selected_disciplines": saved_filters.get("disciplines", []),
+        "selected_subdepartments": saved_filters.get("subdepartments", []),
+        "selected_weekdays": saved_filters.get("weekdays", []),
+        "from_time": saved_filters.get("from_time", ""),
+        "to_time": saved_filters.get("to_time", ""),
+    }
+    return context

tcf_core/settings/base.py

@@ -70,6 +70,7 @@
                 "social_django.context_processors.login_redirect",
                 "tcf_core.context_processors.base",
                 "tcf_core.context_processors.history_cookies",
+                "tcf_core.context_processors.searchbar_context",
             ],
         },
     },

tcf_website/admin.py

@@ -63,6 +63,38 @@ def get_queryset(self, request):
         return qs
 
 
+class SectionTimeAdmin(admin.ModelAdmin):
+    list_display = ["section", "get_days_display", "start_time", "end_time"]
+    list_filter = ["monday", "tuesday", "wednesday", "thursday", "friday", "start_time", "end_time"]
+    search_fields = [
+        "section__course__subdepartment__mnemonic",
+        "section__course__number",
+        "section__course__title",
+    ]
+    autocomplete_fields = ["section"]
+
+    def get_days_display(self, obj):
+        """Return formatted string of meeting days."""
+        days = []
+        if getattr(obj, "monday", False):
+            days.append("MON")
+        if getattr(obj, "tuesday", False):
+            days.append("TUE")
+        if getattr(obj, "wednesday", False):
+            days.append("WED")
+        if getattr(obj, "thursday", False):
+            days.append("THU")
+        if getattr(obj, "friday", False):
+            days.append("FRI")
+        return ", ".join(days)
+
+    get_days_display.short_description = "Days"
+
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        return qs.select_related("section__course__subdepartment")
+
+
 class CourseGradeAdmin(admin.ModelAdmin):
     ordering = ["course__subdepartment", "course__number", "course__title"]
     search_fields = ["course__subdepartment", "course__number"]
@@ -83,3 +115,4 @@ class CourseInstructorGradeAdmin(admin.ModelAdmin):
 admin.site.register(Semester, SemesterAdmin)
 admin.site.register(CourseGrade, CourseGradeAdmin)
 admin.site.register(CourseInstructorGrade, CourseInstructorGradeAdmin)
+admin.site.register(SectionTime, SectionTimeAdmin)

tcf_website/management/commands/load_semester.py

@@ -1,5 +1,6 @@
 import os
 import re
+from datetime import datetime
 
 import pandas as pd
 from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist
@@ -306,4 +307,41 @@ def load_section(
             else:
                 print(f"Retrieved {section}")
 
+        def parse_section_times(section_times_str):
+            if not section_times_str:
+                return []
+
+            times = []
+            for time_block in section_times_str.split(","):
+                if not time_block.strip():
+                    continue
+                try:
+                    days_part, time_part = time_block.strip().split(" ", 1)
+                    start_time, end_time = time_part.split(" - ")
+
+                    # Create time block with boolean fields
+                    time_data = {
+                        "monday": "Mo" in days_part,
+                        "tuesday": "Tu" in days_part,
+                        "wednesday": "We" in days_part,
+                        "thursday": "Th" in days_part,
+                        "friday": "Fr" in days_part,
+                        "start_time": datetime.strptime(start_time, "%I:%M%p").time(),
+                        "end_time": datetime.strptime(end_time, "%I:%M%p").time(),
+                    }
+                    times.append(time_data)
+
+                except (ValueError, IndexError):
+                    continue
+
+            return times
+
+        # Clear existing section times
+        section.sectiontime_set.all().delete()
+
+        # Create new section times
+        times = parse_section_times(section_times)
+        for time_data in times:
+            SectionTime.objects.create(section=section, **time_data)
+
         return section