Labor attendance report 1626

app/logic/volunteerSpreadsheet.py

@@ -1,10 +1,12 @@
 from os import major
+from openpyxl import workbook
 import xlsxwriter 
 from peewee import fn, Case, JOIN, SQL, Select
 from collections import defaultdict
 from datetime import date, datetime,time
 from app import app
 from app.models import mainDB
+from app.models.celtsLabor import CeltsLabor
 from app.models.eventParticipant import EventParticipant
 from app.models.user import User
 from app.models.program import Program
@@ -225,6 +227,70 @@ def calculateRetentionRate(fallDict, springDict):
 
     return retentionDict
 
+def laborAttendanceByTerm(term):
+    laborQuery = ( #so that all Celts Labor students appear even if they didn't attend anything 
+        CeltsLabor
+        .select(
+            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')
+        )
+        .join(User)
+        .switch(CeltsLabor)
+        .join(
+            EventParticipant,
+            JOIN.LEFT_OUTER,
+            on=(CeltsLabor.user == EventParticipant.user)
+        )
+        .join(
+            Event,
+            JOIN.LEFT_OUTER,
+            on=(
+                (EventParticipant.event == Event.id) &
+                (Event.term == term) &
+                (Event.isLaborOnly == True) &
+                (Event.deletionDate.is_null()) &
+                (Event.isCanceled == False)
+            )
+        )
+        .group_by(CeltsLabor.user)
+    )
+
+    nonLaborQuery = ( #so that non-labor attendees who are not in CeltsLabor also appear 
+        EventParticipant
+        .select(
+            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')
+        )
+        .join(User)
+        .switch(EventParticipant)
+        .join(
+            Event,
+            on=(
+                (EventParticipant.event == Event.id) &
+                (Event.term == term) &
+                (Event.isLaborOnly == True) &
+                (Event.deletionDate.is_null()) &
+                (Event.isCanceled == False)
+            )
+        )
+        .join(
+            CeltsLabor,
+            JOIN.LEFT_OUTER,
+            on=(EventParticipant.user == CeltsLabor.user)
+        )
+        .where(CeltsLabor.user.is_null())
+        .group_by(EventParticipant.user)
+    )
+
+    query = laborQuery.union(nonLaborQuery).order_by(SQL('fullName'))
+    columns = ("Full Name", "B-Number", "Email", "Meetings Attended")
+
+    return (columns, query.tuples()) 
+
 
 def makeDataXls(sheetName, sheetData, workbook, sheetDesc=None):
     # assumes the length of the column titles matches the length of the data
@@ -271,7 +337,12 @@ 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.")
-
+
+    fallTerm = getFallTerm(academicYear)
+    springTerm = getSpringTerm(academicYear)
+    makeDataXls(f"Labor Attendance {fallTerm.description}", laborAttendanceByTerm(fallTerm), workbook,sheetDesc=f"Number of labor-only events attended in {fallTerm.description} for each labor student and non-labor attendees, including zero attendance (for labor students).")
+    makeDataXls(f"Labor Attendance {springTerm.description}", laborAttendanceByTerm(springTerm), workbook, sheetDesc=f"Number of labor-only events attended in {springTerm.description} for each labor student and non-labor attendees, including zero attendance (for labor students).")
+
     fallTerm = getFallTerm(academicYear)
     springTerm = getSpringTerm(academicYear)
     makeDataXls(fallTerm.description, getAllTermData(fallTerm), workbook, sheetDesc= "All event participation for the term, excluding deleted or canceled events.")

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,16 @@ def test_getUniqueVolunteers(fixture_info):
         ("Test Tester", "testt@berea.edu", "B55555"),
     ])
 
-
-
+@pytest.mark.integration
+def test_laborAttendanceByTerm(fixture_info):
+    EventParticipant.create(event=fixture_info["event2"], user=fixture_info['user1'], hoursEarned=1)
+    EventParticipant.create(event=fixture_info["event2"], user=fixture_info['user2'], hoursEarned=1)
+    EventParticipant.create(event=fixture_info["event1"], user=fixture_info['user3'], hoursEarned=1)
+
+    columns, results = laborAttendanceByTerm("2023-2024-test")
+    assert columns == ("Full Name", "B-Number", "Email", "Term", "Meetings Attended")
+
+    assert len(results) == 3
+    assert ("John Doe", "B774377", "doej@berea.edu", "Fall 2023", 2) in results
+    assert ("Jane Doe", "B888828", "doej2@berea.edu", "Fall 2023", 2) in results
+    assert ("Bob Builder", "B00700932", "builderb@berea.edu", "Fall 2023", 1) in results