Labor attendance report 1626 by Arohasina · Pull Request #1684 · BCStudentSoftwareDevTeam/celts

Arohasina · 2026-02-25T22:53:02Z

Issue Description

Fixes #1626

We should have a sheet in the Reports downloads that shows labor attendance for the academic year. The report should have a list of labor students and the number of labor meetings that they attended for each term in the academic year.

Changes

Implemented laborAttendanceByTerm(term) function to query labor students and count their meeting attendance by term
Added "Labor Attendance By Term" sheet to the spreadsheet generation in createSpreadsheet() , there are two sheets: one for Fall term and one for Spring term
added the test function test_laborAttendanceByTerm in test_spreadsheet.py

This is how the spreadsheet looks like:

Testing

run database/reset_database.sh test and then tests/run_tests.sh or if you want to test the laborAttendanceByTerm function specifically, you can run pytest tests/code/test_spreadsheet.py::test_laborAttendanceByTerm -v
after it passed, run database/reset_database.sh from-backup and then flask run
Once you are in the Celts app, go to event list choose Fall 2024, and then choose a couple of events there, such as these events

And for each, click on the event, turn on the toggle "This event is for labor only" , and then click "save"

-And then do the same for Spring 2025.

Then go to admin --> report --> select academic year 2024 - 2025 --> download the spreadsheet, open it, and you should see a sheet called "Labor Attendance By Term" with the reporting, one for Fall and one for Spring term.

Copilot

Pull request overview

This pull request implements a labor attendance report feature that tracks labor student participation in labor-only meetings across terms within an academic year. The implementation adds a new sheet to the downloadable reports spreadsheet showing each labor student's meeting attendance count per term.

Changes:

Added laborAttendanceByTerm() function to query and aggregate labor meeting attendance by student and term
Integrated the new "Labor Attendance By Term" sheet into the spreadsheet generation workflow
Added comprehensive integration test coverage for the new functionality

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.

File	Description
app/logic/volunteerSpreadsheet.py	Implements laborAttendanceByTerm function (lines 228-249) to query labor students and count their meeting attendance, and integrates it into createSpreadsheet (line 298)
tests/code/test_spreadsheet.py	Adds test_laborAttendanceByTerm integration test (lines 686-724) covering empty results and attendance counting scenarios

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/logic/volunteerSpreadsheet.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/logic/volunteerSpreadsheet.py

tests/code/test_spreadsheet.py

…Team/celts into Labor_Attendance_report_1626

…ftwareDevTeam/celts into Labor_Attendance_report_1626

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

tests/code/test_spreadsheet.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

tests/code/test_spreadsheet.py

…tendees

…ank term/duplicate row bugs

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 10 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/logic/volunteerSpreadsheet.py

tests/code/test_spreadsheet.py

app/logic/volunteerSpreadsheet.py

tests/code/test_spreadsheet.py

…ount error

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

github-actions · 2026-03-26T20:07:16Z

View Code Coverage

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-26T20:08:21Z

app/logic/volunteerSpreadsheet.py

+            fn.CONCAT(User.firstName, ' ', User.lastName).alias('fullName'),
+            User.bnumber,
+            fn.CONCAT(User.username, '@berea.edu').alias('email'),
+            fn.COUNT(EventParticipant.event_id).alias('meetingsAttended')


nonLaborQuery counts EventParticipant.event_id without DISTINCT, while laborQuery counts distinct Event.id. Since EventParticipant has no uniqueness constraint on (user,event), duplicate participant rows would inflate the meeting count for non-labor attendees. Use a distinct count here as well (e.g., count distinct event id) so "Meetings Attended" consistently reflects unique meetings.

Suggested change

fn.COUNT(EventParticipant.event_id).alias('meetingsAttended')

fn.COUNT(fn.DISTINCT(EventParticipant.event_id)).alias('meetingsAttended')

Copilot · 2026-03-26T20:08:22Z

app/logic/volunteerSpreadsheet.py

+        .where(
+            (CeltsLabor.term == term)
+        )
+        .group_by(CeltsLabor.user)
+    )


This query selects non-aggregated columns (full name, bnumber, email) but only groups by CeltsLabor.user. This relies on MySQL's non-standard GROUP BY behavior and will break if ONLY_FULL_GROUP_BY is enabled, and it also reduces portability/clarity. Include the non-aggregated selected columns (or the underlying User fields) in the GROUP BY to make the aggregation deterministic and SQL-standard.

Copilot · 2026-03-26T20:08:22Z

app/logic/volunteerSpreadsheet.py

+                (CeltsLabor.term == term) 
+        )
+        .where(CeltsLabor.user.is_null())
+        .group_by(EventParticipant.user)


