Skip to content

Removed labor meetings from participation history #1685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Karina-Agliullova wants to merge 4 commits into
base: development
Choose a base branch
from
Open

Removed labor meetings from participation history #1685

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a242c2a
Removed labor meetings from participation history and added labor mee…
Karina-Agliullova Feb 26, 2026
6652f86
Removed Reports attendance because Aro already made a pr for it
Karina-Agliullova Feb 27, 2026
82291ae
Fixed comments
Karina-Agliullova Mar 11, 2026
41615f8
Fixed issue with not letting labor meeting into participation history
Karina-Agliullova Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions app/logic/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,16 @@ def getUpcomingEventsForUser(user, asOf=datetime.now(), program=None):

return eventsList

def excludeLaborMeeting():
Copy link
Copy Markdown
Contributor

@BrianRamsay BrianRamsay Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function makes a clause that determines if the event IS a labor meeting, but is called excludeLaborMeeting

eventName = fn.LOWER(Event.name)
eventDescription = fn.LOWER(Event.description)

return (
eventName.contains("labor meeting") |
eventName.contains("celts labor meeting") |
Copy link
Copy Markdown
Contributor

@BrianRamsay BrianRamsay Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

redundant, because this would be caught be the first check.

eventDescription.contains("labor meeting")
Copy link
Copy Markdown
Contributor

@BrianRamsay BrianRamsay Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could potentially catch too much. Let's not check event description.

)

def getParticipatedEventsForUser(user):
"""
Get all the events a user has participated in.
Expand All @@ -373,17 +383,18 @@ def getParticipatedEventsForUser(user):
:return: A list of Event objects
"""

excLaborMeeting = excludeLaborMeeting()
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, ~((Event.isLaborOnly == True) & excLaborMeeting), ~((Event.isTraining == True) & excLaborMeeting))
Copy link
Copy Markdown
Contributor

@BrianRamsay BrianRamsay Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can simplify this by just excluding Labor Meetings. There aren't going to be other labor meetings that we want to put in this list.

.order_by(Event.startDate, Event.name))

allVolunteer = (Event.select(Event, "")
.join(EventParticipant)
.where(Event.isAllVolunteerTraining == True,
EventParticipant.user == user))
EventParticipant.user == user, ~((Event.isLaborOnly == True) & excLaborMeeting), ~((Event.isTraining == True) & excLaborMeeting)))
Copy link
Copy Markdown
Contributor

@BrianRamsay BrianRamsay Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All Volunteer is always All Volunteer, without other qualifiers. If they screw up the data entry, that's on them.

union = participatedEvents.union_all(allVolunteer)
unionParticipationWithVolunteer = list(union.select_from(union.c.id, union.c.programName, union.c.startDate, union.c.name).order_by(union.c.startDate, union.c.name).execute())

Expand Down
1 change: 0 additions & 1 deletion app/logic/volunteerSpreadsheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down