From 5ac9440357188310c9169c8089f032055da24653 Mon Sep 17 00:00:00 2001
From: Brian Ramsay <ramsayb2@berea.edu>
Date: Tue, 25 Aug 2026 10:24:59 -0400
Subject: [PATCH] Don't show deleted or canceled events on the volunteer
 extravaganza page

---
 .gitignore                            |   2 ++
 app/controllers/main/routes.py        |  16 ++++++++++++++--
 app/static/images/extravaganza_qr.png | Bin 795 -> 0 bytes
 3 files changed, 16 insertions(+), 2 deletions(-)
 delete mode 100644 app/static/images/extravaganza_qr.png

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 298efc1c7fb48d0473e061ee7b27eb52e081d3b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 795
zcmV+$1LXXPP)<h;3K|Lk000e1NJLTq00D9U00D9V00000z+Y^n0008wNkl<Zc%1E8
zQHtX*43*@-ekQO7=uw;-?2(2&(%c|9N)ND*d=^}^NU=L<7VMPWW}8Nj!KKloh-f4~
z$wr1p(9=V70ORLD1^W`l&w~o~C5)d373@nGKMyL{moWYj-Va7p0DS|1?N|Z8h^Whi
zc0+&GgC5`>nD1FIK#FP|09$aZi(*@UR)f}456Q3M=hy)FPl@#KJ?K~NPXQQ400eMh
zBY(*F&wW4r>4MOonDOH*nf$MRzW^!`7BK$0{GGuu`T-<$UCP=o*!#?bUX))mb0<pc
z<E$aSBDVEqQdP_xUfut-pkwlTmB`KQ@%WA7B9Rts>(6S?dg>whz)Przu2aJLdt>)%
z{*&?ZU~PUp2jC7IYiOAVC(k&2wfMeA{s!rfQvP}kyeKWrY0YHI-(AKRz6!GFXH{C<
z-7;C#m(}N8^IeJ{TxEVG{qG=yOBr%>V<qFPP5oI3T1z~1|I7W4IHp2BG=Tn$z<o0?
z`cDLg`j_eFeb;ADL8ZIyO*#*{>zcmWe|)*CRZGcUt0G#<^`J|XR;I6Z9ACKYzp3Gs
zUANZ2hnbu<{k+@r!3*jTD-Nt0P2wv~{ZW@R^~?Id8g$h99A*vC6iYwJ>AS?X{&$!0
zg-J`L(8gVNn76(b-#zz7Ab)b8pWp)YjRWxAwF2L5<_{VF8TYSRoodLfD`|-IXmGOk
zdM8Vkzxn<3pa-}D;}^j9h@G%bojF!zEz(w>clrNT>6)ffF2s9uH3LE|yYQ&jv8rTv
zHUG)@58a={c0}Y(7Z9X_2b({?hkoWoX}&+?xBh77eAG)ieRD<r*=VQaSoM|V?_0!|
zr%Ci#0y<VvNl$0~|HYpYsK_`rzlxu=l;Tlp@fqc&y9+nX#d;^&^wqx47ZmA`P~p@3
zYIaCy`|n=oR}mb~2Nhv5%%8oQ|783uC~y7)#?ONa_9cv;2Nmo~7(Wjx*q1PV9?yP1
ZzX3OB2n<t0W4HhS002ovPDHLkV1lZmkb(dJ