Skip to content

Reports #1623

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

Closed
bakobagassas wants to merge 3 commits into from
Closed

Reports #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b5be4e
Put the isService condition (still need to test if it works, might ha…
bakobagassas Sep 4, 2025
fccf320
Finished the issue
bakobagassas Sep 5, 2025
264a533
Done solving the issue with the test failing
bakobagassas Sep 5, 2025
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
18 changes: 9 additions & 9 deletions app/logic/volunteerSpreadsheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def getUniqueVolunteers(academicYear):
.join(User).switch(EventParticipant)
.join(Event)
.join(Term)
.where(Term.academicYear == academicYear)
.where((Term.academicYear == academicYear) & (Event.isService == True))
.order_by(EventParticipant.user_id))

return uniqueVolunteers.tuples()
Expand All @@ -38,7 +38,7 @@ def totalVolunteerHours(academicYear):
query = (EventParticipant.select(fn.SUM(EventParticipant.hoursEarned))
.join(Event, on=(EventParticipant.event == Event.id))
.join(Term, on=(Event.term == Term.id))
.where(Term.academicYear == academicYear)
.where((Term.academicYear == academicYear) & (Event.isService == True))
)

return query.tuples()
Expand All @@ -49,7 +49,7 @@ def volunteerProgramHours(academicYear):
.join(Event, on=(EventParticipant.event_id == Event.id))
.join(Program, on=(Event.program_id == Program.id))
.join(Term, on=(Event.term == Term.id))
.where(Term.academicYear == academicYear)
.where((Term.academicYear == academicYear) & (Event.isService == True))
.group_by(Program.programName, EventParticipant.user_id))

return volunteerProgramHours.tuples()
Expand All @@ -59,13 +59,13 @@ def onlyCompletedAllVolunteer(academicYear):
subQuery = (EventParticipant.select(EventParticipant.user_id)
.join(Event)
.join(Term)
.where(Event.name != "All Volunteer Training", Term.academicYear == academicYear))
.where((Event.name != "All Volunteer Training") & (Term.academicYear == academicYear) & (Event.isService == True)))

onlyAllVolunteer = (EventParticipant.select(EventParticipant.user_id, fn.CONCAT(User.firstName, " ", User.lastName))
.join(User).switch(EventParticipant)
.join(Event)
.join(Term)
.where(Event.name == "All Volunteer Training", Term.academicYear == academicYear, EventParticipant.user_id.not_in(subQuery)))
.where((Event.name == "All Volunteer Training") & (Term.academicYear == academicYear) & (Event.isService == True) & (EventParticipant.user_id.not_in(subQuery))))

return onlyAllVolunteer.tuples()

Expand All @@ -75,7 +75,7 @@ def volunteerHoursByProgram(academicYear):
.join(Event)
.join(EventParticipant, on=(Event.id == EventParticipant.event_id))
.join(Term, on=(Term.id == Event.term))
.where(Term.academicYear == academicYear)
.where((Term.academicYear == academicYear) & (Event.isService == True))
.group_by(Program.programName)
.order_by(Program.programName))

Expand All @@ -87,7 +87,7 @@ def volunteerMajorAndClass(academicYear, column, reorderClassLevel=False):
.join(EventParticipant, on=(User.username == EventParticipant.user_id))
.join(Event, on=(EventParticipant.event_id == Event.id))
.join(Term, on=(Event.term == Term.id))
.where(Term.academicYear == academicYear)
.where((Term.academicYear == academicYear) & (Event.isService == True))
.group_by(column))

if reorderClassLevel:
Expand All @@ -113,7 +113,7 @@ def repeatVolunteersPerProgram(academicYear):
.join(Program, on=(Event.program == Program.id))
.join(User, on=(User.username == EventParticipant.user_id))
.join(Term, on=(Event.term == Term.id))
.where(Term.academicYear == academicYear)
.where((Term.academicYear == academicYear) & (Event.isService == True))
.group_by(User.firstName, User.lastName, Event.program)
.having(fn.COUNT(EventParticipant.event_id) > 1)
.order_by(Event.program, User.lastName))
Expand All @@ -126,7 +126,7 @@ def repeatVolunteers(academicYear):
.join(User, on=(User.username == EventParticipant.user_id))
.join(Event, on=(EventParticipant.event == Event.id))
.join(Term, on=(Event.term == Term.id))
.where(Term.academicYear == academicYear)
.where((Term.academicYear == academicYear) & (Event.isService == True))
.group_by(User.firstName, User.lastName)
.having(fn.COUNT(EventParticipant.user_id) > 1))

