|
6 | 6 |
|
7 | 7 | from django.conf import settings |
8 | 8 | from django.core.management.base import BaseCommand |
9 | | -from mazevo_r25.more_r25 import get_reservations_attrs |
10 | 9 | from uw_mazevo.api import PublicCourses |
11 | 10 | from uw_sws.term import (get_current_term, get_next_term, get_term_after, |
12 | 11 | get_term_by_year_and_quarter) |
13 | 12 | from uw_r25.models import Reservation |
14 | 13 |
|
| 14 | +from mazevo_r25.more_r25 import get_event_list, get_reservations_attrs |
15 | 15 |
|
16 | 16 | logger = logging.getLogger("r25_mazevo") |
17 | 17 |
|
@@ -195,7 +195,7 @@ def handle(self, *args, **options): |
195 | 195 | "meetingTimesDict": {}, |
196 | 196 | } |
197 | 197 | if (reservation.event_notes and |
198 | | - "SAFECAMPUS" in reservation.event_notes): |
| 198 | + "safecampus" in reservation.event_notes.lower()): |
199 | 199 | """ |
200 | 200 | For unlisted meetings, make it show: |
201 | 201 | ----- In use ----- |
@@ -268,6 +268,27 @@ def handle(self, *args, **options): |
268 | 268 | if not int(attrs["page_num"]) < int(attrs["page_count"]): |
269 | 269 | break |
270 | 270 |
|
| 271 | + # search for events in categories we want to be unlisted |
| 272 | + eventlist = get_event_list( |
| 273 | + **reservation_search, category_id="+".join( |
| 274 | + settings.MAZEVO_R25_CATEGORIES_UNLISTED)) |
| 275 | + |
| 276 | + for (event_id, event_name) in eventlist: |
| 277 | + if event_id not in courses: |
| 278 | + continue |
| 279 | + if courses[event_id]["subjectCode"] == "-": |
| 280 | + continue |
| 281 | + |
| 282 | + """ |
| 283 | + For unlisted meetings, make the name be only: |
| 284 | + ----- In use ----- |
| 285 | + Once everything is concatenated together. |
| 286 | + """ |
| 287 | + courses[event_id]["subjectCode"] = "-" |
| 288 | + courses[event_id]["courseNumber"] = "-" |
| 289 | + courses[event_id]["section"] = "-" |
| 290 | + courses[event_id]["courseTitle"] = "In use -----" |
| 291 | + |
271 | 292 | logger.info("Courses to upload: {}".format(len(courses))) |
272 | 293 |
|
273 | 294 | # Merge adjacent weeks with matching schedules |
|
0 commit comments