Dev -> Production

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/python:0-3.11
+FROM mcr.microsoft.com/devcontainers/python:3.13
 
 ENV PYTHONUNBUFFERED 1
 

.devcontainer/docker-compose.yml

@@ -18,6 +18,7 @@ services:
   db:
     image: mysql
     restart: always
+    command: --require_secure_transport=OFF
     environment: 
       MYSQL_DATABASE: 'celts'
       MYSQL_USER: 'celts_user'
@@ -31,4 +32,4 @@ services:
       - celts_data:/var/lib/mysql
 
 volumes:
-  celts_data:
+  celts_data:

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 ## Issue Description
 
-Fixes #add issue number
+Fixes issue #<issue_number>
 - Add issue description
 
 ## Changes

.github/workflows/actionTests.yml

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

README.md

@@ -1,7 +1,7 @@
 # Flask application to manage CELTS programs
 
 ## Requirements
- * Python 3.7+
+ * Python 3.10+
 
 **Packages (Ubuntu)**
  * python3-dev

app/config/default.yml

@@ -181,3 +181,29 @@ contributors:
     role: "Software Engineer"
   - name: "Alina Petrosyants"
     role: "Software Engineer"
+  - name: "Denys Zhytkov"
+    role: "Software Engineer"
+  - name: "Bhushan Sah"
+    role: "Software Engineer"
+  - name: "Julius Fritz"
+    role: "Software Engineer"
+  - name: "Artem Kurasov"
+    role: "Software Engineer"
+  - name: "Daniel Rukwasha"
+    role: "Software Engineer"
+  - name: "Bright A Feitsop"
+    role: "Software Engineer"
+  - name: "Alpha Nyabuto"
+    role: "Software Engineer"
+  - name: "John Lolonga"
+    role: "Software Engineer"
+  - name: "Dingani Munsaka"
+    role: "Software Engineer"
+  - name: "Andrew Carnes"
+    role: "Software Engineer"
+  - name: "Chris Georgiev"
+    role: "Software Engineer" 
+  - name: "Nahom Mesfin Terrefe"
+    role: "Software Engineer"
+  - name: "Dayton Conwell"
+    role: "Software Engineer"

app/controllers/admin/minor.py

@@ -4,7 +4,7 @@
 
 from app.controllers.admin import admin_bp
 
-from app.logic.minor import getMinorInterest, getMinorProgress, toggleMinorInterest, getMinorSpreadsheet, getDeclaredMinorStudents
+from app.logic.minor import getDeclaredMinorStudents, getMinorInterest, getMinorProgress, toggleMinorInterest, getMinorSpreadsheet
 
 @admin_bp.route('/admin/cceMinor', methods=['GET','POST'])
 def manageMinor():
@@ -20,20 +20,19 @@ def manageMinor():
 
         return redirect(url_for("admin.manageMinor"))
 
-
-
     interestedStudentsList = getMinorInterest()
     interestedStudentEmailString = ';'.join([student['email'] for student in interestedStudentsList])
-    sustainedEngagement = getMinorProgress()
-    declaredStudentsList = getDeclaredMinorStudents()
-    declaredStudentEmailString = ';'.join([student['email'] for student in declaredStudentsList])    
+    declaredStudentsDict = getDeclaredMinorStudents()
+    declaredStudentEmailString = ';'.join([student['email'] for student in declaredStudentsDict])  
+
+    cceMinorStudents = declaredStudentsDict
+
 
     return render_template('/admin/cceMinor.html',
+                            cceMinorStudents = cceMinorStudents,
                             interestedStudentsList = interestedStudentsList,
-                            declaredStudentsList = declaredStudentsList,
                             interestedStudentEmailString = interestedStudentEmailString,
                             declaredStudentEmailString = declaredStudentEmailString,
-                            sustainedEngagement = sustainedEngagement,
                             )
 
 @admin_bp.route("/admin/cceMinor/download")

app/controllers/admin/volunteers.py

@@ -115,7 +115,6 @@ def volunteerDetailsPage(eventID):
 
     waitlistUser = list(set([obj for obj in eventRsvpData if obj.rsvpWaitlist]))
     rsvpUser = list(set([obj for obj in eventRsvpData if not obj.rsvpWaitlist ]))