Expand Down
32 changes: 16 additions & 16 deletions tests/code/test_spreadsheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ def fixture_info():
program3 = Program.create(id=503, programName='Program3')
program4 = Program.create(id=504, programName='Program4')

event1 = Event.create(id=501, name='Event1', term=term1, program=program1)
event2 = Event.create(id=502, name='Event2', term=term1, program=program2)
event3 = Event.create(id=503, name='Event3', term=term1, program=program3)
event4 = Event.create(id=504, name='Event4', term=term2, program=program4)
event1 = Event.create(id=501, name='Event1', term=term1, program=program1, isService=True)
event2 = Event.create(id=502, name='Event2', term=term1, program=program2, isService=True)
event3 = Event.create(id=503, name='Event3', term=term1, program=program3, isService=True)
event4 = Event.create(id=504, name='Event4', term=term2, program=program4, isService=True)

eventparticipant1 = EventParticipant.create(event=event1, user=user1, hoursEarned=5)
eventparticipant2 = EventParticipant.create(event=event1, user=user2, hoursEarned=3)
Expand Down Expand Up @@ -138,7 +138,7 @@ def test_repeatVolunteers(fixture_info):
#repeat volunteers people who participated in more than one event
testEvent = Event.create(name="Test Event",
term=fixture_info["term1"],
program=fixture_info['program1'])
program=fixture_info['program1'], isService=True)
EventParticipant.create(user='doej',
event=testEvent,
hoursEarned=1)
Expand All @@ -148,16 +148,16 @@ def test_repeatVolunteers(fixture_info):

testEvent2 = Event.create(name="Spring2021Event",
term=fixture_info["term1"],
program=fixture_info['program1'])
EventParticipant.create(user = 'doej', event = testEvent2, hoursEarned=0)
program=fixture_info['program1'], isService=True)

EventParticipant.create(user='doej', event=testEvent2, hoursEarned=0)

# Check for separate events
assert sorted(list(repeatVolunteers("2023-2024"))) == [('John Doe', 3)]

testEvent2 = Event.create(name="Spring2021Event",
term=fixture_info["term1"],
program=fixture_info['program2'])
program=fixture_info['program2'], isService=True)
EventParticipant.create(user='doej',
event=testEvent2,
hoursEarned=1)
Expand All @@ -172,7 +172,7 @@ def test_repeatVolunteersPerProgram(fixture_info):

testEvent3 = Event.create(name="Test Event",
term=fixture_info['term1'],
program=fixture_info['program1'])
program=fixture_info['program1'], isService=True)
EventParticipant.create(user='doej',
event=testEvent3,
hoursEarned=1)
Expand All @@ -182,7 +182,7 @@ def test_repeatVolunteersPerProgram(fixture_info):

testEvent4 = Event.create(name="Test Event 2",
term=fixture_info['term1'],
program=fixture_info['program1'])
program=fixture_info['program1'], isService=True)
EventParticipant2 = EventParticipant.create(user='doej',
event=testEvent4,
hoursEarned=1)
Expand Down Expand Up @@ -240,7 +240,7 @@ def test_onlyCompletedAllVolunteer(fixture_info):
term=fixture_info['term1'],
program=fixture_info['program1'],
isTraining=1,
isAllVolunteerTraining=1)
isAllVolunteerTraining=1, isService=True)
EventParticipant.create(user = 'builderb', # Not participated in event
event = allVolunteerEvent, # Added to all volunteer training event
hoursEarned = 1)
Expand All @@ -250,7 +250,7 @@ def test_onlyCompletedAllVolunteer(fixture_info):

testEvent = Event.create(name="Test Event",
program=fixture_info['program1'],
term=fixture_info['term1'])
term=fixture_info['term1'], isService=True)
EventParticipant.create(user = 'builderb', # Only participated in all volunteer event
event = testEvent,
hoursEarned = 1)
Expand All @@ -273,7 +273,7 @@ def test_volunteerProgramHours(fixture_info):

testEvent = Event.create(name="Test Event",
program=fixture_info['program1'],
term=fixture_info['term1'])
term=fixture_info['term1'], isService=True)
EventParticipant.create(user = 'doej',
event = testEvent,
hoursEarned = 2)
Expand Down Expand Up @@ -366,7 +366,7 @@ def test_getUniqueVolunteers(fixture_info):
User.create(username="testt", firstName="Test", lastName="Tester", bnumber="B55555")
testEvent = Event.create(name="Test Event",
term = fixture_info['term1'],
program = fixture_info['program1'])
program = fixture_info['program1'], isService=True)
EventParticipant.create(user = 'testt',
event = testEvent,
hoursEarned = 1)
Expand Down