Merge branch 'development' into import-user-logging-crontab

BCStudentSoftwareDevTeam · Jan 30, 2025 · ddca31a · ddca31a
2 parents 1bca5e1 + 408e281
commit ddca31a
Show file tree

Hide file tree

Showing 38 changed files with 1,198 additions and 906 deletions.
diff --git a/app/controllers/admin/routes.py b/app/controllers/admin/routes.py
diff --git a/app/controllers/admin/volunteers.py b/app/controllers/admin/volunteers.py
@@ -1,5 +1,6 @@
-from flask import request, render_template, redirect, url_for, flash, abort, g, json, jsonify
+from flask import request, render_template, redirect, url_for, flash, abort, g, json, jsonify, session
 from peewee import DoesNotExist, JOIN
+from datetime import datetime
 from playhouse.shortcuts import model_to_dict
 from app.controllers.admin import admin_bp
 from app.models.event import Event
@@ -8,9 +9,9 @@
 from app.models.eventParticipant import EventParticipant
 from app.models.emergencyContact import EmergencyContact
 from app.logic.searchUsers import searchUsers
-from app.logic.volunteers import updateEventParticipants, getEventLengthInHours, addUserBackgroundCheck, setProgramManager
+from app.logic.volunteers import updateEventParticipants, getEventLengthInHours, addUserBackgroundCheck, setProgramManager, deleteUserBackgroundCheck
 from app.logic.participants import trainedParticipants, addPersonToEvent, getParticipationStatusForTrainings, sortParticipantsByStatus
-from app.logic.events import getPreviousRecurringEventData, getEventRsvpCount
+from app.logic.events import getPreviousSeriesEventData, getEventRsvpCount
 from app.models.eventRsvp import EventRsvp
 from app.models.backgroundCheck import BackgroundCheck
 from app.logic.createLogs import createActivityLog, createRsvpLog
@@ -72,7 +73,7 @@ def manageVolunteersPage(eventID):
 
         eventLengthInHours = getEventLengthInHours(event.timeStart, event.timeEnd, event.startDate)
 
-        recurringVolunteers = getPreviousRecurringEventData(event.recurringId)
+        repeatingVolunteers = getPreviousSeriesEventData(event.seriesId)
 
         currentRsvpAmount = getEventRsvpCount(event.id)
 
@@ -83,7 +84,7 @@ def manageVolunteersPage(eventID):
                                 eventWaitlistData = eventWaitlistData,
                                 eventLength = eventLengthInHours,
                                 event = event,
-                                recurringVolunteers = recurringVolunteers,
+                                repeatingVolunteers = repeatingVolunteers,
                                 bannedUsersForProgram = bannedUsersForProgram,
                                 trainedParticipantsForProgramAndTerm = trainedParticipantsForProgramAndTerm,
                                 participationStatusForTrainings = participationStatusForTrainings,
@@ -197,14 +198,16 @@ def addBackgroundCheck():
         type = eventData['bgType']
         dateCompleted = eventData['bgDate']
         addUserBackgroundCheck(user, type, bgStatus, dateCompleted)
-        return " "
+        return ""
 
 @admin_bp.route('/deleteBackgroundCheck', methods = ['POST'])
 def deleteBackgroundCheck():
     if g.current_user.isCeltsAdmin:
-        eventData = request.form
-        bgToDelete = BackgroundCheck.get_by_id(eventData['bgID'])
-        BackgroundCheck.delete().where(BackgroundCheck.id == bgToDelete).execute()
+        backgroundData = request.form
+        bgToDelete = BackgroundCheck.get_by_id(backgroundData['bgID'])
+        session["lastDeletedBgCheck"] = bgToDelete.id
+        user = g.current_user
+        deleteUserBackgroundCheck(bgToDelete.id, user)
         return ""
 
 @admin_bp.route('/updateProgramManager', methods=["POST"])

diff --git a/app/logic/bonner.py b/app/logic/bonner.py
@@ -8,6 +8,7 @@
 from app.models.bonnerCohort import BonnerCohort
 from app.models.eventRsvp import EventRsvp
 from app.models.user import User
+from app.models.eventCohort import EventCohort
 from app.logic.createLogs import createRsvpLog
 
 def makeBonnerXls():
@@ -90,4 +91,4 @@ def addBonnerCohortToRsvpLog(year, event):
                                     .where(BonnerCohort.year == year))
     for bonner in bonnerCohort:
         fullName = bonner.fullName
-        createRsvpLog(eventId=event, content=f"Added {fullName} to RSVP list.")
+        createRsvpLog(eventId=event, content=f"Added {fullName} to RSVP list.") 
diff --git a/app/logic/emailHandler.py b/app/logic/emailHandler.py
@@ -258,7 +258,6 @@ def retrievePlaceholderList(eventId):
             ["Recipient Name", "{recipient_name}"],
             ["Event Name", event.name],
             ["Start Date", (event.startDate).strftime('%m/%d/%Y')],
-            ["End Date", (event.endDate).strftime('%m/%d/%Y')],
             ["Start Time", (event.timeStart).strftime('%I:%M')],
             ["End Time", (event.timeEnd).strftime('%I:%M')],
             ["Location", event.location],
@@ -274,7 +273,6 @@ def replaceStaticPlaceholders(eventId, email_body):
         new_body = email_body.format(event_name=event.name,
                                      location=event.location,
                                      start_date=(event.startDate).strftime('%m/%d/%Y'),
-                                     end_date=(event.endDate).strftime('%m/%d/%Y'),
                                      start_time=(event.timeStart).strftime('%I:%M'),
                                      end_time=(event.timeEnd).strftime('%I:%M'),
                                      event_link="{event_link}",