Production Release

.github/workflows/actionTests.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12","3.13"]
 
     # each step can define `env` vars, but it's easiest to define them on the build level
     env:

app/__init__.py

@@ -7,6 +7,7 @@
 
 # Initialize our application
 app = Flask(__name__, template_folder="templates")
+app.jinja_env.add_extension('jinja2.ext.loopcontrols')
 
 app.env = os.environ.get('APP_ENV', 'production')
 load_config_files(app)

app/controllers/__init__.py

@@ -2,12 +2,11 @@
 import os
 #from app.login_manager import require_login
 
-
 #@app.context_processor
 #def injectGlobalData():
     #currentUser = require_login()
     #lastStaticUpdate = str(max(os.path.getmtime(os.path.join(root_path, f))
     #              for root_path, dirs, files in os.walk('app/static')
     #               for f in files))
     #return {'currentUser': currentUser,
-    #        'lastStaticUpdate': lastStaticUpdate}
+    #        'lastStaticUpdate': lastStaticUpdate}

app/controllers/admin/routes.py

@@ -71,20 +71,18 @@ def switchUser():
 
 @admin_bp.route('/eventTemplates')
 def templateSelect():
-    if g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentStaff:
-        allprograms = getAllowedPrograms(g.current_user)
-        visibleTemplates = getAllowedTemplates(g.current_user)
-        return render_template("/events/templateSelector.html",
-                                programs=allprograms,
-                                celtsSponsoredProgram = Program.get(Program.isOtherCeltsSponsored),
-                                templates=visibleTemplates)
-    else:
+    programs = getAllowedPrograms(g.current_user)
+    if not programs:
         abort(403)
-
+    visibleTemplates = getAllowedTemplates(g.current_user)
+    return render_template("/events/templateSelector.html",
+                            programs=programs,
+                            celtsSponsoredProgram = Program.get(Program.isOtherCeltsSponsored),
+                            templates=visibleTemplates)
 
 @admin_bp.route('/eventTemplates/<templateid>/<programid>/create', methods=['GET','POST'])
 def createEvent(templateid, programid):
-    if not (g.current_user.isAdmin or g.current_user.isProgramManagerFor(programid)):
+    if not (g.current_user.isCeltsAdmin or g.current_user.isProgramManagerFor(programid)):
         abort(403)
 
     # Validate given URL
@@ -173,8 +171,6 @@ def createEvent(templateid, programid):
     preprocessEventData(eventData)
     isProgramManager = g.current_user.isProgramManagerFor(programid)
 
-    futureTerms = selectSurroundingTerms(g.current_term, prevTerms=0)
-
     requirements, bonnerCohorts = [], []
     if eventData['program'] is not None and eventData['program'].isBonnerScholars:
         requirements = getCertRequirements(Certification.BONNER)
@@ -189,7 +185,7 @@ def createEvent(templateid, programid):
     return render_template(f"/events/{template.templateFile}",
                            template = template,
                            eventData = eventData,
-                           futureTerms = futureTerms,
+                           termList = selectSurroundingTerms(g.current_term, prevTerms=0),
                            requirements = requirements,
                            bonnerCohorts = bonnerCohorts,
                            isProgramManager = isProgramManager)
@@ -314,7 +310,6 @@ def eventDisplay(eventId):
     # make sure our data is the same regardless of GET and POST
     preprocessEventData(eventData)
     eventData['program'] = event.program
-    futureTerms = selectSurroundingTerms(g.current_term)
     userHasRSVPed = checkUserRsvp(g.current_user, event) 
     filepaths = FileHandler(eventId=event.id).retrievePath(associatedAttachments)
     isProgramManager = g.current_user.isProgramManagerFor(eventData['program'])
