diff --git a/.gitignore b/.gitignore index 51c16f6f4..95a17d8fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store .idea/ *.pyc venv/ @@ -7,6 +8,7 @@ venv/ *.swo old/ app/static/files/ +extravaganza_qr.png local-override.yml geckodriver.log .coverage diff --git a/app/controllers/main/routes.py b/app/controllers/main/routes.py index 08f32ba7e..8424bd6ce 100644 --- a/app/controllers/main/routes.py +++ b/app/controllers/main/routes.py @@ -666,12 +666,24 @@ def extravaganza(): interests = Interest.select(Interest, Program).join(Program).where(Interest.user == g.current_user) programsInterested = [interest.program for interest in interests] - upcomingAllVolunteers = Event.select().join(Term).where(Event.isAllVolunteerTraining, Term.academicYear == g.current_term.academicYear) + upcomingAllVolunteers = (Event.select() + .join(Term) + .where(Event.isAllVolunteerTraining, + Term.academicYear == g.current_term.academicYear, + Event.deletionDate == None, + Event.isCanceled == False) + ) for training in upcomingAllVolunteers: training.startDate = training.startDate.strftime("%b %d") training.timeStart = training.timeStart.strftime("%I:%M %p") - upcomingTrainings = Event.select().join(Term).where(Event.isTraining, Term.academicYear == g.current_term.academicYear) + upcomingTrainings = (Event.select() + .join(Term) + .where(Event.isTraining, + Term.academicYear == g.current_term.academicYear, + Event.deletionDate == None, + Event.isCanceled == False) + ) for training in upcomingTrainings: training.startDate = training.startDate.strftime("%b %d") diff --git a/app/static/images/extravaganza_qr.png b/app/static/images/extravaganza_qr.png deleted file mode 100644 index 298efc1c7..000000000 Binary files a/app/static/images/extravaganza_qr.png and /dev/null differ