This query selects non-aggregated columns (full name, bnumber, email) but only groups by EventParticipant.user. As written, it depends on MySQL's permissive GROUP BY behavior and can fail under ONLY_FULL_GROUP_BY. Group by the non-aggregated selected columns (or the underlying User fields) so the aggregation is deterministic and compatible with stricter SQL modes.

Suggested change

.group_by(EventParticipant.user)

.group_by(

User.firstName,

User.lastName,

User.bnumber,

User.username,

)

app/logic/volunteerSpreadsheet.py

Arohasina added 3 commits February 25, 2026 16:05

added the function laborAttendanceByTerm

5905549

added test function test_laborAttendanceByTerm

97fe183

added laborAttendanceByTerm to the spreadsheet

4c89d93

Copilot AI review requested due to automatic review settings February 25, 2026 22:53

Copilot started reviewing on behalf of Arohasina February 25, 2026 22:53 View session

Copilot AI reviewed Feb 25, 2026

View reviewed changes

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

JohnCox2211 assigned Arohasina Feb 26, 2026

JohnCox2211 self-requested a review February 26, 2026 19:59

ojmakinde self-requested a review February 26, 2026 20:06

removed print statements

be0b9af

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings February 26, 2026 20:27

removed commented code

eeb4674

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot started reviewing on behalf of Arohasina February 26, 2026 20:28 View session

Arohasina and others added 2 commits February 26, 2026 15:28

Update app/logic/volunteerSpreadsheet.py

07e2ded

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update app/logic/volunteerSpreadsheet.py

ee86729

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI reviewed Feb 26, 2026

View reviewed changes

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

app/logic/volunteerSpreadsheet.py Outdated Show resolved Hide resolved

tests/code/test_spreadsheet.py Outdated Show resolved Hide resolved

JohnCox2211 and others added 3 commits February 26, 2026 15:31

Merge branch 'development' of https://github.com/BCStudentSoftwareDev…

c9119da

…Team/celts into Labor_Attendance_report_1626

removed redundant event and reused existing ones

6209cba

Merge branch 'Labor_Attendance_report_1626' of github.com:BCStudentSo…

d68bda6

…ftwareDevTeam/celts into Labor_Attendance_report_1626

Copilot AI review requested due to automatic review settings February 26, 2026 20:37

Copilot started reviewing on behalf of Arohasina February 26, 2026 20:37 View session

Copilot AI reviewed Feb 26, 2026

View reviewed changes

added distinct

4a863e3

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings February 26, 2026 20:55

Copilot started reviewing on behalf of Arohasina February 26, 2026 20:56 View session

Copilot AI reviewed Feb 26, 2026

View reviewed changes

MImran2002 reviewed Mar 8, 2026

View reviewed changes

tests/code/test_spreadsheet.py Outdated Show resolved Hide resolved

Arohasina added 3 commits March 10, 2026 14:46

Merge remote-tracking branch 'origin' into Labor_Attendance_report_1626

7652303

include all labor students even with zero attendance and non-labor at…

d37e2ae

…tendees

added the return

7936d62

Arohasina added 4 commits March 18, 2026 14:50

Merge remote-tracking branch 'origin' into Labor_Attendance_report_1626

86fd8c6

switched FULL JOIN to Union to fix SQL syntax bug

4354374

Merge remote-tracking branch 'origin' into Labor_Attendance_report_1626

85cedd3

Split labor attendance report into separate sheets by term and fix bl…

240e802

…ank term/duplicate row bugs

Copilot AI review requested due to automatic review settings March 24, 2026 19:20

Copilot started reviewing on behalf of Arohasina March 24, 2026 19:20 View session

Copilot AI reviewed Mar 24, 2026

View reviewed changes

Arohasina and others added 2 commits March 24, 2026 15:46

for laborQuery changed EventParticipant.event_id to Event.id to fix c…

5cd4859

…ount error

removed redundant

ef2e93d

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings March 25, 2026 20:42

Copilot started reviewing on behalf of Arohasina March 25, 2026 20:43 View session

Copilot AI reviewed Mar 25, 2026

View reviewed changes

Arohasina added 2 commits March 26, 2026 16:03

fix filter term

80081a2

fix test

f9749ff

Copilot AI review requested due to automatic review settings March 26, 2026 20:04

Copilot started reviewing on behalf of Arohasina March 26, 2026 20:05 View session

Copilot AI reviewed Mar 26, 2026

View reviewed changes

	fn.COUNT(EventParticipant.event_id).alias('meetingsAttended')
	fn.COUNT(fn.DISTINCT(EventParticipant.event_id)).alias('meetingsAttended')

Conversation

Arohasina commented Feb 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Issue Description

Changes

Testing

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

github-actions bot commented Mar 26, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Arohasina commented Feb 25, 2026 •

edited

Loading