Labor attendance report 1626

app/logic/volunteerSpreadsheet.py

@@ -225,6 +225,27 @@ def calculateRetentionRate(fallDict, springDict):
 
     return retentionDict
 
+def laborAttendanceByTerm(academicYear):
+    """Get labor students and their meeting attendance count for each term"""
+    base = getBaseQuery(academicYear)
+
+    query = (base.select(
+        fn.CONCAT(User.firstName, ' ', User.lastName).alias('fullName'), 
+        User.bnumber, 
+        fn.CONCAT(EventParticipant.user_id, '@berea.edu').alias('email'),
+        Term.description, 
+        fn.COUNT(EventParticipant.event_id.distinct()).alias('meetingsAttended'), 
+    )
+    .where(Event.isLaborOnly == True)
+    .group_by(EventParticipant.user_id, Term.description)
+    .order_by(User.lastName, User.firstName, Term.description)
+    )
+
+    columns = ("Full Name", "B-Number", "Email", "Term", "Meetings Attended")
+    results = list(query.tuples())
+    return (columns, results)
+
+
 
 def makeDataXls(sheetName, sheetData, workbook, sheetDesc=None):
     # assumes the length of the column titles matches the length of the data
@@ -271,6 +292,7 @@ def createSpreadsheet(academicYear):
     makeDataXls("Unique Volunteers", getUniqueVolunteers(academicYear), workbook, sheetDesc=f"All students who participated in at least one service event during {academicYear}.")
     makeDataXls("Only All Volunteer Training", onlyCompletedAllVolunteer(academicYear), workbook, sheetDesc="Students who participated in an All Volunteer Training, but did not participate in any service events.")
     makeDataXls("Retention Rate By Semester", getRetentionRate(academicYear), workbook, sheetDesc="The percentage of students who participated in service events in the fall semester who also participated in a service event in the spring semester. Does not currently account for fall graduations.")
+    makeDataXls("Labor Attendance By Term", laborAttendanceByTerm(academicYear), workbook, sheetDesc="Labor students and the number of labor meetings attended for each term in the academic year.")
 
     fallTerm = getFallTerm(academicYear)
     springTerm = getSpringTerm(academicYear)

tests/code/test_spreadsheet.py

@@ -32,7 +32,8 @@ def fixture_info():
             startDate=date(2023, 9, 1),
             isCanceled=False,
             deletionDate=None,
-            isService=True
+            isService=True, 
+            isLaborOnly=True
         )
         event2 = Event.create(
             name='Event2',
@@ -41,7 +42,8 @@ def fixture_info():
             startDate=date(2023, 9, 10),
             isCanceled=False,
             deletionDate=None,
-            isService=True
+            isService=True, 
+            isLaborOnly=True
         )
         event3 = Event.create(
             name='Event3',
@@ -683,5 +685,15 @@ def test_getUniqueVolunteers(fixture_info):
         ("Test Tester", "testt@berea.edu", "B55555"),
     ])
 
+@pytest.mark.integration
+def test_laborAttendanceByTerm(fixture_info):
+    EventParticipant.create(event=fixture_info["event1"], user=fixture_info['user1'], hoursEarned=1)
+    EventParticipant.create(event=fixture_info["event2"], user=fixture_info['user1'], hoursEarned=1)
+    EventParticipant.create(event=fixture_info["event1"], user=fixture_info['user2'], hoursEarned=1)
 
+    columns, results = laborAttendanceByTerm("2023-2024-test")
+    assert columns == ("Full Name", "B-Number", "Email", "Term", "Meetings Attended")
 
+    assert len(results) == 2
+    assert ("John Doe", "B774377", "doej@berea.edu", "Fall 2023", 3) in results
+    assert ("Jane Doe", "B888828", "doej2@berea.edu", "Fall 2023", 2) in results