@@ -342,7 +337,7 @@ def eventDisplay(eventId):
     if 'edit' in rule.rule:
         return render_template("events/createEvent.html",
                                 eventData = eventData,
-                                futureTerms = futureTerms,
+                                termList = Term.select().order_by(Term.termOrder),
                                 event = event,
                                 requirements = requirements,
                                 bonnerCohorts = bonnerCohorts,

app/controllers/admin/userManagement.py

@@ -137,4 +137,5 @@ def changeTerm():
 @admin_bp.route('/admin/addNewTerm', methods = ['POST'])
 def addNewTerm():
     addNextTerm()
+    flash("New term added", "success")
     return ""

app/controllers/main/routes.py

@@ -26,7 +26,7 @@
 from app.models.courseInstructor import CourseInstructor
 from app.models.backgroundCheckType import BackgroundCheckType
 
-from app.logic.events import getUpcomingEventsForUser, getParticipatedEventsForUser, getTrainingEvents, getEventRsvpCountsForTerm, getUpcomingStudentLedCount, getStudentLedEvents, getBonnerEvents, getOtherEvents, getEngagementEvents
+from app.logic.events import getUpcomingEventsForUser, getParticipatedEventsForUser, getTrainingEvents, getEventRsvpCountsForTerm, getUpcomingVolunteerOpportunitiesCount, getVolunteerOpportunities, getBonnerEvents, getCeltsLabor, getEngagementEvents
 from app.logic.transcript import *
 from app.logic.loginManager import logout
 from app.logic.searchUsers import searchUsers
@@ -69,49 +69,53 @@ def landingPage():
 def goToEventsList(programID):
     return {"activeTab": getActiveEventTab(programID)}
 
-@main_bp.route('/eventsList/<selectedTerm>', methods=['GET'], defaults={'activeTab': "studentLedEvents", 'programID': 0})
+@main_bp.route('/eventsList/<selectedTerm>', methods=['GET'], defaults={'activeTab': "volunteerOpportunities", 'programID': 0})
+@main_bp.route('/eventsList/<selectedTerm>/', methods=['GET'], defaults={'activeTab': "volunteerOpportunities", 'programID': 0})
 @main_bp.route('/eventsList/<selectedTerm>/<activeTab>', methods=['GET'], defaults={'programID': 0})
 @main_bp.route('/eventsList/<selectedTerm>/<activeTab>/<programID>', methods=['GET'])
 def events(selectedTerm, activeTab, programID):
-    currentTerm = g.current_term
-    if selectedTerm:
-        currentTerm = selectedTerm
-
+
     currentTime = datetime.datetime.now()
     listOfTerms = Term.select().order_by(Term.termOrder)
     participantRSVP = EventRsvp.select(EventRsvp, Event).join(Event).where(EventRsvp.user == g.current_user)
     rsvpedEventsID = [event.event.id for event in participantRSVP]
 
-    term: Term = Term.get_by_id(currentTerm)
+    term = g.current_term
+    if selectedTerm:
+        term = selectedTerm
+
+    # Make sure we have a Term object
+    term = Term.get_or_none(Term.id == term)
+    if term is None:
+        term = Term.get(Term.isCurrentTerm == True)
 
     currentEventRsvpAmount = getEventRsvpCountsForTerm(term)
-    studentLedEvents = getStudentLedEvents(term)
-    countUpcomingStudentLedEvents = getUpcomingStudentLedCount(term, currentTime)
+    volunteerOpportunities = getVolunteerOpportunities(term)
+    countUpcomingVolunteerOpportunities = getUpcomingVolunteerOpportunitiesCount(term, currentTime)
     trainingEvents = getTrainingEvents(term, g.current_user)
     engagementEvents = getEngagementEvents(term)
     bonnerEvents = getBonnerEvents(term)
-    otherEvents = getOtherEvents(term)
+    celtsLabor = getCeltsLabor(term)
 
     managersProgramDict = getManagerProgramDict(g.current_user)
 
     # Fetch toggle state from session    
     toggleState = request.args.get('toggleState', 'unchecked')
 
-    # compile all student led events into one list
+    # compile all volunteer opportunitiesevents into one list
     studentEvents = []
-    for studentEvent in studentLedEvents.values():
+    for studentEvent in volunteerOpportunities.values():
         studentEvents += studentEvent # add all contents of studentEvent to the studentEvents list
 
     # Get the count of all term events for each category to display in the event list page.
-    studentLedEventsCount: int = len(studentEvents)
+    volunteerOpportunitiesCount: int = len(studentEvents)
     trainingEventsCount: int = len(trainingEvents)
     engagementEventsCount: int = len(engagementEvents)
     bonnerEventsCount: int = len(bonnerEvents)
-    otherEventsCount: int = len(otherEvents)
+    celtsLaborCount: int = len(celtsLabor)
 
     # gets only upcoming events to display in indicators
     if (toggleState == 'unchecked'):
-        studentLedEventsCount: int = sum(list(countUpcomingStudentLedEvents.values()))
         for event in trainingEvents:
             if event.isPastEnd:
                 trainingEventsCount -= 1
@@ -121,28 +125,27 @@ def events(selectedTerm, activeTab, programID):
         for event in bonnerEvents:
             if event.isPastEnd:
                 bonnerEventsCount -= 1
-        for event in otherEvents:
+        for event in celtsLabor:
             if event.isPastEnd:
-                otherEventsCount -= 1
-
+                celtsLaborCount -= 1
+            
     # Handle ajax request for Event category header number notifiers and toggle
     if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
         return jsonify({
-            "studentLedEventsCount": studentLedEventsCount,
+            "volunteerOpportunitiesCount": volunteerOpportunitiesCount,
             "trainingEventsCount": trainingEventsCount,
             "engagementEventsCount": engagementEventsCount,
             "bonnerEventsCount": bonnerEventsCount,
-            "otherEventsCount": otherEventsCount,
+            "celtsLaborCount": celtsLaborCount,
             "toggleStatus": toggleState
         })
-
     return render_template("/events/eventList.html",
                             selectedTerm = term,
-                            studentLedEvents = studentLedEvents,
+                            volunteerOpportunities = volunteerOpportunities,
                             trainingEvents = trainingEvents,
                             engagementEvents = engagementEvents,
                             bonnerEvents = bonnerEvents,
-                            otherEvents = otherEvents,
+                            celtsLabor = celtsLabor,
                             listOfTerms = listOfTerms,
                             rsvpedEventsID = rsvpedEventsID,
                             currentEventRsvpAmount = currentEventRsvpAmount,
@@ -151,7 +154,7 @@ def events(selectedTerm, activeTab, programID):
                             activeTab = activeTab,
                             programID = int(programID),
                             managersProgramDict = managersProgramDict,
-                            countUpcomingStudentLedEvents = countUpcomingStudentLedEvents,
+                            countUpcomingVolunteerOpportunities = countUpcomingVolunteerOpportunities,
                             toggleState = toggleState,
                             )
 
@@ -243,7 +246,6 @@ def viewUsersProfile(username):
                                 managersList = managersList,
                                 participatedInLabor = getCeltsLaborHistory(volunteer),
                                 totalSustainedEngagements = totalSustainedEngagements,
-                                expressInterest = volunteer.minorInterest 
                             )
     abort(403)
 