-
     return render_template("/events/volunteerDetails.html",
                             waitlistUser = waitlistUser,
                             attendedUser= eventParticipantData,

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, getUpcomingVolunteerOpportunitiesCount, getVolunteerOpportunities, getBonnerEvents, getCeltsLabor, getEngagementEvents
+from app.logic.events import getUpcomingEventsForUser, getParticipatedEventsForUser, getTrainingEvents, getEventRsvpCountsForTerm, getUpcomingVolunteerOpportunitiesCount, getVolunteerOpportunities, getBonnerEvents, getCeltsLabor, getEngagementEvents, getPastVolunteerOpportunitiesCount
 from app.logic.transcript import *
 from app.logic.loginManager import logout
 from app.logic.searchUsers import searchUsers
@@ -92,6 +92,7 @@ def events(selectedTerm, activeTab, programID):
     currentEventRsvpAmount = getEventRsvpCountsForTerm(term)
     volunteerOpportunities = getVolunteerOpportunities(term)
     countUpcomingVolunteerOpportunities = getUpcomingVolunteerOpportunitiesCount(term, currentTime)
+    countPastVolunteerOpportunities = getPastVolunteerOpportunitiesCount(term, currentTime)
     trainingEvents = getTrainingEvents(term, g.current_user)
     engagementEvents = getEngagementEvents(term)
     bonnerEvents = getBonnerEvents(term)
@@ -109,6 +110,8 @@ def events(selectedTerm, activeTab, programID):
 
     # Get the count of all term events for each category to display in the event list page.
     volunteerOpportunitiesCount: int = len(studentEvents)
+    countUpcomingVolunteerOpportunitiesCount: int = len(countUpcomingVolunteerOpportunities)
+    countPastVolunteerOpportunitiesCount: int = len(countPastVolunteerOpportunities)
     trainingEventsCount: int = len(trainingEvents)
     engagementEventsCount: int = len(engagementEvents)
     bonnerEventsCount: int = len(bonnerEvents)
@@ -133,6 +136,8 @@ def events(selectedTerm, activeTab, programID):
     if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
         return jsonify({
             "volunteerOpportunitiesCount": volunteerOpportunitiesCount,
+            "countPastVolunteerOpportunitiesCount": countPastVolunteerOpportunitiesCount,
+            "countUpcomingVolunteerOpportunitiesCount": countUpcomingVolunteerOpportunitiesCount,
             "trainingEventsCount": trainingEventsCount,
             "engagementEventsCount": engagementEventsCount,
             "bonnerEventsCount": bonnerEventsCount,
@@ -155,6 +160,7 @@ def events(selectedTerm, activeTab, programID):
                             programID = int(programID),
                             managersProgramDict = managersProgramDict,
                             countUpcomingVolunteerOpportunities = countUpcomingVolunteerOpportunities,
+                            countPastVolunteerOpportunities = countPastVolunteerOpportunities,
                             toggleState = toggleState,
                             )
 
@@ -387,6 +393,7 @@ def addNote():
         flash("Failed to add profile note", "danger")
         return "Failed to add profile note", 500
 
+
 @main_bp.route('/<username>/deleteNote', methods=['POST'])
 def deleteNote(username):
     """
@@ -493,24 +500,18 @@ def volunteerRegister():
     program = event.program
     user = g.current_user
 
-    isAdded = checkUserRsvp(user, event)
     isEligible = isEligibleForProgram(program, user)
-    listOfRequirements = unattendedRequiredEvents(program, user)
 
     personAdded = False
     if isEligible:
         personAdded = addPersonToEvent(user, event)
-        if personAdded and listOfRequirements:
-            reqListToString = ', '.join(listOfRequirements)
-            flash(f"{user.firstName} {user.lastName} successfully registered. However, the following training may be required: {reqListToString}.", "success")
-        elif personAdded:
+        if personAdded:
             flash("Successfully registered for event!","success")
         else:
             flash(f"RSVP Failed due to an unknown error.", "danger")
     else:
         flash(f"Cannot RSVP. Contact CELTS administrators: {app.config['celts_admin_contact']}.", "danger")
 
-
     if 'from' in request.form:
         if request.form['from'] == 'ajax':
             return ''
@@ -545,9 +546,11 @@ def serviceTranscript(username):
     slCourses = getSlCourseTranscript(username)
     totalHours = getTotalHours(username)
     allEventTranscript = getProgramTranscript(username)
+    zeroHourEvents = getZeroHourEvents(username)
     startDate = getStartYear(username)
     return render_template('main/serviceTranscript.html',
                             allEventTranscript = allEventTranscript,
+                            zeroHourEvents = zeroHourEvents,
                             slCourses = slCourses.objects(),
                             totalHours = totalHours,
                             startDate = startDate,