diff --git a/app/logic/events.py b/app/logic/events.py index 05c694719..22dfe2719 100644 --- a/app/logic/events.py +++ b/app/logic/events.py @@ -373,11 +373,14 @@ def getParticipatedEventsForUser(user): :return: A list of Event objects """ + eventName = fn.LOWER(Event.name) + checkIfLaborMeeting = eventName.contains("labor meeting") + participatedEvents = (Event.select(Event, Program.programName) .join(Program, JOIN.LEFT_OUTER).switch() .join(EventParticipant) .where(EventParticipant.user == user, - Event.isAllVolunteerTraining == False, Event.deletionDate == None) + Event.isAllVolunteerTraining == False, Event.deletionDate == None, ~checkIfLaborMeeting) .order_by(Event.startDate, Event.name)) allVolunteer = (Event.select(Event, "") diff --git a/app/logic/volunteerSpreadsheet.py b/app/logic/volunteerSpreadsheet.py index 255cbc97b..8bbada14a 100644 --- a/app/logic/volunteerSpreadsheet.py +++ b/app/logic/volunteerSpreadsheet.py @@ -225,7 +225,6 @@ def calculateRetentionRate(fallDict, springDict): return retentionDict - def makeDataXls(sheetName, sheetData, workbook, sheetDesc=None): # assumes the length of the column titles matches the length of the data (columnTitles, dataTuples) = sheetData