@@ -306,9 +308,7 @@ def insuranceInfo(username):
         if g.current_user.username != username:
             abort(403)
 
-        rowsUpdated = InsuranceInfo.update(**request.form).where(InsuranceInfo.user == username).execute()
-        if not rowsUpdated:
-            InsuranceInfo.create(user = username, **request.form)
+        InsuranceInfo.replace({**request.form, "user": username}).execute()
 
         createActivityLog(f"{g.current_user.fullName} updated {user.fullName}'s insurance information.")
         flash('Insurance information saved successfully!', 'success') 

app/logic/events.py

@@ -224,45 +224,55 @@ def saveEventToDb(newEventData, renewedEvent = False):
         eventRecords.append(eventRecord)
     return eventRecords
 
-def getStudentLedEvents(term):
-    studentLedEvents = list(Event.select(Event, Program)
+def getVolunteerOpportunities(term):
+    volunteerOpportunities = list(Event.select(Event, Program)
                                  .join(Program)
-                                 .where(Program.isStudentLed,
-                                        Event.term == term, Event.deletionDate == None)
+                                 .where((Event.term == term) &
+                                        (Event.deletionDate.is_null(True)) &
+                                        (Event.isService == True) &
+                                        ((Event.isLaborOnly == False) | Event.isLaborOnly.is_null(True))
+                                 )
                                  .order_by(Event.startDate, Event.timeStart)
                                  .execute())
 
     programs = {}
 
-    for event in studentLedEvents:
+    for event in volunteerOpportunities:
         programs.setdefault(event.program, []).append(event)
 
     return programs
 
 def getEngagementEvents(term):
     engagementEvents = list(Event.select(Event, Program)
                                  .join(Program)
-                                 .where(Event.isEngagement,
+                                 .where(Event.isEngagement, Event.isLaborOnly == False,
                                         Event.term == term, Event.deletionDate == None)
                                  .order_by(Event.startDate, Event.timeStart)
                                  .execute())
     return engagementEvents
 
-def getUpcomingStudentLedCount(term, currentTime):
+def getUpcomingVolunteerOpportunitiesCount(term, currentTime):
     """
-        Return a count of all upcoming events for each student led program.
+        Return a count of all upcoming events for each volunteer opportunitiesprogram.
     """
 
-    upcomingCount = (Program.select(Program.id, fn.COUNT(Event.id).alias("eventCount"))
-                            .join(Event, on=(Program.id == Event.program_id))
-                            .where(Program.isStudentLed,
-                                    Event.term == term, Event.deletionDate == None,
-                                    (Event.startDate > currentTime) | ((Event.startDate == currentTime) & (Event.timeEnd >= currentTime)),
-                                    Event.isCanceled == False)
-                            .group_by(Program.id))
-
-    programCountDict = {}
+    upcomingCount = (
+        Program
+        .select(Program.id, fn.COUNT(Event.id).alias("eventCount"))
+        .join(Event, on=(Program.id == Event.program_id))
+        .where(
+            (Event.term == term) &
+            (Event.deletionDate.is_null(True)) &
+            (Event.isService == True) &
+            ((Event.isLaborOnly == False) | Event.isLaborOnly.is_null(True)) &
+            ((Event.startDate > currentTime) |
+             ((Event.startDate == currentTime) & (Event.timeEnd >= currentTime))) &
+            (Event.isCanceled == False)
+        )
+        .group_by(Program.id)
+    )
 
+    programCountDict = {}
     for programCount in upcomingCount:
         programCountDict[programCount.id] = programCount.eventCount
     return programCountDict
@@ -279,7 +289,7 @@ def getTrainingEvents(term, user):
     """
     trainingQuery = (Event.select(Event).distinct()
                           .join(Program, JOIN.LEFT_OUTER)
-                          .where(Event.isTraining == True,
+                          .where(Event.isTraining == True, Event.isLaborOnly == False,
                                  Event.term == term, Event.deletionDate == None)
                           .order_by(Event.isAllVolunteerTraining.desc(), Event.startDate, Event.timeStart))
 
@@ -290,36 +300,28 @@ def getTrainingEvents(term, user):
     return list(trainingQuery.execute())
 
 def getBonnerEvents(term):
-    bonnerScholarsEvents = list(Event.select(Event, Program.id.alias("program_id"))
-                                     .join(Program)
-                                     .where(Program.isBonnerScholars,
-                                            Event.term == term, Event.deletionDate == None)
-                                     .order_by(Event.startDate, Event.timeStart)
-                                     .execute())
+    bonnerScholarsEvents = list(
+        Event.select(Event, Program.id.alias("program_id"))
+            .join(Program)
+            .where(
+                Program.isBonnerScholars,
+                Event.term == term,
+                Event.deletionDate == None
+            )
+            .order_by(Event.startDate, Event.timeStart)
+            .execute()
+    )
     return bonnerScholarsEvents
 
-def getOtherEvents(term):
+def getCeltsLabor(term):
     """
-
-    Get the list of the events not caught by other functions to be displayed in
-    the Other Events section of the Events List page.
-    :return: A list of Other Event objects
+    Labor tab: events explicitly marked as Labor Only.
     """
-    # Gets all events that are not associated with a program and are not trainings
-    # Gets all events that have a program but don't fit anywhere
-
-    otherEvents = list(Event.select(Event, Program)
-                            .join(Program, JOIN.LEFT_OUTER)
-                            .where(Event.term == term, Event.deletionDate == None,
-                                   Event.isTraining == False,
-                                   Event.isAllVolunteerTraining == False,
-                                   ((Program.isOtherCeltsSponsored) |
-                                   ((Program.isStudentLed == False) &
-                                   (Program.isBonnerScholars == False))))
+    celtsLabor = list(Event.select()
+                            .where(Event.term == term, Event.deletionDate == None, Event.isLaborOnly == True)
                             .order_by(Event.startDate, Event.timeStart, Event.id)
                             .execute())
-
-    return otherEvents
+    return celtsLabor
 
 def getUpcomingEventsForUser(user, asOf=datetime.now(), program=None):
     """

app/logic/landingPage.py

@@ -31,11 +31,13 @@ def getManagerProgramDict(user):
             managerProgramDict[row.program]["managers"] = f'{managerProgramDict[row.program]["managers"]}, {row.user.firstName} {row.user.lastName}'
     return managerProgramDict
 
-def getActiveEventTab(programID):
-    program = Program.get_by_id(programID)
+def getActiveEventTab(programID=None):
+    try:
+        program = Program.get_by_id(programID)
+    except Program.DoesNotExist:
+        return "celtsLabor"
+
     if program.isBonnerScholars:
         return "bonnerScholarsEvents"
-    elif program.isStudentLed:
-        return "studentLedEvents"
     else:
-        return "otherEvents"
+        return "volunteerOpportunities"