From 8a085f6ff1195ab05ddc4f6347c2c2d21f0ab013 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Fri, 21 Mar 2025 17:06:42 -0400
Subject: [PATCH 01/42] term missed and term added

---
 app/logic/certification.py                | 34 ++++++++++++++++++++---
 app/templates/admin/bonnerManagement.html |  1 +
 app/templates/main/userProfile.html       | 12 ++++++--
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 70c3beb03..809c188e3 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -1,9 +1,38 @@
 from peewee import JOIN, DoesNotExist, Case
-
+from app.models.term import Term
 from app.models.certification import Certification
 from app.models.certificationRequirement import CertificationRequirement
 from app.models.requirementMatch import RequirementMatch
 from app.models.eventParticipant import EventParticipant
+from app.models.user import User
+
+def termsAttended(certification=None, username=None):
+    termsAttended = 0
+    if certification:
+        if username:
+            attendance = RequirementMatch.select(RequirementMatch).where(RequirementMatch.requirement == certification).get()
+    termsAttended = attendance.count()
+    return termsAttended
+            
+def termsMissed(certification=None, username=None): 
+    classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
+    termMissed = 0
+    currentTerm = Term.select(Term).where(Term.isCurrentTerm == True).get() 
+
+    if currentTerm.isSummer == True:
+        current = f'Fall {currentTerm.year}'
+        currentTerm = Term.select(Term).where(Term.description == current).get()
+    else:
+        current = currentTerm.description
+
+    for level in range(4):
+        if User.classLevel == classLevel[level] and current == f'Spring {currentTerm.year}':
+            termMissed = level
+        elif User.classLevel == classLevel[level]:
+            termMissed = level*2
+    
+    return termMissed - termsAttended(certification, username)
+
 
 def getCertRequirementsWithCompletion(*, certification, username):
     """
@@ -28,7 +57,6 @@ def getCertRequirements(certification=None, username=None):
     reqList = (Certification.select(Certification, CertificationRequirement)
                             .join(CertificationRequirement, JOIN.LEFT_OUTER, attr="requirement")
                             .order_by(Certification.id, CertificationRequirement.order.asc(nulls="LAST")))
-
     if certification:
         if username:
             # I don't know how to add something to a select, so we have to recreate the whole query :(
@@ -40,7 +68,6 @@ def getCertRequirements(certification=None, username=None):
                 .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event))
                 .where(EventParticipant.user.is_null(True) | (EventParticipant.user == username))
                 .order_by(Certification.id, CertificationRequirement.order.asc(nulls="LAST")))
-
         # we have to add the is not null check so that `cert.requirement` always exists
         reqList = reqList.where(Certification.id == certification, CertificationRequirement.id.is_null(False))
         reqList = reqList.distinct()
@@ -61,7 +88,6 @@ def getCertRequirements(certification=None, username=None):
 
         if getattr(cert, 'requirement', None):
             certs[cert.id]["requirements"].append(cert.requirement)
-
     return certs
 
 def updateCertRequirements(certId, newRequirements):
diff --git a/app/templates/admin/bonnerManagement.html b/app/templates/admin/bonnerManagement.html
index dfdc80e27..5e3a2c20b 100644
--- a/app/templates/admin/bonnerManagement.html
+++ b/app/templates/admin/bonnerManagement.html
@@ -150,6 +150,7 @@ <h3 class="accordion-header" id="headingThree">
                             <select class="flex-column form-select empty frequency-select" name="frequency_{{req.id}}">
                                 <option value="" {{ "selected" if not req.frequency else "" }}>Frequency</option>
                                 <option value="once" {{ "selected" if req.frequency == "once" else "" }}>Once</option>
+                                <option value="twice" {{ "selected" if req.frequency == "twice" else "" }}>Twice</option>
                                 <option value="annual" {{ "selected" if req.frequency == "annual" else "" }}>Annual</option>
                                 <option value="term" {{ "selected" if req.frequency == "term" else "" }}>Every Term</option>
                             </select>
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index d7ebb0377..2991b6316 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -45,7 +45,7 @@ <h1>{{volunteer.firstName}} {{volunteer.lastName}}</h1>
     <div>{{volunteer.major}}</div>
     {% endif %}
     {% if volunteer.classLevel -%}
-    <div>{{volunteer.classLevel}}</div>
+    <div>{{volunteer.classLevel}} </div>
     {% endif %}
     {% if volunteer.cpoNumber %}
       <div>
@@ -513,8 +513,16 @@ <h5>Requirement Progress</h5>
                 <li>{{req.name}}
                 {% if req.completed %}
                   <span class="bi bi-check fs-3 text-success"></span>
-                {% else %}
+                {% elif req.completed == False and req.frequency == "once" %}
                   <span class="bi bi-x fs-3"></span>
+                {% elif req.completed == False and req.frequency == "twice" %}
+                  {% for i in range(2) %}
+                    <span class="bi bi-x fs-3"></span>
+                  {% endfor %}                
+                {% elif req.completed == False and req.frequency == "term"%}
+                  {% for i in range(2) %}
+                    <span class="bi bi-x fs-3"></span>
+                  {% endfor %}
                 {% endif %}
                 </li>
               {% endfor %}

From c0f13eb1e38d8af947b9ba335171adf3f0cc3b68 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Mon, 24 Mar 2025 19:11:51 -0400
Subject: [PATCH 02/42] almost there

---
 app/controllers/admin/routes.py     |  1 +
 app/logic/certification.py          | 20 ++++++++++----------
 app/templates/main/userProfile.html | 17 +++++++++++------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/controllers/admin/routes.py b/app/controllers/admin/routes.py
index 12ed866d3..901968cab 100644
--- a/app/controllers/admin/routes.py
+++ b/app/controllers/admin/routes.py
@@ -177,6 +177,7 @@ def createEvent(templateid, programid):
     requirements, bonnerCohorts = [], []
     if eventData['program'] is not None and eventData['program'].isBonnerScholars:
         requirements = getCertRequirements(Certification.BONNER)
+        print("ccceee", requirements)
         rawBonnerCohorts = getBonnerCohorts(limit=5)
         bonnerCohorts = {}
         
diff --git a/app/logic/certification.py b/app/logic/certification.py
index 809c188e3..4ef3db1ba 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -6,32 +6,29 @@
 from app.models.eventParticipant import EventParticipant
 from app.models.user import User
 
-def termsAttended(certification=None, username=None):
-    termsAttended = 0
+def termsAttended(certification, username=None):
     if certification:
         if username:
-            attendance = RequirementMatch.select(RequirementMatch).where(RequirementMatch.requirement == certification).get()
-    termsAttended = attendance.count()
+            attendance = RequirementMatch.select().where(RequirementMatch.requirement_id == certification)
+    termsAttended = len(attendance)
+    print("ssdt", termsAttended)
     return termsAttended
             
 def termsMissed(certification=None, username=None): 
     classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
-    termMissed = 0
     currentTerm = Term.select(Term).where(Term.isCurrentTerm == True).get() 
-
     if currentTerm.isSummer == True:
         current = f'Fall {currentTerm.year}'
         currentTerm = Term.select(Term).where(Term.description == current).get()
     else:
         current = currentTerm.description
-
     for level in range(4):
         if User.classLevel == classLevel[level] and current == f'Spring {currentTerm.year}':
             termMissed = level
         elif User.classLevel == classLevel[level]:
             termMissed = level*2
-    
-    return termMissed - termsAttended(certification, username)
+    termMissed = termMissed - termsAttended(certification, username)
+    return termMissed
 
 
 def getCertRequirementsWithCompletion(*, certification, username):
@@ -76,7 +73,11 @@ def getCertRequirements(certification=None, username=None):
         for cert in reqList:
             if username:
                 cert.requirement.completed = bool(cert.__dict__['completed'])
+                if cert.requirement.frequency == "term":
+                    cert.requirement.missedTerms = termsMissed(cert.requirement.id, username)
+                    cert.requirement.attendedTerms = termsAttended(cert.requirement.id, username)
             certs.append(cert.requirement)
+        print("ccceee", certs)
         return certs
 
         #return [cert.requirement for cert in reqList]
@@ -85,7 +86,6 @@ def getCertRequirements(certification=None, username=None):
     for cert in reqList:
         if cert.id not in certs.keys():
             certs[cert.id] = {"data": cert, "requirements": []}
-
         if getattr(cert, 'requirement', None):
             certs[cert.id]["requirements"].append(cert.requirement)
     return certs
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 2991b6316..98f2ffcc2 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -509,20 +509,25 @@ <h5>Notes</h5>
             <div class="col-md-6">
               <h5>Requirement Progress</h5>
               <ul>
+              {% for req in bonnerRequirements %}
+                <span>{{req.name}}</span>
+              {% endfor %}
               {% for req in bonnerRequirements %}
                 <li>{{req.name}}
-                {% if req.completed %}
+                {% if req.frequency == "term"%}
+                  {% for a in range(req.missedTerms) %}
+                    <span class="bi bi-x fs-3"></span>
+                  {% endfor %}
+                  {% for i in range(req.attendedTerms) %}
+                  <span class="bi bi-check fs-3 text-success"></span>
+                  {% endfor %}
+                {% elif req.completed %}
                   <span class="bi bi-check fs-3 text-success"></span>
                 {% elif req.completed == False and req.frequency == "once" %}
                   <span class="bi bi-x fs-3"></span>
                 {% elif req.completed == False and req.frequency == "twice" %}
-                  {% for i in range(2) %}
                     <span class="bi bi-x fs-3"></span>
-                  {% endfor %}                
-                {% elif req.completed == False and req.frequency == "term"%}
-                  {% for i in range(2) %}
                     <span class="bi bi-x fs-3"></span>
-                  {% endfor %}
                 {% endif %}
                 </li>
               {% endfor %}

From 3edbffc3445dc5fff33ef8de0a9e8d651e84dcb6 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Fri, 28 Mar 2025 22:11:33 -0400
Subject: [PATCH 03/42] The functions are done I just need to work on the test
 suite

---
 app/logic/certification.py          | 34 +++++++++++++++++++++--------
 app/templates/main/userProfile.html |  3 ---
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 4ef3db1ba..e043b6caa 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -7,16 +7,26 @@
 from app.models.user import User
 
 def termsAttended(certification, username=None):
-    if certification:
-        if username:
-            attendance = RequirementMatch.select().where(RequirementMatch.requirement_id == certification)
+    '''
+    Function to differentiate retreived terms attended by a user for certification that has a frequency of term
+    '''
+    if username:
+        attendance = (RequirementMatch
+                   .select()
+                   .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event))  # Join EventParticipant
+                   .where(RequirementMatch.requirement_id == certification)  # Filter by requirement_id
+                   .where(EventParticipant.user == username))  # Filter by user
     termsAttended = len(attendance)
-    print("ssdt", termsAttended)
     return termsAttended
             
 def termsMissed(certification=None, username=None): 
+    '''
+    Function to hypothetically populated the maximum amount of certification a student can miss based on their class classification
+    '''
     classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
     currentTerm = Term.select(Term).where(Term.isCurrentTerm == True).get() 
+
+    # looking into a scenario where the current term is summer so that we can reassigned the current term variable to the next term
     if currentTerm.isSummer == True:
         current = f'Fall {currentTerm.year}'
         currentTerm = Term.select(Term).where(Term.description == current).get()
@@ -65,22 +75,28 @@ def getCertRequirements(certification=None, username=None):
                 .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event))
                 .where(EventParticipant.user.is_null(True) | (EventParticipant.user == username))
                 .order_by(Certification.id, CertificationRequirement.order.asc(nulls="LAST")))
+
         # we have to add the is not null check so that `cert.requirement` always exists
         reqList = reqList.where(Certification.id == certification, CertificationRequirement.id.is_null(False))
-        reqList = reqList.distinct()
-
         certs = []
         for cert in reqList:
             if username:
                 cert.requirement.completed = bool(cert.__dict__['completed'])
+                # this is to get the calculation when it comes to events with term as their frequency
                 if cert.requirement.frequency == "term":
                     cert.requirement.missedTerms = termsMissed(cert.requirement.id, username)
                     cert.requirement.attendedTerms = termsAttended(cert.requirement.id, username)
             certs.append(cert.requirement)
-        print("ccceee", certs)
-        return certs
 
-        #return [cert.requirement for cert in reqList]
+        # the .distinct() doesn't work efficiently, so we have to manually go through the list and removed duplicates that exist
+        newCerts = []
+        certsIndex = 0
+        for cert in certs:
+            if certs[certsIndex] not in newCerts:
+                newCerts.append(certs[certsIndex])
+            certsIndex += 1
+        certs = newCerts
+        return certs
     
     certs = {}
     for cert in reqList:
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 98f2ffcc2..1ccc7c88a 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -509,9 +509,6 @@ <h5>Notes</h5>
             <div class="col-md-6">
               <h5>Requirement Progress</h5>
               <ul>
-              {% for req in bonnerRequirements %}
-                <span>{{req.name}}</span>
-              {% endfor %}
               {% for req in bonnerRequirements %}
                 <li>{{req.name}}
                 {% if req.frequency == "term"%}

From c043925e9259ffd7e59da0a6f5a6a2dc1c4f675c Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Sat, 29 Mar 2025 13:13:43 -0400
Subject: [PATCH 04/42] remove duplicate certifications, add tooltips to show
 what terms the student has attended

---
 app/logic/certification.py          | 12 ++++++++----
 app/static/js/userProfile.js        |  5 +++++
 app/templates/main/userProfile.html |  8 +++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index e043b6caa..4e628ce45 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -10,14 +10,16 @@ def termsAttended(certification, username=None):
     '''
     Function to differentiate retreived terms attended by a user for certification that has a frequency of term
     '''
+    attendedTerms = []
     if username:
         attendance = (RequirementMatch
                    .select()
                    .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event))  # Join EventParticipant
                    .where(RequirementMatch.requirement_id == certification)  # Filter by requirement_id
                    .where(EventParticipant.user == username))  # Filter by user
-    termsAttended = len(attendance)
-    return termsAttended
+    for attend in range(len(attendance)):
+        attendedTerms.append(attendance[attend].event.term.description)
+    return attendedTerms
             
 def termsMissed(certification=None, username=None): 
     '''
@@ -37,7 +39,8 @@ def termsMissed(certification=None, username=None):
             termMissed = level
         elif User.classLevel == classLevel[level]:
             termMissed = level*2
-    termMissed = termMissed - termsAttended(certification, username)
+    termAttended = termsAttended(certification, username)
+    termMissed = termMissed - len(termAttended)
     return termMissed
 
 
@@ -85,7 +88,8 @@ def getCertRequirements(certification=None, username=None):
                 # this is to get the calculation when it comes to events with term as their frequency
                 if cert.requirement.frequency == "term":
                     cert.requirement.missedTerms = termsMissed(cert.requirement.id, username)
-                    cert.requirement.attendedTerms = termsAttended(cert.requirement.id, username)
+                    cert.requirement.attendedTerms = len(termsAttended(cert.requirement.id, username))
+                    cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
             certs.append(cert.requirement)
 
         # the .distinct() doesn't work efficiently, so we have to manually go through the list and removed duplicates that exist
diff --git a/app/static/js/userProfile.js b/app/static/js/userProfile.js
index 83b1be143..00c7f7b81 100644
--- a/app/static/js/userProfile.js
+++ b/app/static/js/userProfile.js
@@ -16,6 +16,11 @@ $(document).ready(function(){
     });
   })
 
+  var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
+  var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
+    return new bootstrap.Tooltip(tooltipTriggerEl)
+  })
+  
   $("#printButton").on("click", function() {
         let username = $(this).data('username')
         printDocument(`/profile/${username}/travelForm`)
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 1ccc7c88a..8acf43c10 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -510,7 +510,13 @@ <h5>Notes</h5>
               <h5>Requirement Progress</h5>
               <ul>
               {% for req in bonnerRequirements %}
-                <li>{{req.name}}
+                <li 
+                {% if req.frequency == "term"%}
+                  data-bs-toggle="tooltip" 
+                  data-bs-placement="top" 
+                  title="You have attended these terms: {% if req.attendedTerms %}{{ req.attendedDescriptions | join(', ') }}{% endif %}"
+                {% endif %}>
+                {{req.name}}
                 {% if req.frequency == "term"%}
                   {% for a in range(req.missedTerms) %}
                     <span class="bi bi-x fs-3"></span>

From b297d18e2c7f8300cdf6eb2c342a9c20f85aa852 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Thu, 3 Apr 2025 18:27:18 -0400
Subject: [PATCH 05/42] final push

---
 app/controllers/admin/routes.py           |  2 -
 app/controllers/main/routes.py            |  4 +-
 app/logic/certification.py                | 19 +++---
 app/templates/admin/bonnerManagement.html |  2 +-
 tests/code/test_certification.py          | 79 ++++++++++++++++++++++-
 5 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/app/controllers/admin/routes.py b/app/controllers/admin/routes.py
index 901968cab..a035a8b0b 100644
--- a/app/controllers/admin/routes.py
+++ b/app/controllers/admin/routes.py
@@ -177,7 +177,6 @@ def createEvent(templateid, programid):
     requirements, bonnerCohorts = [], []
     if eventData['program'] is not None and eventData['program'].isBonnerScholars:
         requirements = getCertRequirements(Certification.BONNER)
-        print("ccceee", requirements)
         rawBonnerCohorts = getBonnerCohorts(limit=5)
         bonnerCohorts = {}
         
@@ -328,7 +327,6 @@ def eventDisplay(eventId):
         for year, cohort in rawBonnerCohorts.items():
             if cohort:
                 bonnerCohorts[year] = cohort
-
         invitedCohorts = list(EventCohort.select().where(
             EventCohort.event_id == eventId,
         ))
diff --git a/app/controllers/main/routes.py b/app/controllers/main/routes.py
index f33a2fc09..e3d3f279a 100644
--- a/app/controllers/main/routes.py
+++ b/app/controllers/main/routes.py
@@ -33,7 +33,7 @@
 from app.logic.utils import selectSurroundingTerms
 from app.logic.celtsLabor import getCeltsLaborHistory
 from app.logic.createLogs import createRsvpLog, createActivityLog
-from app.logic.certification import getCertRequirementsWithCompletion
+from app.logic.certification import getCertRequirementsWithCompletion, termsMissed
 from app.logic.landingPage import getManagerProgramDict, getActiveEventTab
 from app.logic.minor import toggleMinorInterest, getCommunityEngagementByTerm, getEngagementTotal
 from app.logic.participants import unattendedRequiredEvents, trainedParticipants, getParticipationStatusForTrainings, checkUserRsvp, addPersonToEvent
@@ -218,9 +218,7 @@ def viewUsersProfile(username):
                                      "onTranscript": onTranscript}),
 
         profileNotes = ProfileNote.select().where(ProfileNote.user == volunteer)
-
         bonnerRequirements = getCertRequirementsWithCompletion(certification=Certification.BONNER, username=volunteer)
-
         managersProgramDict = getManagerProgramDict(g.current_user)
         managersList = [id[1] for id in managersProgramDict.items()]
         totalSustainedEngagements = getEngagementTotal(getCommunityEngagementByTerm(volunteer))
diff --git a/app/logic/certification.py b/app/logic/certification.py
index 4e628ce45..dd2bb5809 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -1,4 +1,5 @@
 from peewee import JOIN, DoesNotExist, Case
+from app.models.event import Event
 from app.models.term import Term
 from app.models.certification import Certification
 from app.models.certificationRequirement import CertificationRequirement
@@ -6,7 +7,7 @@
 from app.models.eventParticipant import EventParticipant
 from app.models.user import User
 
-def termsAttended(certification, username=None):
+def termsAttended(certification=None, username=None):
     '''
     Function to differentiate retreived terms attended by a user for certification that has a frequency of term
     '''
@@ -27,7 +28,6 @@ def termsMissed(certification=None, username=None):
     '''
     classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
     currentTerm = Term.select(Term).where(Term.isCurrentTerm == True).get() 
-
     # looking into a scenario where the current term is summer so that we can reassigned the current term variable to the next term
     if currentTerm.isSummer == True:
         current = f'Fall {currentTerm.year}'
@@ -35,13 +35,14 @@ def termsMissed(certification=None, username=None):
     else:
         current = currentTerm.description
     for level in range(4):
-        if User.classLevel == classLevel[level] and current == f'Spring {currentTerm.year}':
-            termMissed = level
-        elif User.classLevel == classLevel[level]:
-            termMissed = level*2
-    termAttended = termsAttended(certification, username)
-    termMissed = termMissed - len(termAttended)
-    return termMissed
+        userClass = User.select().where(User.username == username).get()
+        if userClass.classLevel == classLevel[level] and current == f'Spring {currentTerm.year}':
+            missedTerms = (level+1)*2
+        elif userClass.classLevel == classLevel[level]:
+            missedTerms = ((level+1)*2)-1
+    attendedTerms = termsAttended(certification, username)
+    missedTerms = missedTerms - len(attendedTerms)
+    return missedTerms
 
 
 def getCertRequirementsWithCompletion(*, certification, username):
diff --git a/app/templates/admin/bonnerManagement.html b/app/templates/admin/bonnerManagement.html
index 5e3a2c20b..4d540a7e2 100644
--- a/app/templates/admin/bonnerManagement.html
+++ b/app/templates/admin/bonnerManagement.html
@@ -38,7 +38,7 @@ <h3 class="accordion-header" id="headingOne">
                         {% set show = "active" if subTab|int == year else "" %}
                         {% set aria = "true" if subTab|int == year else "false" %}
                         <button class="nav-link {{show}}" id="v-pills-{{year}}-tab" data-bs-toggle="pill" data-bs-target="#v-pills-{{year}}" type="button" role="tab" data-year="{{year}}" aria-controls="v-pills-{{year}}" aria-selected="{{aria}}">{{year}} - {{year + 1}}</button>
-                    {% endfor %}
+                    {% endfor %}  
                 </div>
                 <div class="tab-content me-2 ms-2" id="v-pills-tabContent">
                     {% for year, users in cohorts.items() %}
diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index c3f5de185..544425970 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -3,14 +3,90 @@
 
 from app.models import mainDB
 from app.models.event import Event
+from app.models.term import Term
+from app.models.user import User
 from app.models.certification import Certification
 from app.models.certificationRequirement import CertificationRequirement
 from app.models.requirementMatch import RequirementMatch
 from app.models.eventParticipant import EventParticipant
 
-from app.logic.certification import getCertRequirements, updateCertRequirements, updateCertRequirementForEvent
+from app.logic.certification import getCertRequirements, updateCertRequirements, updateCertRequirementForEvent, termsAttended, termsMissed
 from app.logic.certification import getCertRequirementsWithCompletion
 
+@pytest.mark.integration
+def test_termsAttended():
+    with mainDB.atomic() as transaction:
+            # created the database and added the test data to test what terms are return from attendedTerms()
+            Term.create(id = 1000, description = "Spring 2020", year = 2020, academicYear = 2019-2020, isSummer = False, isCurrentTerm = True, termOrder = 2020-1)
+            Term.create(id = 1001, description = "Fall 2019", year = 2019, academicYear = 2019-2020, isSummer = False, isCurrentTerm = False, termOrder = 2019-3)
+            Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Spring 2020", program_id = 5)
+            Event.create(id = 1401, term_id = 1001, name = "Event 2", description = "Fall 2019", program_id = 5)
+            User.create(username='zawn', classLevel='Senior')  
+            CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
+            RequirementMatch.create(event_id=1400, requirement_id=400)
+            EventParticipant.create(event_id=1400, user_id='zawn')
+            RequirementMatch.create(event_id=1401, requirement_id=400)
+            EventParticipant.create(event_id=1401, user_id='zawn')
+
+            attendedTerms = termsAttended(certification=400, username='zawn')
+            assert attendedTerms == ["Spring 2020", "Fall 2019"]
+
+            # created the database and added the test data to test the number of terms the student attended
+            Term.create(id = 1002, description = "Summer 2019", year = 2019, academicYear = 2019-2020, isSummer = True, isCurrentTerm = False, termOrder = 2019-2)
+            Event.create(id = 1402, term_id = 1002, name = "Event 3", description = "Summer 2019", program_id = 5)
+            RequirementMatch.create(event_id=1402, requirement_id=400)
+            EventParticipant.create(event_id=1402, user_id='zawn')
+
+            numberAttendedTerms = len(termsAttended(certification=400, username='zawn'))
+            assert numberAttendedTerms == 3
+            transaction.rollback()
+            
+@pytest.mark.integration
+def test_termsMissed():
+    # created the database and added the test data to test the maximum amount of terms a student can miss based on their class level
+
+    with mainDB.atomic() as transaction:
+        term = Term.select().where(Term.isCurrentTerm == True).get()
+        term.isCurrentTerm = False
+        term.save()
+
+        Term.create(id = 1000, description = "Fall 2019", year = 2019, academicYear = 2019-2020, isSummer = False, isCurrentTerm = True, termOrder = 2019-3)
+        Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Fall 2019", program_id = 5)
+        User.create(username='zawn', classLevel='Senior')  
+        CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
+
+        missedTerms = termsMissed(certification=1, username='zawn')
+        assert missedTerms == 7
+        transaction.rollback()
+
+    with mainDB.atomic() as transaction:
+        term = Term.select().where(Term.isCurrentTerm == True).get()
+        term.isCurrentTerm = False
+        term.save()
+
+        Term.create(id = 1000, description = "Summer 2022", year = 2022, academicYear = 2022-2023, isSummer = True, isCurrentTerm = True, termOrder = 2022-2)
+        Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Summer 2022", program_id = 5)
+        User.create(username='zawn', classLevel='Freshman')  
+        CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
+
+        missedTerms = termsMissed(certification=1, username='zawn')
+        assert missedTerms == 1
+        transaction.rollback()
+
+    with mainDB.atomic() as transaction:
+        term = Term.select().where(Term.isCurrentTerm == True).get()
+        term.isCurrentTerm = False
+        term.save()
+
+        Term.create(id = 1000, description = "Spring 2021", year = 2021, academicYear = 2020-2021, isSummer = False, isCurrentTerm = True, termOrder = 2021-1)
+        Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Spring 2021", program_id = 5)
+        User.create(username='zawn', classLevel='Senior')  
+        CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
+        
+        missedTerms = termsMissed(certification=1, username='zawn')
+        assert missedTerms == 8
+        transaction.rollback()
+
 @pytest.mark.integration
 def test_getCertRequirements():
     allRequirements = getCertRequirements()
@@ -26,6 +102,7 @@ def test_getCertRequirements():
     noRequirements = getCertRequirements(certification=1111)
     assert len(noRequirements) == 0
 
+
 @pytest.mark.integration
 def test_getCertRequirementsWithCompletion():
 

From fae60f9e0a4b7985fecc9dfa6f1499545a3499c4 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Mon, 21 Apr 2025 16:21:28 -0400
Subject: [PATCH 06/42] change the tooltips location, add an alternative
 message if no terms are attended and the term will only show if the admin is
 false

---
 app/templates/main/userProfile.html | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 8acf43c10..68c0d2af2 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -510,14 +510,15 @@ <h5>Notes</h5>
               <h5>Requirement Progress</h5>
               <ul>
               {% for req in bonnerRequirements %}
-                <li 
-                {% if req.frequency == "term"%}
-                  data-bs-toggle="tooltip" 
-                  data-bs-placement="top" 
-                  title="You have attended these terms: {% if req.attendedTerms %}{{ req.attendedDescriptions | join(', ') }}{% endif %}"
+                <li>
+                <span {% if req.frequency == "term"%}
+                data-bs-toggle="tooltip" 
+                data-bs-placement="top" 
+                title="{% if req.attendedTerms %}You have attended these terms: {{ req.attendedDescriptions | join(', ') }}{%else%} You haven't attended any terms {% endif %}"
                 {% endif %}>
-                {{req.name}}
-                {% if req.frequency == "term"%}
+                  {{req.name}}
+                </span>
+                {% if req.frequency == "term" and g.current_user.isCeltsAdmin == False %}
                   {% for a in range(req.missedTerms) %}
                     <span class="bi bi-x fs-3"></span>
                   {% endfor %}

From 7b2c64fcb1ff125fdcd3e5f87d9cc536c8cdd55c Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Mon, 21 Apr 2025 16:40:41 -0400
Subject: [PATCH 07/42] finding bug

---
 app/templates/main/userProfile.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 68c0d2af2..17e7f3dab 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -516,9 +516,9 @@ <h5>Requirement Progress</h5>
                 data-bs-placement="top" 
                 title="{% if req.attendedTerms %}You have attended these terms: {{ req.attendedDescriptions | join(', ') }}{%else%} You haven't attended any terms {% endif %}"
                 {% endif %}>
-                  {{req.name}}
+                  {{req.name}} {{volunteer.username}}
                 </span>
-                {% if req.frequency == "term" and g.current_user.isCeltsAdmin == False %}
+                {% if req.frequency == "term"%}
                   {% for a in range(req.missedTerms) %}
                     <span class="bi bi-x fs-3"></span>
                   {% endfor %}

From a2bc75f3ab6edc377bcc6d85004809f52823ee3e Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Mon, 21 Apr 2025 16:54:23 -0400
Subject: [PATCH 08/42] done

---
 app/templates/main/userProfile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 17e7f3dab..2d2bdae49 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -516,7 +516,7 @@ <h5>Requirement Progress</h5>
                 data-bs-placement="top" 
                 title="{% if req.attendedTerms %}You have attended these terms: {{ req.attendedDescriptions | join(', ') }}{%else%} You haven't attended any terms {% endif %}"
                 {% endif %}>
-                  {{req.name}} {{volunteer.username}}
+                  {{req.name}}
                 </span>
                 {% if req.frequency == "term"%}
                   {% for a in range(req.missedTerms) %}

From 2d3f126b9560e0c51657795ba39da3cf00891b1d Mon Sep 17 00:00:00 2001
From: Stevenson <michels@berea.edu>
Date: Wed, 23 Apr 2025 11:26:10 -0400
Subject: [PATCH 09/42] Made changes in code structure

---
 app/logic/certification.py       | 38 ++++++++++++++++++--------------
 tests/code/test_certification.py | 10 ++++-----
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index dd2bb5809..37a0d23ce 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -9,46 +9,50 @@
 
 def termsAttended(certification=None, username=None):
     '''
-    Function to differentiate retreived terms attended by a user for certification that has a frequency of term
+    Retrieve terms attended by a user for certification and filter them based on frequency of a term
     '''
     attendedTerms = []
+    
     if username:
-        attendance = (RequirementMatch
-                   .select()
-                   .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event))  # Join EventParticipant
-                   .where(RequirementMatch.requirement_id == certification)  # Filter by requirement_id
-                   .where(EventParticipant.user == username))  # Filter by user
-    for attend in range(len(attendance)):
-        attendedTerms.append(attendance[attend].event.term.description)
+        attendance = (RequirementMatch.select()
+                                      .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event)) 
+                                      .where(RequirementMatch.requirement_id == certification)  
+                                      .where(EventParticipant.user == username))  
+        
+    for termRecord in range(len(attendance)):
+        attendedTerms.append(attendance[termRecord].event.term.description)
+        
     return attendedTerms
             
 def termsMissed(certification=None, username=None): 
     '''
-    Function to hypothetically populated the maximum amount of certification a student can miss based on their class classification
+    Populate the maximum amount of certification a student can miss based on class classification
     '''
     classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
     currentTerm = Term.select(Term).where(Term.isCurrentTerm == True).get() 
+    
     # looking into a scenario where the current term is summer so that we can reassigned the current term variable to the next term
     if currentTerm.isSummer == True:
         current = f'Fall {currentTerm.year}'
         currentTerm = Term.select(Term).where(Term.description == current).get()
     else:
         current = currentTerm.description
+        
     for level in range(4):
-        userClass = User.select().where(User.username == username).get()
-        if userClass.classLevel == classLevel[level] and current == f'Spring {currentTerm.year}':
-            missedTerms = (level+1)*2
-        elif userClass.classLevel == classLevel[level]:
-            missedTerms = ((level+1)*2)-1
+        user = User.select().where(User.username == username).get()
+        
+        if user.classLevel == classLevel[level] and current == f'Spring {currentTerm.year}':
+            missedTerms = (level + 1) * 2
+        elif user.classLevel == classLevel[level]:
+            missedTerms = ((level + 1) * 2) - 1
+            
     attendedTerms = termsAttended(certification, username)
     missedTerms = missedTerms - len(attendedTerms)
     return missedTerms
 
-
 def getCertRequirementsWithCompletion(*, certification, username):
     """
-    Function to differentiate between simple requirements and requirements completion checking.
-    See: `getCertRequirements`
+    Differentiate between simple requirements and requirements completion checking.
     """
     return getCertRequirements(certification, username)
 
diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index 544425970..99ec37297 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -112,12 +112,12 @@ def test_getCertRequirementsWithCompletion():
         EventParticipant.create(event_id=14, user_id='ramsayb2')
         RequirementMatch.create(event_id=13, requirement_id=10)
         EventParticipant.create(event_id=13, user_id='ramsayb2')
-        cprcert = 3
+        cprCert = 3
 
-        cprreqs = getCertRequirementsWithCompletion(certification=cprcert, username='ramsayb2')
-        assert len(cprreqs) == 2
-        assert not cprreqs[0].completed, "The first event should not be completed"
-        assert cprreqs[1].completed, "The second event should be completed"
+        cprReqs = getCertRequirementsWithCompletion(certification=cprCert, username='ramsayb2')
+        assert len(cprReqs) == 2
+        assert not cprReqs[0].completed, "The first event should not be completed"
+        assert cprReqs[1].completed, "The second event should be completed"
 
         transaction.rollback()
 

From b757c69c7076dd6c03191bda1a1d642ce96b2eb7 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Thu, 24 Apr 2025 16:51:18 -0400
Subject: [PATCH 10/42] user current term is refactored as g.current_term and
 have hidden the bonner program accordion if the person who we click the user
 progile is not a student

---
 app/logic/certification.py          | 24 +++++++++++-------------
 app/static/js/userProfile.js        |  7 +++++--
 app/templates/main/userProfile.html | 18 ++++++++++--------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 37a0d23ce..608cabe6d 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -1,4 +1,5 @@
 from peewee import JOIN, DoesNotExist, Case
+from flask import g
 from app.models.event import Event
 from app.models.term import Term
 from app.models.certification import Certification
@@ -12,16 +13,13 @@ def termsAttended(certification=None, username=None):
     Retrieve terms attended by a user for certification and filter them based on frequency of a term
     '''
     attendedTerms = []
-    
     if username:
         attendance = (RequirementMatch.select()
                                       .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event)) 
                                       .where(RequirementMatch.requirement_id == certification)  
                                       .where(EventParticipant.user == username))  
-        
     for termRecord in range(len(attendance)):
         attendedTerms.append(attendance[termRecord].event.term.description)
-        
     return attendedTerms
             
 def termsMissed(certification=None, username=None): 
@@ -29,23 +27,23 @@ def termsMissed(certification=None, username=None):
     Populate the maximum amount of certification a student can miss based on class classification
     '''
     classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
-    currentTerm = Term.select(Term).where(Term.isCurrentTerm == True).get() 
-    
-    # looking into a scenario where the current term is summer so that we can reassigned the current term variable to the next term
+    currentTerm = g.current_term 
+    currentDescription = currentTerm.description
+    # looking into a scenario where the current term is summer so that we can reassigned the current term variable to the next term     
     if currentTerm.isSummer == True:
-        current = f'Fall {currentTerm.year}'
-        currentTerm = Term.select(Term).where(Term.description == current).get()
+        currentDescription = f'Fall {currentTerm.year}'
+        currentTerm = Term.select(Term).where(Term.description == currentDescription).get()
     else:
-        current = currentTerm.description
-        
+        currentDescription = currentTerm.description
+
     for level in range(4):
         user = User.select().where(User.username == username).get()
-        
-        if user.classLevel == classLevel[level] and current == f'Spring {currentTerm.year}':
+        if user.classLevel == classLevel[level] and currentDescription == f'Spring {currentTerm.year}':
             missedTerms = (level + 1) * 2
         elif user.classLevel == classLevel[level]:
             missedTerms = ((level + 1) * 2) - 1
-            
+        else:
+            missedTerms = 1
     attendedTerms = termsAttended(certification, username)
     missedTerms = missedTerms - len(attendedTerms)
     return missedTerms
diff --git a/app/static/js/userProfile.js b/app/static/js/userProfile.js
index b01890d0c..4d00b796e 100644
--- a/app/static/js/userProfile.js
+++ b/app/static/js/userProfile.js
@@ -220,7 +220,7 @@ $(document).ready(function(){
         reloadWithAccordion(target)
       }
     });
-});
+  });
 
   $(".deleteNoteButton").click(function() {
     let username = $(this).data('username')
@@ -331,7 +331,10 @@ $(document).ready(function(){
       },
     })
   });
-
+  const bonnerStudent = $("#bonnerStudent").data('username')
+  if (bonnerStudent === "False"){
+    $("#bonnerStudent").prop("hidden", true)
+  }
 });
 
 function updateManagers(el, volunteerUsername ){// retrieve the data of the student staff and program id if the boxes are checked or not
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 2d2bdae49..997f50e55 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -461,14 +461,15 @@ <h3 class="accordion-header" id="headingSeven">
 <!-- ################# Bonner Scholar ################ -->
   {% set canViewBonner = (g.current_user.isCeltsAdmin or g.current_user == volunteer) %}
   {% if volunteer.isBonnerScholar and canViewBonner %}
-  <div class="accordion-item">
-    <h3 class="accordion-header" id="headingEight">
-      {% set focus = "open" if visibleAccordion == "bonner" else "collapsed" %}
-      <button class="accordion-button {{focus}}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseEight" aria-expanded="false" aria-controls="collapseEight">Bonner Program</button>
-    </h3>
-    {% set show = "show" if visibleAccordion == "bonner" else "" %}
-    <div id="collapseEight" class="accordion-collapse collapse {{show}}" aria-labelledby="headingEight" data-bs-parent="#userProfile">
-      <div class="accordion-body container">
+  <div id="bonnerStudent" data-username="{{volunteer.isStudent}}">
+    <div class="accordion-item">
+      <h3 class="accordion-header" id="headingEight">
+        {% set focus = "open" if visibleAccordion == "bonner" else "collapsed" %}
+        <button class="accordion-button {{focus}}" type="button" data-bs-toggle="collapse" data-bs-target="#collapseEight" aria-expanded="false" aria-controls="collapseEight">Bonner Program</button>
+      </h3>
+      {% set show = "show" if visibleAccordion == "bonner" else "" %}
+      <div id="collapseEight" class="accordion-collapse collapse {{show}}" aria-labelledby="headingEight" data-bs-parent="#userProfile">
+        <div class="accordion-body container">
           <div class="row">
             <div class="col-md-6">
             {# Bonner Events #}
@@ -541,6 +542,7 @@ <h5>Requirement Progress</h5>
         </div>
       </div>
     </div>
+  </div>
   {% endif %}
 <!-- ################# Bonner Scholar ################ -->
 </div>

From f462772355a4a42e93aa8c88997fe7997ce34e1b Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Tue, 29 Apr 2025 16:55:20 -0400
Subject: [PATCH 11/42] The current term is updated to false and a new current
 term is created to fit the test case underneath the app.app_context()

---
 app/logic/certification.py       |  1 +
 tests/code/test_certification.py | 64 ++++++++++++++++----------------
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 608cabe6d..1e616e804 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -26,6 +26,7 @@ def termsMissed(certification=None, username=None):
     '''
     Populate the maximum amount of certification a student can miss based on class classification
     '''
+    sh = 0
     classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
     currentTerm = g.current_term 
     currentDescription = currentTerm.description
diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index 99ec37297..3ebd7ad03 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -1,6 +1,7 @@
 import pytest
+from flask import g
 from peewee import DoesNotExist
-
+from app import app
 from app.models import mainDB
 from app.models.event import Event
 from app.models.term import Term
@@ -12,6 +13,7 @@
 
 from app.logic.certification import getCertRequirements, updateCertRequirements, updateCertRequirementForEvent, termsAttended, termsMissed
 from app.logic.certification import getCertRequirementsWithCompletion
+from app.logic.loginManager import getCurrentTerm
 
 @pytest.mark.integration
 def test_termsAttended():
@@ -44,46 +46,42 @@ def test_termsAttended():
 @pytest.mark.integration
 def test_termsMissed():
     # created the database and added the test data to test the maximum amount of terms a student can miss based on their class level
-
+    
     with mainDB.atomic() as transaction:
-        term = Term.select().where(Term.isCurrentTerm == True).get()
-        term.isCurrentTerm = False
-        term.save()
-
-        Term.create(id = 1000, description = "Fall 2019", year = 2019, academicYear = 2019-2020, isSummer = False, isCurrentTerm = True, termOrder = 2019-3)
-        Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Fall 2019", program_id = 5)
-        User.create(username='zawn', classLevel='Senior')  
-        CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
-
-        missedTerms = termsMissed(certification=1, username='zawn')
+        with app.app_context():
+            Term.update(isCurrentTerm=False).execute()
+            Term.create(id = 1000, description = "Fall 2019", year = 2019, academicYear = 2019-2020, isSummer = False, isCurrentTerm = True, termOrder = 2019-3)
+            Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Fall 2019", program_id = 5)
+            User.create(username='zawn', classLevel='Senior')  
+            CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
+            g.current_term = getCurrentTerm()
+            missedTerms = termsMissed(certification=1, username='zawn')
         assert missedTerms == 7
         transaction.rollback()
-
+    
+    
     with mainDB.atomic() as transaction:
-        term = Term.select().where(Term.isCurrentTerm == True).get()
-        term.isCurrentTerm = False
-        term.save()
-
-        Term.create(id = 1000, description = "Summer 2022", year = 2022, academicYear = 2022-2023, isSummer = True, isCurrentTerm = True, termOrder = 2022-2)
-        Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Summer 2022", program_id = 5)
-        User.create(username='zawn', classLevel='Freshman')  
-        CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
-
-        missedTerms = termsMissed(certification=1, username='zawn')
+        with app.app_context():
+            Term.update(isCurrentTerm=False).execute()
+            Term.create(id = 1000, description = "Summer 2022", year = 2022, academicYear = 2022-2023, isSummer = True, isCurrentTerm = True, termOrder = 2022-2)
+            Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Summer 2022", program_id = 5)
+            User.create(username='zawn', classLevel='Freshman')  
+            CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
+            g.current_term = getCurrentTerm()
+            missedTerms = termsMissed(certification=1, username='zawn')
         assert missedTerms == 1
         transaction.rollback()
 
+     
     with mainDB.atomic() as transaction:
-        term = Term.select().where(Term.isCurrentTerm == True).get()
-        term.isCurrentTerm = False
-        term.save()
-
-        Term.create(id = 1000, description = "Spring 2021", year = 2021, academicYear = 2020-2021, isSummer = False, isCurrentTerm = True, termOrder = 2021-1)
-        Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Spring 2021", program_id = 5)
-        User.create(username='zawn', classLevel='Senior')  
-        CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
-        
-        missedTerms = termsMissed(certification=1, username='zawn')
+        with app.app_context():
+            Term.update(isCurrentTerm=False).execute()
+            Term.create(id = 1000, description = "Spring 2021", year = 2021, academicYear = 2020-2021, isSummer = False, isCurrentTerm = True, termOrder = 2021-1)
+            Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Spring 2021", program_id = 5)
+            User.create(username='zawn', classLevel='Senior')  
+            CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
+            g.current_term = getCurrentTerm()
+            missedTerms = termsMissed(certification=1, username='zawn')
         assert missedTerms == 8
         transaction.rollback()
 

From fbc32f6a0b971cf21b056c5503049bcb08251498 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Wed, 30 Apr 2025 16:48:05 -0400
Subject: [PATCH 12/42] merge conflicts and probnlem solved

---
 app/logic/certification.py       |  6 +++---
 tests/code/test_certification.py | 11 +++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 1e616e804..56a32a8c7 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -39,11 +39,11 @@ def termsMissed(certification=None, username=None):
 
     for level in range(4):
         user = User.select().where(User.username == username).get()
-        if user.classLevel == classLevel[level] and currentDescription == f'Spring {currentTerm.year}':
+        if user.rawClassLevel == classLevel[level] and currentDescription == f'Spring {currentTerm.year}':
             missedTerms = (level + 1) * 2
-        elif user.classLevel == classLevel[level]:
+        elif user.rawClassLevel == classLevel[level]:
             missedTerms = ((level + 1) * 2) - 1
-        else:
+        elif str(user.rawClassLevel) == "None":
             missedTerms = 1
     attendedTerms = termsAttended(certification, username)
     missedTerms = missedTerms - len(attendedTerms)
diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index 3ebd7ad03..dda245687 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -23,7 +23,7 @@ def test_termsAttended():
             Term.create(id = 1001, description = "Fall 2019", year = 2019, academicYear = 2019-2020, isSummer = False, isCurrentTerm = False, termOrder = 2019-3)
             Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Spring 2020", program_id = 5)
             Event.create(id = 1401, term_id = 1001, name = "Event 2", description = "Fall 2019", program_id = 5)
-            User.create(username='zawn', classLevel='Senior')  
+            User.create(username='zawn', rawClassLevel='Senior')  
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
             RequirementMatch.create(event_id=1400, requirement_id=400)
             EventParticipant.create(event_id=1400, user_id='zawn')
@@ -52,7 +52,7 @@ def test_termsMissed():
             Term.update(isCurrentTerm=False).execute()
             Term.create(id = 1000, description = "Fall 2019", year = 2019, academicYear = 2019-2020, isSummer = False, isCurrentTerm = True, termOrder = 2019-3)
             Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Fall 2019", program_id = 5)
-            User.create(username='zawn', classLevel='Senior')  
+            User.create(username='zawn', rawClassLevel='Senior')  
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
             g.current_term = getCurrentTerm()
             missedTerms = termsMissed(certification=1, username='zawn')
@@ -65,26 +65,25 @@ def test_termsMissed():
             Term.update(isCurrentTerm=False).execute()
             Term.create(id = 1000, description = "Summer 2022", year = 2022, academicYear = 2022-2023, isSummer = True, isCurrentTerm = True, termOrder = 2022-2)
             Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Summer 2022", program_id = 5)
-            User.create(username='zawn', classLevel='Freshman')  
+            User.create(username='zawn', rawClassLevel='Freshman')  
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
             g.current_term = getCurrentTerm()
             missedTerms = termsMissed(certification=1, username='zawn')
         assert missedTerms == 1
         transaction.rollback()
-
      
     with mainDB.atomic() as transaction:
         with app.app_context():
             Term.update(isCurrentTerm=False).execute()
             Term.create(id = 1000, description = "Spring 2021", year = 2021, academicYear = 2020-2021, isSummer = False, isCurrentTerm = True, termOrder = 2021-1)
             Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Spring 2021", program_id = 5)
-            User.create(username='zawn', classLevel='Senior')  
+            User.create(username='zawn', rawClassLevel='Senior')  
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
             g.current_term = getCurrentTerm()
             missedTerms = termsMissed(certification=1, username='zawn')
         assert missedTerms == 8
         transaction.rollback()
-
+        
 @pytest.mark.integration
 def test_getCertRequirements():
     allRequirements = getCertRequirements()

From bcdeffcce946b05ab2f6084164b30196d4482e72 Mon Sep 17 00:00:00 2001
From: Stevenson <michels@berea.edu>
Date: Thu, 1 May 2025 12:10:40 -0400
Subject: [PATCH 13/42] Fixed logic efficiency with set

---
 app/logic/certification.py       | 49 +++++++++++++++++++++-----------
 tests/code/test_certification.py | 12 ++++----
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 56a32a8c7..df62ea90c 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -24,12 +24,21 @@ def termsAttended(certification=None, username=None):
             
 def termsMissed(certification=None, username=None): 
     '''
-    Populate the maximum amount of certification a student can miss based on class classification
+    Calculate how many certification-eligible terms a student has missed based on their class level
+    and attendance record.
+
+    Logic:
+    - Each class level is expected to participate in 2 terms per year.
+    - If the user is currently in their final spring term (e.g., Spring of senior year), 
+      they are expected to have completed all terms: missedTerms = (level + 1) * 2.
+    - Otherwise, assume they’ve had one fewer term to attend: missedTerms = ((level + 1) * 2) - 1.
+    - If the user's classification is None, assume just 1 expected term.
+    - Subtract the number of terms the student has attended from the expected total to get the missed count.
     '''
-    sh = 0
     classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
     currentTerm = g.current_term 
     currentDescription = currentTerm.description
+    
     # looking into a scenario where the current term is summer so that we can reassigned the current term variable to the next term     
     if currentTerm.isSummer == True:
         currentDescription = f'Fall {currentTerm.year}'
@@ -45,8 +54,10 @@ def termsMissed(certification=None, username=None):
             missedTerms = ((level + 1) * 2) - 1
         elif str(user.rawClassLevel) == "None":
             missedTerms = 1
+            
     attendedTerms = termsAttended(certification, username)
     missedTerms = missedTerms - len(attendedTerms)
+    
     return missedTerms
 
 def getCertRequirementsWithCompletion(*, certification, username):
@@ -85,7 +96,7 @@ def getCertRequirements(certification=None, username=None):
 
         # we have to add the is not null check so that `cert.requirement` always exists
         reqList = reqList.where(Certification.id == certification, CertificationRequirement.id.is_null(False))
-        certs = []
+        certificationList = []
         for cert in reqList:
             if username:
                 cert.requirement.completed = bool(cert.__dict__['completed'])
@@ -94,25 +105,29 @@ def getCertRequirements(certification=None, username=None):
                     cert.requirement.missedTerms = termsMissed(cert.requirement.id, username)
                     cert.requirement.attendedTerms = len(termsAttended(cert.requirement.id, username))
                     cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
-            certs.append(cert.requirement)
+            certificationList.append(cert.requirement)
 
         # the .distinct() doesn't work efficiently, so we have to manually go through the list and removed duplicates that exist
-        newCerts = []
-        certsIndex = 0
-        for cert in certs:
-            if certs[certsIndex] not in newCerts:
-                newCerts.append(certs[certsIndex])
-            certsIndex += 1
-        certs = newCerts
-        return certs
+        validCertification = set()
+        certificationIndex = 0
+        
+        for cert in certificationList:
+            if certificationList[certificationIndex] not in validCertification:
+                validCertification.add(certificationList[certificationIndex])
+            certificationIndex += 1
+            
+        certificationList = list(validCertification)
+        
+        return certificationList
     
-    certs = {}
+    certificationDict = {}
     for cert in reqList:
-        if cert.id not in certs.keys():
-            certs[cert.id] = {"data": cert, "requirements": []}
+        if cert.id not in certificationDict.keys():
+            certificationDict[cert.id] = {"data": cert, "requirements": []}
         if getattr(cert, 'requirement', None):
-            certs[cert.id]["requirements"].append(cert.requirement)
-    return certs
+            certificationDict[cert.id]["requirements"].append(cert.requirement)
+            
+    return certificationDict
 
 def updateCertRequirements(certId, newRequirements):
     """
diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index dda245687..eb6a04bff 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -109,12 +109,13 @@ def test_getCertRequirementsWithCompletion():
         EventParticipant.create(event_id=14, user_id='ramsayb2')
         RequirementMatch.create(event_id=13, requirement_id=10)
         EventParticipant.create(event_id=13, user_id='ramsayb2')
+        
         cprCert = 3
-
         cprReqs = getCertRequirementsWithCompletion(certification=cprCert, username='ramsayb2')
+       
         assert len(cprReqs) == 2
-        assert not cprReqs[0].completed, "The first event should not be completed"
-        assert cprReqs[1].completed, "The second event should be completed"
+        assert cprReqs[0].completed, "The first event should be marked as completed"
+        assert not cprReqs[1].completed, "The second event should not be marked as completed"
 
         transaction.rollback()
 
@@ -169,9 +170,10 @@ def test_updateCertRequirements():
                  'required': False}
                 ]
         returnedIds = updateCertRequirements(otherId, newRequirements)
-        selectedIds = getCertRequirements(certification=otherId)
+        selectedIds = (getCertRequirements(certification=otherId))
+        fetchedIds = list(CertificationRequirement.select().where(CertificationRequirement.certification == otherId).order_by(CertificationRequirement.order))
         
-        assert selectedIds == list(CertificationRequirement.select().where(CertificationRequirement.certification == otherId).order_by(CertificationRequirement.order))
+        assert selectedIds == fetchedIds
         assert returnedIds == selectedIds
         assert returnedIds[1].name == "CPR 2"
         assert returnedIds[1].frequency == "once"

From 51de1ccc09b1f1bad6f8d6338dd9a917c69c6ebf Mon Sep 17 00:00:00 2001
From: Stevenson <michels@berea.edu>
Date: Fri, 2 May 2025 11:26:47 -0400
Subject: [PATCH 14/42] Fixed issues from test_certification.py

---
 app/logic/certification.py       |  5 ++++-
 tests/code/test_certification.py | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index df62ea90c..42b736b62 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -110,13 +110,16 @@ def getCertRequirements(certification=None, username=None):
         # the .distinct() doesn't work efficiently, so we have to manually go through the list and removed duplicates that exist
         validCertification = set()
         certificationIndex = 0
+        uniqueCertification = []
         
         for cert in certificationList:
             if certificationList[certificationIndex] not in validCertification:
                 validCertification.add(certificationList[certificationIndex])
+                uniqueCertification.append(certificationList[certificationIndex])
+                
             certificationIndex += 1
             
-        certificationList = list(validCertification)
+        certificationList = uniqueCertification
         
         return certificationList
     
diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index eb6a04bff..e54ee71c6 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -114,8 +114,8 @@ def test_getCertRequirementsWithCompletion():
         cprReqs = getCertRequirementsWithCompletion(certification=cprCert, username='ramsayb2')
        
         assert len(cprReqs) == 2
-        assert cprReqs[0].completed, "The first event should be marked as completed"
-        assert not cprReqs[1].completed, "The second event should not be marked as completed"
+        assert not cprReqs[0].completed, "The first event should not be marked as completed"
+        assert cprReqs[1].completed, "The second event should be marked as completed"
 
         transaction.rollback()
 
@@ -170,8 +170,12 @@ def test_updateCertRequirements():
                  'required': False}
                 ]
         returnedIds = updateCertRequirements(otherId, newRequirements)
-        selectedIds = (getCertRequirements(certification=otherId))
+        selectedIds = getCertRequirements(certification=otherId)
+        print("Selected IDs: ", selectedIds)
+        print("Returned IDs: ", returnedIds)
         fetchedIds = list(CertificationRequirement.select().where(CertificationRequirement.certification == otherId).order_by(CertificationRequirement.order))
+        print("Fetched IDs: ", fetchedIds)
+        
         
         assert selectedIds == fetchedIds
         assert returnedIds == selectedIds

From 3082d377cc6fb6b3cc60ef46eb26b599a4686ca7 Mon Sep 17 00:00:00 2001
From: Stevenson <michels@berea.edu>
Date: Fri, 2 May 2025 11:34:59 -0400
Subject: [PATCH 15/42] removed print statements

---
 tests/code/test_certification.py          | 4 ----
 tests/code/test_serviceLearningCourses.py | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index e54ee71c6..b3dff93a5 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -171,11 +171,7 @@ def test_updateCertRequirements():
                 ]
         returnedIds = updateCertRequirements(otherId, newRequirements)
         selectedIds = getCertRequirements(certification=otherId)
-        print("Selected IDs: ", selectedIds)
-        print("Returned IDs: ", returnedIds)
         fetchedIds = list(CertificationRequirement.select().where(CertificationRequirement.certification == otherId).order_by(CertificationRequirement.order))
-        print("Fetched IDs: ", fetchedIds)
-        
         
         assert selectedIds == fetchedIds
         assert returnedIds == selectedIds
diff --git a/tests/code/test_serviceLearningCourses.py b/tests/code/test_serviceLearningCourses.py
index 4bed069b4..89045c4f1 100644
--- a/tests/code/test_serviceLearningCourses.py
+++ b/tests/code/test_serviceLearningCourses.py
@@ -126,8 +126,8 @@ def test_courseManagement():
         assert importedCourse in getImportedCourses(termId)
         assert unapprovedList[courseindex].instructors == " Brian Ramsay, Zach Neill"
 
-
         transaction.rollback()
+        
 @pytest.mark.integration
 def test_withdrawProposal():
     '''creates a test course with all foreign key fields. tests if they can

From 802f172f37b9e6ef06713c7675400902efcf2566 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Tue, 23 Sep 2025 19:35:26 -0400
Subject: [PATCH 16/42] placing change for tick

---
 app/templates/main/userProfile.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index bbbffae1e..c821e7b3f 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -496,12 +496,12 @@ <h5>Requirement Progress</h5>
                   {{req.name}}
                 </span>
                 {% if req.frequency == "term"%}
-                  {% for a in range(req.missedTerms) %}
-                    <span class="bi bi-x fs-3"></span>
-                  {% endfor %}
                   {% for i in range(req.attendedTerms) %}
                   <span class="bi bi-check fs-3 text-success"></span>
                   {% endfor %}
+                  {% for a in range(req.missedTerms) %}
+                    <span class="bi bi-x fs-3"></span>
+                  {% endfor %}
                 {% elif req.completed %}
                   <span class="bi bi-check fs-3 text-success"></span>
                 {% elif req.completed == False and req.frequency == "once" %}

From 135f65fdcb74735b60881e8b259c80fc9738e0c1 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Sat, 27 Sep 2025 18:51:23 -0400
Subject: [PATCH 17/42] userprofile

---
 app/templates/main/userProfile.html | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index c821e7b3f..9d66fecf6 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -494,22 +494,22 @@ <h5>Requirement Progress</h5>
                 title="{% if req.attendedTerms %}You have attended these terms: {{ req.attendedDescriptions | join(', ') }}{%else%} You haven't attended any terms {% endif %}"
                 {% endif %}>
                   {{req.name}}
+                  {% if req.frequency == "term"%}
+                    {% for i in range(req.attendedTerms) %}
+                    <span class="bi bi-check fs-3 text-success"></span>
+                    {% endfor %}
+                    {% for a in range(req.missedTerms) %}
+                      <span class="bi bi-x fs-3 "></span>
+                    {% endfor %}
+                    {% elif req.completed %}
+                      <span class="bi bi-check fs-3 text-success "></span>
+                  {% elif req.completed == False and req.frequency == "once" %}
+                      <span class="bi bi-x fs-3 "></span>
+                  {% elif req.completed == False and req.frequency == "twice" %}
+                        <span class="bi bi-x fs-3 "></span>
+                        <span class="bi bi-x fs-3 "></span>
+                  {% endif %}
                 </span>
-                {% if req.frequency == "term"%}
-                  {% for i in range(req.attendedTerms) %}
-                  <span class="bi bi-check fs-3 text-success"></span>
-                  {% endfor %}
-                  {% for a in range(req.missedTerms) %}
-                    <span class="bi bi-x fs-3"></span>
-                  {% endfor %}
-                {% elif req.completed %}
-                  <span class="bi bi-check fs-3 text-success"></span>
-                {% elif req.completed == False and req.frequency == "once" %}
-                  <span class="bi bi-x fs-3"></span>
-                {% elif req.completed == False and req.frequency == "twice" %}
-                    <span class="bi bi-x fs-3"></span>
-                    <span class="bi bi-x fs-3"></span>
-                {% endif %}
                 </li>
               {% endfor %}
               </ul>

From 61c57f9174e76691243a162440c7d74724c9df40 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Tue, 30 Sep 2025 18:41:40 -0400
Subject: [PATCH 18/42] stashing

---
 app/logic/volunteerSpreadsheet.py   | 3 ++-
 app/templates/main/userProfile.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/logic/volunteerSpreadsheet.py b/app/logic/volunteerSpreadsheet.py
index 6a03ca6ac..2db0324eb 100644
--- a/app/logic/volunteerSpreadsheet.py
+++ b/app/logic/volunteerSpreadsheet.py
@@ -195,7 +195,8 @@ def getRetentionRate(academicYear):
 
 def termParticipation(term):
     base = getBaseQuery(term.academicYear)
-
+    print("see", base)
+    
     participationQuery = (base.select(Event.program, EventParticipant.user_id.alias('participant'), Program.programName.alias("programName"))
                           .where(Event.term == term)
                           .order_by(EventParticipant.user))
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 9d66fecf6..112ba837d 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -496,7 +496,7 @@ <h5>Requirement Progress</h5>
                   {{req.name}}
                   {% if req.frequency == "term"%}
                     {% for i in range(req.attendedTerms) %}
-                    <span class="bi bi-check fs-3 text-success"></span>
+                    <span class="bi bi-check fs-3  text-success"></span>
                     {% endfor %}
                     {% for a in range(req.missedTerms) %}
                       <span class="bi bi-x fs-3 "></span>

From a3be1e2e3e11a2028d8300e869a83e92f8f0c2f9 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Mon, 13 Oct 2025 19:28:56 -0400
Subject: [PATCH 19/42] remove print statement

---
 app/logic/volunteerSpreadsheet.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/logic/volunteerSpreadsheet.py b/app/logic/volunteerSpreadsheet.py
index 2db0324eb..f75d58fff 100644
--- a/app/logic/volunteerSpreadsheet.py
+++ b/app/logic/volunteerSpreadsheet.py
@@ -195,7 +195,6 @@ def getRetentionRate(academicYear):
 
 def termParticipation(term):
     base = getBaseQuery(term.academicYear)
-    print("see", base)
     
     participationQuery = (base.select(Event.program, EventParticipant.user_id.alias('participant'), Program.programName.alias("programName"))
                           .where(Event.term == term)

From 12392c922f68d673f7cd3a70aea31c335758e01d Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Thu, 6 Nov 2025 18:03:55 -0500
Subject: [PATCH 20/42] still working on bonner checkmark profile

---
 app/static/js/userProfile.js        | 65 +++++++++++++++++++----------
 app/templates/main/userProfile.html | 38 ++++++++++++-----
 2 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/app/static/js/userProfile.js b/app/static/js/userProfile.js
index baf1f782c..5753d59e3 100644
--- a/app/static/js/userProfile.js
+++ b/app/static/js/userProfile.js
@@ -1,6 +1,6 @@
 $(document).ready(function(){
 
-   $("#checkDietRestriction").on("change",  function() {
+  $("#checkDietRestriction").on("change",  function() {
     let norestrict = $(this).is(':checked');
     if (norestrict) {
         $("#dietContainer").hide();
@@ -35,17 +35,17 @@ $(document).ready(function(){
     });
   })
 
-  var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
-  var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
-    return new bootstrap.Tooltip(tooltipTriggerEl)
-  })
+  // var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
+  // var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
+  //   return new bootstrap.Tooltip(tooltipTriggerEl)
+  // })
   
-  $("#printButton").on("click", function() {
-        let username = $(this).data('username')
-        printDocument(`/profile/${username}/travelForm`)
-      })
-  $("#actions").on("change", changeAction)
-  $("#phoneInput").inputmask('(999)-999-9999');
+  // $("#printButton").on("click", function() {
+  //       let username = $(this).data('username')
+  //       printDocument(`/profile/${username}/travelForm`)
+  //     })
+  // $("#actions").on("change", changeAction)
+  // $("#phoneInput").inputmask('(999)-999-9999');
   $(".notifyInput").click(function updateInterest(){
     var programID = $(this).data("programid");
     var username = $(this).data('username');
@@ -228,6 +228,7 @@ $(document).ready(function(){
   });
   });
 
+
   $(".deleteNoteButton").click(function() {
     let username = $(this).data('username')
     let noteid = $(this).data('noteid')
@@ -319,16 +320,36 @@ $(document).ready(function(){
   });
 
   // Popover functionality
-  var requiredTraining = $(".trainingPopover");
-  requiredTraining.popover({
-      trigger: "hover",
-      sanitize: false,
-      html: true,
-      content: function() {
-          return $(this).attr('data-content');
-      }
+  // var requiredTraining = $(".trainingPopover");
+  // requiredTraining.popover({
+  //     trigger: "hover",
+  //     sanitize: false,
+  //     html: true,
+  //     content: function() {
+  //         return $(this).attr('data-content');
+  //     }
+  // });
+  $(function () {
+    $('.trainingPopover').each(function () {
+      new bootstrap.Popover(this, {
+        trigger: 'hover focus',
+        html: true,
+        sanitize: false,
+        placement: 'right',
+      });
+    });
   });
- 
+  $(function () {
+    $('.bonnerCheckmark').each(function () {
+      new bootstrap.Popover(this, {
+        trigger: 'hover focus',
+        html: true,
+        sanitize: false,
+        placement: 'right',
+      });
+    });
+  });
+
   setupPhoneNumber("#updatePhone", "#phoneInput")
 
   // Dietary Restrictions
@@ -369,8 +390,7 @@ $(document).ready(function(){
   const bonnerStudent = $("#bonnerStudent").data('username')
   if (bonnerStudent === "False"){
     $("#bonnerStudent").prop("hidden", true)
-  }
-}); // end document.ready()
+  }; // end document.ready()
 
 // Update program manager status
 function updateManagers(el, volunteerUsername ) {
@@ -401,3 +421,4 @@ function updateManagers(el, volunteerUsername ) {
       }
   })
 }
+
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 112ba837d..ea3ef7c69 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -5,6 +5,7 @@
   {{super()}}
   <script type="text/javascript" src="{{url_for('static', filename='js/userProfile.js') }}?u={{lastStaticUpdate}}"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
 {% endblock %}
 
 {% block styles %}
@@ -488,29 +489,44 @@ <h5>Requirement Progress</h5>
               <ul>
               {% for req in bonnerRequirements %}
                 <li>
-                <span {% if req.frequency == "term"%}
-                data-bs-toggle="tooltip" 
-                data-bs-placement="top" 
-                title="{% if req.attendedTerms %}You have attended these terms: {{ req.attendedDescriptions | join(', ') }}{%else%} You haven't attended any terms {% endif %}"
-                {% endif %}>
+                <span>
                   {{req.name}}
                   {% if req.frequency == "term"%}
-                    {% for i in range(req.attendedTerms) %}
+                    {% set totalTerms = req.attendedTerms + req.missedTerms%}
+                    {% set attendedCount = req.attendedTerms %}
+                    <span>({{attendedCount}}/{{totalTerms}})</span> 
+                    <!-- {% for i in range(req.attendedTerms) %}
                     <span class="bi bi-check fs-3  text-success"></span>
                     {% endfor %}
                     {% for a in range(req.missedTerms) %}
                       <span class="bi bi-x fs-3 "></span>
-                    {% endfor %}
+                    {% endfor %} -->
                     {% elif req.completed %}
-                      <span class="bi bi-check fs-3 text-success "></span>
+                      <span>(1/1)</span> 
                   {% elif req.completed == False and req.frequency == "once" %}
-                      <span class="bi bi-x fs-3 "></span>
+                      <span>(0/1)</span> 
                   {% elif req.completed == False and req.frequency == "twice" %}
-                        <span class="bi bi-x fs-3 "></span>
-                        <span class="bi bi-x fs-3 "></span>
+                      <span>(0/2)</span> 
                   {% endif %}
                 </span>
+                {% if req.attendedTerms %}
+                  {% set popover_text = "You have attended these terms: " ~ (req.attendedDescriptions | join(', ')) %}
+                {% else %}
+                  {% set popover_text = "You haven't attended any terms" %}
+                {% endif %}
+                <a
+                  href="#"
+                  type="button"
+                  class="bonnerCheckmark btn btn-link btn-sm"
+                  data-bs-container="body"
+                  data-bs-toggle="popover"
+                  data-bs-placement="right"
+                  data-bs-content="{{ popover_text | e }}"
+                >
+                  View
+                </a>         
                 </li>
+                </br>
               {% endfor %}
               </ul>
             </div>

From bfce623ba439194fde7a91d5341b9dab98395b31 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Fri, 7 Nov 2025 18:30:42 -0500
Subject: [PATCH 21/42] worked on test suite, new function created jinja
 template

---
 app/logic/certification.py          | 73 ++++++++++++++++++-----------
 app/templates/main/userProfile.html | 54 ++++++++++++++++-----
 tests/code/test_certification.py    | 31 +++++++-----
 3 files changed, 105 insertions(+), 53 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 42b736b62..59dadd2e7 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -1,4 +1,4 @@
-from peewee import JOIN, DoesNotExist, Case
+from peewee import JOIN, fn, DoesNotExist, Case
 from flask import g
 from app.models.event import Event
 from app.models.term import Term
@@ -7,11 +7,13 @@
 from app.models.requirementMatch import RequirementMatch
 from app.models.eventParticipant import EventParticipant
 from app.models.user import User
-
+import math
 def termsAttended(certification=None, username=None):
     '''
     Retrieve terms attended by a user for certification and filter them based on frequency of a term
     '''
+    if certification is None or username is None:
+        return 
     attendedTerms = []
     if username:
         attendance = (RequirementMatch.select()
@@ -19,46 +21,51 @@ def termsAttended(certification=None, username=None):
                                       .where(RequirementMatch.requirement_id == certification)  
                                       .where(EventParticipant.user == username))  
     for termRecord in range(len(attendance)):
-        attendedTerms.append(attendance[termRecord].event.term.description)
-    return attendedTerms
+        if not attendance[termRecord].event.term.description.startswith("Summer"):
+            attendedTerms.append(attendance[termRecord].event.term.description)
+    return list(set(attendedTerms))
             
 def termsMissed(certification=None, username=None): 
     '''
     Calculate how many certification-eligible terms a student has missed based on their class level
     and attendance record.
+    '''
+    if certification is None or username is None:
+        return
+    totalTerms = termsInTotal(certification, username)   
+    attendedTerms = termsAttended(certification, username)
+    missedTerms = [term for term in totalTerms if term not in attendedTerms]
+    return missedTerms
 
-    Logic:
-    - Each class level is expected to participate in 2 terms per year.
-    - If the user is currently in their final spring term (e.g., Spring of senior year), 
-      they are expected to have completed all terms: missedTerms = (level + 1) * 2.
-    - Otherwise, assume they’ve had one fewer term to attend: missedTerms = ((level + 1) * 2) - 1.
-    - If the user's classification is None, assume just 1 expected term.
-    - Subtract the number of terms the student has attended from the expected total to get the missed count.
+def termsInTotal(certification=None, username=None):
     '''
-    classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
+    Calculate total terms based on attended and missed terms for a user
+    '''
+    if certification is None or username is None:
+        return 
     currentTerm = g.current_term 
+    totalTerms = []
     currentDescription = currentTerm.description
-    
     # looking into a scenario where the current term is summer so that we can reassigned the current term variable to the next term     
     if currentTerm.isSummer == True:
         currentDescription = f'Fall {currentTerm.year}'
         currentTerm = Term.select(Term).where(Term.description == currentDescription).get()
     else:
         currentDescription = currentTerm.description
-
-    for level in range(4):
-        user = User.select().where(User.username == username).get()
-        if user.rawClassLevel == classLevel[level] and currentDescription == f'Spring {currentTerm.year}':
-            missedTerms = (level + 1) * 2
-        elif user.rawClassLevel == classLevel[level]:
-            missedTerms = ((level + 1) * 2) - 1
+    classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
+    user = User.select().where(User.username == username).get()
+    for level, name in enumerate(classLevel):
+        if user.rawClassLevel == name:
+            totalTermsNumber = (level + 1) * 2
+            if currentDescription != f"Spring {currentTerm.year}":
+                totalTermsNumber -= 1
+            for term in range(totalTermsNumber):
+                year = currentTerm.year - (level - (term // 2))
+                season = "Fall" if term % 2 == 0 else "Spring"
+                totalTerms.append(f"{season} {year}")
         elif str(user.rawClassLevel) == "None":
-            missedTerms = 1
-            
-    attendedTerms = termsAttended(certification, username)
-    missedTerms = missedTerms - len(attendedTerms)
-    
-    return missedTerms
+            totalTerms = 1
+    return totalTerms
 
 def getCertRequirementsWithCompletion(*, certification, username):
     """
@@ -102,8 +109,20 @@ def getCertRequirements(certification=None, username=None):
                 cert.requirement.completed = bool(cert.__dict__['completed'])
                 # this is to get the calculation when it comes to events with term as their frequency
                 if cert.requirement.frequency == "term":
-                    cert.requirement.missedTerms = termsMissed(cert.requirement.id, username)
+                    cert.requirement.missedTerms = len(termsMissed(cert.requirement.id, username))
+                    cert.requirement.attendedTerms = len(termsAttended(cert.requirement.id, username))
+                    cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
+                    cert.requirement.missedDescriptions = termsMissed(cert.requirement.id, username)
+                    cert.requirement.totalTerms = len(termsInTotal(cert.requirement.id, username))
+                elif cert.requirement.frequency == "twice":
                     cert.requirement.attendedTerms = len(termsAttended(cert.requirement.id, username))
+                    cert.requirement.missedTerms = max(0, 2 - cert.requirement.attendedTerms)
+                    cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
+                    cert.requirement.missedDescriptions = ([termsMissed(cert.requirement.id, username)[0], termsMissed(cert.requirement.id, username)[1]])
+                elif cert.requirement.frequency == "annual":
+                    totalTerms = len(termsInTotal(cert.requirement.id, username))
+                    cert.requirement.attendedAnnual = len(termsAttended(cert.requirement.id, username))
+                    cert.requirement.totalAnnual = int(math.floor(totalTerms/2+0.5)) if totalTerms % 2 == 1  else totalTerms/2
                     cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
             certificationList.append(cert.requirement)
 
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index ea3ef7c69..d07870125 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -492,27 +492,55 @@ <h5>Requirement Progress</h5>
                 <span>
                   {{req.name}}
                   {% if req.frequency == "term"%}
-                    {% set totalTerms = req.attendedTerms + req.missedTerms%}
                     {% set attendedCount = req.attendedTerms %}
-                    <span>({{attendedCount}}/{{totalTerms}})</span> 
-                    <!-- {% for i in range(req.attendedTerms) %}
-                    <span class="bi bi-check fs-3  text-success"></span>
-                    {% endfor %}
-                    {% for a in range(req.missedTerms) %}
-                      <span class="bi bi-x fs-3 "></span>
-                    {% endfor %} -->
-                    {% elif req.completed %}
+                    <span>({{attendedCount}}/{{req.totalTerms}})</span> 
+                  {% elif req.frequency == "twice" %}
+                    <span>({{req.attendedTerms}}/2)</span> 
+                  {% elif req.completed == True and req.frequency == "once" %}
                       <span>(1/1)</span> 
                   {% elif req.completed == False and req.frequency == "once" %}
                       <span>(0/1)</span> 
-                  {% elif req.completed == False and req.frequency == "twice" %}
-                      <span>(0/2)</span> 
+                  {% elif req.frequency == "annual" %}
+                      <span>({{req.attendedAnnual}}/{{req.totalAnnual}})</span>
                   {% endif %}
                 </span>
                 {% if req.attendedTerms %}
-                  {% set popover_text = "You have attended these terms: " ~ (req.attendedDescriptions | join(', ')) %}
+                  {% if req.attendedDescriptions|length > 0 or req.missedDescriptions|length > 0 %}
+                    {% set popover_text = "" %}
+                    {% if req.attendedDescriptions|length > 0 %}
+                      {% set popover_text = popover_text ~ "Attended: <br>" ~ (req.attendedDescriptions | join(', ')) %}
+                    {% else %}
+                      {% set popover_text = popover_text ~ "Attended: None<br>" %}
+                    {% endif %}
+                    {% if req.missedDescriptions|length > 0 %}
+                      {% set popover_text = popover_text ~ "<br>Missed:<br>" ~ (req.missedDescriptions | join(', ')) %}
+                    {% else %}
+                      {% set popover_text = popover_text ~ "<br>Missed: None" %}
+                    {% endif %}
+                  {% else %}
+                    {% set popover_text = "You haven’t attended any terms yet." %}
+                  {% endif %}
+                {% elif req.frequency == "once" and req.completed %}
+                  {% set popover_text = "You have attended the certification." %}
+
+                {% elif req.frequency == "once" and not req.completed %}
+                  {% set popover_text = "You have not attended the certification." %}
+
+                {% elif req.frequency == "twice" and req.completed %}
+                  {% set popover_text = "You have attended the certification twice." %}
+
+                {% elif req.frequency == "twice" and not req.completed %}
+                  {% set popover_text = "You have not attended the certification twice." %}
+
+                {% elif req.frequency == "annual" %}
+                  {% if req.attendedDescriptions|length > 0 %}
+                    {% set popover_text = "Attended: <br>" ~ (req.attendedDescriptions | join(', ')) %}
+                  {% else %}
+                    {% set popover_text = "No annual certifications attended yet." %}
+                  {% endif %}
+
                 {% else %}
-                  {% set popover_text = "You haven't attended any terms" %}
+                  {% set popover_text = "No certification attendance data available." %}
                 {% endif %}
                 <a
                   href="#"
diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index b3dff93a5..7f01b453f 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -19,10 +19,11 @@
 def test_termsAttended():
     with mainDB.atomic() as transaction:
             # created the database and added the test data to test what terms are return from attendedTerms()
+        with app.app_context():
             Term.create(id = 1000, description = "Spring 2020", year = 2020, academicYear = 2019-2020, isSummer = False, isCurrentTerm = True, termOrder = 2020-1)
             Term.create(id = 1001, description = "Fall 2019", year = 2019, academicYear = 2019-2020, isSummer = False, isCurrentTerm = False, termOrder = 2019-3)
             Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Spring 2020", program_id = 5)
-            Event.create(id = 1401, term_id = 1001, name = "Event 2", description = "Fall 2019", program_id = 5)
+            Event.create(id = 1401, term_id = 1001, name = "Event 2", description = "Spring 2019", program_id = 5)
             User.create(username='zawn', rawClassLevel='Senior')  
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
             RequirementMatch.create(event_id=1400, requirement_id=400)
@@ -30,18 +31,22 @@ def test_termsAttended():
             RequirementMatch.create(event_id=1401, requirement_id=400)
             EventParticipant.create(event_id=1401, user_id='zawn')
 
-            attendedTerms = termsAttended(certification=400, username='zawn')
-            assert attendedTerms == ["Spring 2020", "Fall 2019"]
+            attendedTermsNum = len(termsAttended(certification=400, username='zawn'))
+            assert attendedTermsNum == 2
+            transaction.rollback()
 
-            # created the database and added the test data to test the number of terms the student attended
+    with mainDB.atomic() as transaction:
+        with app.app_context():
+            # created the database and added the test data to test terms the student attended
             Term.create(id = 1002, description = "Summer 2019", year = 2019, academicYear = 2019-2020, isSummer = True, isCurrentTerm = False, termOrder = 2019-2)
             Event.create(id = 1402, term_id = 1002, name = "Event 3", description = "Summer 2019", program_id = 5)
+            User.create(username='zawn', rawClassLevel='Senior')  
+            CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
             RequirementMatch.create(event_id=1402, requirement_id=400)
             EventParticipant.create(event_id=1402, user_id='zawn')
-
-            numberAttendedTerms = len(termsAttended(certification=400, username='zawn'))
-            assert numberAttendedTerms == 3
-            transaction.rollback()
+            attendedTerms = termsAttended(certification=400, username='zawn')
+        assert attendedTerms == []
+        transaction.rollback()
             
 @pytest.mark.integration
 def test_termsMissed():
@@ -56,8 +61,8 @@ def test_termsMissed():
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
             g.current_term = getCurrentTerm()
             missedTerms = termsMissed(certification=1, username='zawn')
-        assert missedTerms == 7
-        transaction.rollback()
+            assert missedTerms == ['Fall 2016', 'Spring 2016', 'Fall 2017', 'Spring 2017', 'Fall 2018', 'Spring 2018', 'Fall 2019']
+            transaction.rollback()
     
     
     with mainDB.atomic() as transaction:
@@ -69,7 +74,7 @@ def test_termsMissed():
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
             g.current_term = getCurrentTerm()
             missedTerms = termsMissed(certification=1, username='zawn')
-        assert missedTerms == 1
+        assert missedTerms == ["Fall 2022"]
         transaction.rollback()
      
     with mainDB.atomic() as transaction:
@@ -81,7 +86,7 @@ def test_termsMissed():
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
             g.current_term = getCurrentTerm()
             missedTerms = termsMissed(certification=1, username='zawn')
-        assert missedTerms == 8
+        assert missedTerms == ['Fall 2018', 'Spring 2018', 'Fall 2019', 'Spring 2019', 'Fall 2020', 'Spring 2020', 'Fall 2021', 'Spring 2021']
         transaction.rollback()
         
 @pytest.mark.integration
@@ -94,7 +99,7 @@ def test_getCertRequirements():
     assert ["Volunteer Training", "CPR Training"] == [r.name for r in cpr]
 
     bonner = getCertRequirements(certification=Certification.BONNER)
-    assert len(bonner) == 9
+    assert len(bonner) == 10
 
     noRequirements = getCertRequirements(certification=1111)
     assert len(noRequirements) == 0

From 5e5858cda78cbaefe5bb573ca09e486aed971b1b Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Tue, 11 Nov 2025 15:05:01 -0500
Subject: [PATCH 22/42] new changes and logic'

---
 app/logic/certification.py       |  66 +++++++++---------
 tests/code/test_certification.py | 114 ++++++++++++++++++++-----------
 2 files changed, 111 insertions(+), 69 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 59dadd2e7..10e6dbcf6 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -13,7 +13,7 @@ def termsAttended(certification=None, username=None):
     Retrieve terms attended by a user for certification and filter them based on frequency of a term
     '''
     if certification is None or username is None:
-        return 
+        return None
     attendedTerms = []
     if username:
         attendance = (RequirementMatch.select()
@@ -21,8 +21,10 @@ def termsAttended(certification=None, username=None):
                                       .where(RequirementMatch.requirement_id == certification)  
                                       .where(EventParticipant.user == username))  
     for termRecord in range(len(attendance)):
-        if not attendance[termRecord].event.term.description.startswith("Summer"):
+        if not attendance[termRecord].event.term.isSummer:
             attendedTerms.append(attendance[termRecord].event.term.description)
+    totalTerms = termsInTotal(username)
+    attendedTerms = [term for term in attendedTerms if term in totalTerms]
     return list(set(attendedTerms))
             
 def termsMissed(certification=None, username=None): 
@@ -31,42 +33,44 @@ def termsMissed(certification=None, username=None):
     and attendance record.
     '''
     if certification is None or username is None:
-        return
-    totalTerms = termsInTotal(certification, username)   
+        return None
+    totalTerms = termsInTotal(username)   
     attendedTerms = termsAttended(certification, username)
     missedTerms = [term for term in totalTerms if term not in attendedTerms]
     return missedTerms
 
-def termsInTotal(certification=None, username=None):
-    '''
-    Calculate total terms based on attended and missed terms for a user
-    '''
-    if certification is None or username is None:
-        return 
-    currentTerm = g.current_term 
-    totalTerms = []
-    currentDescription = currentTerm.description
-    # looking into a scenario where the current term is summer so that we can reassigned the current term variable to the next term     
-    if currentTerm.isSummer == True:
-        currentDescription = f'Fall {currentTerm.year}'
-        currentTerm = Term.select(Term).where(Term.description == currentDescription).get()
-    else:
-        currentDescription = currentTerm.description
-    classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
+def termsInTotal(username=None):
+    if username is None:
+        return None
+    currentTerm = g.current_term
+    currentDesc = currentTerm.description 
+    if currentTerm.isSummer:
+        currentDesc = f"Fall {currentTerm.year}"
     user = User.select().where(User.username == username).get()
+    classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
+    totalTerms = []
     for level, name in enumerate(classLevel):
         if user.rawClassLevel == name:
-            totalTermsNumber = (level + 1) * 2
-            if currentDescription != f"Spring {currentTerm.year}":
-                totalTermsNumber -= 1
-            for term in range(totalTermsNumber):
-                year = currentTerm.year - (level - (term // 2))
-                season = "Fall" if term % 2 == 0 else "Spring"
+            totalTermsCount = (level + 1) * 2
+            if currentDesc.startswith("Fall"):
+                totalTermsCount -= 1  
+            if currentDesc.startswith("Spring"):
+                startYear = currentTerm.year - level - 1
+            else:  
+                startYear = currentTerm.year - level
+            for k in range(totalTermsCount):
+                if k % 2 == 0:  
+                    season = "Fall"
+                    year = startYear + (k // 2)
+                else:           
+                    season = "Spring"
+                    year = startYear + (k // 2) + 1
                 totalTerms.append(f"{season} {year}")
-        elif str(user.rawClassLevel) == "None":
-            totalTerms = 1
+            break  
     return totalTerms
 
+
+
 def getCertRequirementsWithCompletion(*, certification, username):
     """
     Differentiate between simple requirements and requirements completion checking.
@@ -107,20 +111,20 @@ def getCertRequirements(certification=None, username=None):
         for cert in reqList:
             if username:
                 cert.requirement.completed = bool(cert.__dict__['completed'])
-                # this is to get the calculation when it comes to events with term as their frequency
+                # this is to get the calculation when it comes to events with term, twice, annual as their frequency
                 if cert.requirement.frequency == "term":
                     cert.requirement.missedTerms = len(termsMissed(cert.requirement.id, username))
                     cert.requirement.attendedTerms = len(termsAttended(cert.requirement.id, username))
                     cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
                     cert.requirement.missedDescriptions = termsMissed(cert.requirement.id, username)
-                    cert.requirement.totalTerms = len(termsInTotal(cert.requirement.id, username))
+                    cert.requirement.totalTerms = len(termsInTotal(username))
                 elif cert.requirement.frequency == "twice":
                     cert.requirement.attendedTerms = len(termsAttended(cert.requirement.id, username))
                     cert.requirement.missedTerms = max(0, 2 - cert.requirement.attendedTerms)
                     cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
                     cert.requirement.missedDescriptions = ([termsMissed(cert.requirement.id, username)[0], termsMissed(cert.requirement.id, username)[1]])
                 elif cert.requirement.frequency == "annual":
-                    totalTerms = len(termsInTotal(cert.requirement.id, username))
+                    totalTerms = len(termsInTotal(username))
                     cert.requirement.attendedAnnual = len(termsAttended(cert.requirement.id, username))
                     cert.requirement.totalAnnual = int(math.floor(totalTerms/2+0.5)) if totalTerms % 2 == 1  else totalTerms/2
                     cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index 7f01b453f..a7942ecf8 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -11,17 +11,26 @@
 from app.models.requirementMatch import RequirementMatch
 from app.models.eventParticipant import EventParticipant
 
-from app.logic.certification import getCertRequirements, updateCertRequirements, updateCertRequirementForEvent, termsAttended, termsMissed
+from app.logic.certification import getCertRequirements, updateCertRequirements, updateCertRequirementForEvent, termsAttended, termsMissed, termsInTotal
 from app.logic.certification import getCertRequirementsWithCompletion
 from app.logic.loginManager import getCurrentTerm
 
 @pytest.mark.integration
 def test_termsAttended():
+
+    with mainDB.atomic() as transaction:
+        with app.app_context():
+            attendedTerms = termsAttended()
+            assert attendedTerms == None
+        transaction.rollback()
+
     with mainDB.atomic() as transaction:
-            # created the database and added the test data to test what terms are return from attendedTerms()
+        # created the database and added the test data to test what terms are return from attendedTerms()
         with app.app_context():
+            Term.update(isCurrentTerm=False).execute()
             Term.create(id = 1000, description = "Spring 2020", year = 2020, academicYear = 2019-2020, isSummer = False, isCurrentTerm = True, termOrder = 2020-1)
             Term.create(id = 1001, description = "Fall 2019", year = 2019, academicYear = 2019-2020, isSummer = False, isCurrentTerm = False, termOrder = 2019-3)
+            g.current_term = getCurrentTerm() 
             Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Spring 2020", program_id = 5)
             Event.create(id = 1401, term_id = 1001, name = "Event 2", description = "Spring 2019", program_id = 5)
             User.create(username='zawn', rawClassLevel='Senior')  
@@ -30,79 +39,108 @@ def test_termsAttended():
             EventParticipant.create(event_id=1400, user_id='zawn')
             RequirementMatch.create(event_id=1401, requirement_id=400)
             EventParticipant.create(event_id=1401, user_id='zawn')
-
             attendedTermsNum = len(termsAttended(certification=400, username='zawn'))
-            assert attendedTermsNum == 2
-            transaction.rollback()
-
-    with mainDB.atomic() as transaction:
-        with app.app_context():
-            # created the database and added the test data to test terms the student attended
-            Term.create(id = 1002, description = "Summer 2019", year = 2019, academicYear = 2019-2020, isSummer = True, isCurrentTerm = False, termOrder = 2019-2)
-            Event.create(id = 1402, term_id = 1002, name = "Event 3", description = "Summer 2019", program_id = 5)
-            User.create(username='zawn', rawClassLevel='Senior')  
-            CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
-            RequirementMatch.create(event_id=1402, requirement_id=400)
-            EventParticipant.create(event_id=1402, user_id='zawn')
-            attendedTerms = termsAttended(certification=400, username='zawn')
-        assert attendedTerms == []
+        assert attendedTermsNum == 2
         transaction.rollback()
             
 @pytest.mark.integration
 def test_termsMissed():
     # created the database and added the test data to test the maximum amount of terms a student can miss based on their class level
-    
+    with mainDB.atomic() as transaction:
+        with app.app_context():
+            missedTerms = termsMissed()
+            assert missedTerms == None
+        transaction.rollback()
+
     with mainDB.atomic() as transaction:
         with app.app_context():
             Term.update(isCurrentTerm=False).execute()
             Term.create(id = 1000, description = "Fall 2019", year = 2019, academicYear = 2019-2020, isSummer = False, isCurrentTerm = True, termOrder = 2019-3)
+            g.current_term = getCurrentTerm() 
             Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Fall 2019", program_id = 5)
             User.create(username='zawn', rawClassLevel='Senior')  
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
-            g.current_term = getCurrentTerm()
-            missedTerms = termsMissed(certification=1, username='zawn')
-            assert missedTerms == ['Fall 2016', 'Spring 2016', 'Fall 2017', 'Spring 2017', 'Fall 2018', 'Spring 2018', 'Fall 2019']
-            transaction.rollback()
+            RequirementMatch.create(event_id=1400, requirement_id=400)
+            EventParticipant.create(event_id=1400, user_id='zawn')
+            missedTerms = termsMissed(certification=400, username='zawn')
+        assert missedTerms == ['Fall 2016', 'Spring 2017', 'Fall 2017', 'Spring 2018', 'Fall 2018', 'Spring 2019'] 
+        transaction.rollback()
     
     
     with mainDB.atomic() as transaction:
         with app.app_context():
             Term.update(isCurrentTerm=False).execute()
             Term.create(id = 1000, description = "Summer 2022", year = 2022, academicYear = 2022-2023, isSummer = True, isCurrentTerm = True, termOrder = 2022-2)
+            g.current_term = getCurrentTerm() 
             Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Summer 2022", program_id = 5)
             User.create(username='zawn', rawClassLevel='Freshman')  
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
-            g.current_term = getCurrentTerm()
-            missedTerms = termsMissed(certification=1, username='zawn')
+            missedTerms = termsMissed(certification=400, username='zawn')
         assert missedTerms == ["Fall 2022"]
         transaction.rollback()
      
     with mainDB.atomic() as transaction:
         with app.app_context():
             Term.update(isCurrentTerm=False).execute()
-            Term.create(id = 1000, description = "Spring 2021", year = 2021, academicYear = 2020-2021, isSummer = False, isCurrentTerm = True, termOrder = 2021-1)
+            Term.create(id = 1001, description = "Spring 2022", year = 2022, academicYear = 2021-2022, isSummer = False, isCurrentTerm = True, termOrder = 2022-1)
+            Term.create(id = 1000, description = "Spring 2021", year = 2021, academicYear = 2020-2021, isSummer = False, isCurrentTerm = False, termOrder = 2021-1)
+            g.current_term = getCurrentTerm() 
             Event.create(id = 1400, term_id = 1000, name = "Event 1", description = "Spring 2021", program_id = 5)
-            User.create(username='zawn', rawClassLevel='Senior')  
+            User.create(username='zawn', rawClassLevel='Junior')  
             CertificationRequirement.create(id = 400, certification_id = 1, name = "CPR Training", frequency = "term", required = True)
-            g.current_term = getCurrentTerm()
-            missedTerms = termsMissed(certification=1, username='zawn')
-        assert missedTerms == ['Fall 2018', 'Spring 2018', 'Fall 2019', 'Spring 2019', 'Fall 2020', 'Spring 2020', 'Fall 2021', 'Spring 2021']
+            RequirementMatch.create(event_id=1400, requirement_id=400)
+            EventParticipant.create(event_id=1400, user_id='zawn')
+            missedTerms = termsMissed(certification=400, username='zawn')
+        assert missedTerms == ["Fall 2019", "Spring 2020", "Fall 2020", "Fall 2021", "Spring 2022"]
         transaction.rollback()
+
+@pytest.mark.integration
+def test_termsInTotal():  
         
+    with mainDB.atomic() as transaction:
+        with app.app_context():
+            totalTerms = termsInTotal()
+            assert totalTerms == None
+        transaction.rollback()
+
+    with mainDB.atomic() as transaction:
+        with app.app_context():
+            Term.update(isCurrentTerm=False).execute()
+            Term.create(id = 1000, description = "Spring 2021", year = 2021, academicYear = 2020-2021, isSummer = False, isCurrentTerm = True, termOrder = 2021-1)
+            g.current_term = getCurrentTerm() 
+            User.create(username='zawn', rawClassLevel='Senior') 
+            totalTerms = termsInTotal(username='zawn')
+            assert totalTerms == ["Fall 2017", "Spring 2018", "Fall 2018", "Spring 2019", "Fall 2019", "Spring 2020", "Fall 2020", "Spring 2021"]
+        transaction.rollback()
+
+    with mainDB.atomic() as transaction:
+        with app.app_context():
+            Term.update(isCurrentTerm=False).execute()
+            Term.create(id = 1000, description = "Fall 2018", year = 2018, academicYear = 2017-2018, isSummer = False, isCurrentTerm = True, termOrder = 2018-3)
+            g.current_term = getCurrentTerm() 
+            User.create(username='zawn', rawClassLevel='Sophomore') 
+            totalTerms = termsInTotal(username='zawn')
+            assert totalTerms == ["Fall 2017", "Spring 2018", "Fall 2018"]
+        transaction.rollback()
+
+
 @pytest.mark.integration
 def test_getCertRequirements():
-    allRequirements = getCertRequirements()
+        with mainDB.atomic() as transaction:
+            allRequirements = getCertRequirements()
 
-    certNames =  ["Bonner", "CCE Minor", "CPR", "Confidentiality", "I9"]
-    assert certNames == [cert["data"].name for (id, cert) in allRequirements.items()]
-    cpr = allRequirements[3]['requirements']
-    assert ["Volunteer Training", "CPR Training"] == [r.name for r in cpr]
+            certNames =  ["Bonner", "CCE Minor", "CPR", "Confidentiality", "I9"]
+            assert certNames == [cert["data"].name for (id, cert) in allRequirements.items()]
+            cpr = allRequirements[3]['requirements']
+            assert ["Volunteer Training", "CPR Training"] == [r.name for r in cpr]
 
-    bonner = getCertRequirements(certification=Certification.BONNER)
-    assert len(bonner) == 10
+            bonner = getCertRequirements(certification=Certification.BONNER)
+            assert len(bonner) == 9
+
+            noRequirements = getCertRequirements(certification=1111)
+            assert len(noRequirements) == 0
+        transaction.rollback()
 
-    noRequirements = getCertRequirements(certification=1111)
-    assert len(noRequirements) == 0
 
 
 @pytest.mark.integration

From ced4ec89156ac449919449b42a986a2759e5470a Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Tue, 11 Nov 2025 17:22:13 -0500
Subject: [PATCH 23/42] new changes after Jame's review

---
 app/controllers/main/routes.py   |  2 +-
 app/logic/certification.py       | 21 +++++++--------------
 app/static/js/userProfile.js     | 21 ---------------------
 tests/code/test_certification.py | 20 --------------------
 4 files changed, 8 insertions(+), 56 deletions(-)

diff --git a/app/controllers/main/routes.py b/app/controllers/main/routes.py
index 7cf3285d4..b47d1e24c 100644
--- a/app/controllers/main/routes.py
+++ b/app/controllers/main/routes.py
@@ -33,7 +33,7 @@
 from app.logic.utils import selectSurroundingTerms
 from app.logic.celtsLabor import getCeltsLaborHistory
 from app.logic.createLogs import createRsvpLog, createActivityLog
-from app.logic.certification import getCertRequirementsWithCompletion, termsMissed
+from app.logic.certification import getCertRequirementsWithCompletion
 from app.logic.landingPage import getManagerProgramDict, getActiveEventTab
 from app.logic.minor import toggleMinorInterest, declareMinorInterest, getCommunityEngagementByTerm, getEngagementTotal
 from app.logic.participants import unattendedRequiredEvents, trainedParticipants, getParticipationStatusForTrainings, checkUserRsvp, addPersonToEvent
diff --git a/app/logic/certification.py b/app/logic/certification.py
index 10e6dbcf6..73d139e3e 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -8,12 +8,10 @@
 from app.models.eventParticipant import EventParticipant
 from app.models.user import User
 import math
-def termsAttended(certification=None, username=None):
+def termsAttended(certification, username):
     '''
     Retrieve terms attended by a user for certification and filter them based on frequency of a term
     '''
-    if certification is None or username is None:
-        return None
     attendedTerms = []
     if username:
         attendance = (RequirementMatch.select()
@@ -27,21 +25,17 @@ def termsAttended(certification=None, username=None):
     attendedTerms = [term for term in attendedTerms if term in totalTerms]
     return list(set(attendedTerms))
             
-def termsMissed(certification=None, username=None): 
+def termsMissed(certification, username): 
     '''
     Calculate how many certification-eligible terms a student has missed based on their class level
     and attendance record.
     '''
-    if certification is None or username is None:
-        return None
     totalTerms = termsInTotal(username)   
     attendedTerms = termsAttended(certification, username)
     missedTerms = [term for term in totalTerms if term not in attendedTerms]
     return missedTerms
 
-def termsInTotal(username=None):
-    if username is None:
-        return None
+def termsInTotal(username):
     currentTerm = g.current_term
     currentDesc = currentTerm.description 
     if currentTerm.isSummer:
@@ -112,22 +106,21 @@ def getCertRequirements(certification=None, username=None):
             if username:
                 cert.requirement.completed = bool(cert.__dict__['completed'])
                 # this is to get the calculation when it comes to events with term, twice, annual as their frequency
+                cert.requirement.attendedTerms = len(termsAttended(cert.requirement.id, username))
+                cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
                 if cert.requirement.frequency == "term":
                     cert.requirement.missedTerms = len(termsMissed(cert.requirement.id, username))
-                    cert.requirement.attendedTerms = len(termsAttended(cert.requirement.id, username))
-                    cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
                     cert.requirement.missedDescriptions = termsMissed(cert.requirement.id, username)
                     cert.requirement.totalTerms = len(termsInTotal(username))
                 elif cert.requirement.frequency == "twice":
-                    cert.requirement.attendedTerms = len(termsAttended(cert.requirement.id, username))
                     cert.requirement.missedTerms = max(0, 2 - cert.requirement.attendedTerms)
-                    cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
                     cert.requirement.missedDescriptions = ([termsMissed(cert.requirement.id, username)[0], termsMissed(cert.requirement.id, username)[1]])
                 elif cert.requirement.frequency == "annual":
                     totalTerms = len(termsInTotal(username))
                     cert.requirement.attendedAnnual = len(termsAttended(cert.requirement.id, username))
                     cert.requirement.totalAnnual = int(math.floor(totalTerms/2+0.5)) if totalTerms % 2 == 1  else totalTerms/2
-                    cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
+                else:
+                    raise ValueError("Invalid frequency value")
             certificationList.append(cert.requirement)
 
         # the .distinct() doesn't work efficiently, so we have to manually go through the list and removed duplicates that exist
diff --git a/app/static/js/userProfile.js b/app/static/js/userProfile.js
index 5753d59e3..51d5344fc 100644
--- a/app/static/js/userProfile.js
+++ b/app/static/js/userProfile.js
@@ -35,17 +35,6 @@ $(document).ready(function(){
     });
   })
 
-  // var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
-  // var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
-  //   return new bootstrap.Tooltip(tooltipTriggerEl)
-  // })
-  
-  // $("#printButton").on("click", function() {
-  //       let username = $(this).data('username')
-  //       printDocument(`/profile/${username}/travelForm`)
-  //     })
-  // $("#actions").on("change", changeAction)
-  // $("#phoneInput").inputmask('(999)-999-9999');
   $(".notifyInput").click(function updateInterest(){
     var programID = $(this).data("programid");
     var username = $(this).data('username');
@@ -319,16 +308,6 @@ $(document).ready(function(){
     })
   });
 
-  // Popover functionality
-  // var requiredTraining = $(".trainingPopover");
-  // requiredTraining.popover({
-  //     trigger: "hover",
-  //     sanitize: false,
-  //     html: true,
-  //     content: function() {
-  //         return $(this).attr('data-content');
-  //     }
-  // });
   $(function () {
     $('.trainingPopover').each(function () {
       new bootstrap.Popover(this, {
diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index a7942ecf8..282fd93bb 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -18,12 +18,6 @@
 @pytest.mark.integration
 def test_termsAttended():
 
-    with mainDB.atomic() as transaction:
-        with app.app_context():
-            attendedTerms = termsAttended()
-            assert attendedTerms == None
-        transaction.rollback()
-
     with mainDB.atomic() as transaction:
         # created the database and added the test data to test what terms are return from attendedTerms()
         with app.app_context():
@@ -45,13 +39,6 @@ def test_termsAttended():
             
 @pytest.mark.integration
 def test_termsMissed():
-    # created the database and added the test data to test the maximum amount of terms a student can miss based on their class level
-    with mainDB.atomic() as transaction:
-        with app.app_context():
-            missedTerms = termsMissed()
-            assert missedTerms == None
-        transaction.rollback()
-
     with mainDB.atomic() as transaction:
         with app.app_context():
             Term.update(isCurrentTerm=False).execute()
@@ -96,13 +83,6 @@ def test_termsMissed():
 
 @pytest.mark.integration
 def test_termsInTotal():  
-        
-    with mainDB.atomic() as transaction:
-        with app.app_context():
-            totalTerms = termsInTotal()
-            assert totalTerms == None
-        transaction.rollback()
-
     with mainDB.atomic() as transaction:
         with app.app_context():
             Term.update(isCurrentTerm=False).execute()

From 7d3f2b91901baa449bc2950263eb3920bbf8aee0 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Tue, 11 Nov 2025 19:03:54 -0500
Subject: [PATCH 24/42] minor changes

---
 app/logic/certification.py          | 17 +++++++++++++----
 app/templates/main/userProfile.html | 23 ++++++-----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 73d139e3e..9790ab103 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -22,8 +22,8 @@ def termsAttended(certification, username):
         if not attendance[termRecord].event.term.isSummer:
             attendedTerms.append(attendance[termRecord].event.term.description)
     totalTerms = termsInTotal(username)
-    attendedTerms = [term for term in attendedTerms if term in totalTerms]
-    return list(set(attendedTerms))
+    attendedTerms = {term for term in attendedTerms if term in totalTerms}
+    return attendedTerms
             
 def termsMissed(certification, username): 
     '''
@@ -119,8 +119,17 @@ def getCertRequirements(certification=None, username=None):
                     totalTerms = len(termsInTotal(username))
                     cert.requirement.attendedAnnual = len(termsAttended(cert.requirement.id, username))
                     cert.requirement.totalAnnual = int(math.floor(totalTerms/2+0.5)) if totalTerms % 2 == 1  else totalTerms/2
-                else:
-                    raise ValueError("Invalid frequency value")
+                elif cert.requirement.frequency == "once" and cert.requirement.completed:
+                    term_record = (RequirementMatch
+                            .select(RequirementMatch, Event, Term)
+                            .join(Event)
+                            .join(Term)
+                            .where(RequirementMatch.requirement == cert.requirement.id)
+                            .order_by(Term.year.desc())  # latest term first
+                            .first()
+                        )
+                    cert.requirement.attendedTerm = term_record.event.term.description 
+
             certificationList.append(cert.requirement)
 
         # the .distinct() doesn't work efficiently, so we have to manually go through the list and removed duplicates that exist
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index d07870125..3a8a248cc 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -504,9 +504,9 @@ <h5>Requirement Progress</h5>
                       <span>({{req.attendedAnnual}}/{{req.totalAnnual}})</span>
                   {% endif %}
                 </span>
+                {% set popover_text = "" %}
                 {% if req.attendedTerms %}
                   {% if req.attendedDescriptions|length > 0 or req.missedDescriptions|length > 0 %}
-                    {% set popover_text = "" %}
                     {% if req.attendedDescriptions|length > 0 %}
                       {% set popover_text = popover_text ~ "Attended: <br>" ~ (req.attendedDescriptions | join(', ')) %}
                     {% else %}
@@ -521,27 +521,15 @@ <h5>Requirement Progress</h5>
                     {% set popover_text = "You haven’t attended any terms yet." %}
                   {% endif %}
                 {% elif req.frequency == "once" and req.completed %}
-                  {% set popover_text = "You have attended the certification." %}
-
-                {% elif req.frequency == "once" and not req.completed %}
-                  {% set popover_text = "You have not attended the certification." %}
-
+                  {% set popover_text = "Attended on " ~ (req.attendedTerm) %}
                 {% elif req.frequency == "twice" and req.completed %}
-                  {% set popover_text = "You have attended the certification twice." %}
-
-                {% elif req.frequency == "twice" and not req.completed %}
-                  {% set popover_text = "You have not attended the certification twice." %}
-
+                  {% set popover_text = "Attended the certification: " ~ (req.attendedTerm | join(', ')) ~ "." %}
                 {% elif req.frequency == "annual" %}
                   {% if req.attendedDescriptions|length > 0 %}
                     {% set popover_text = "Attended: <br>" ~ (req.attendedDescriptions | join(', ')) %}
-                  {% else %}
-                    {% set popover_text = "No annual certifications attended yet." %}
                   {% endif %}
-
-                {% else %}
-                  {% set popover_text = "No certification attendance data available." %}
                 {% endif %}
+                {% if popover_text != "" %}
                 <a
                   href="#"
                   type="button"
@@ -552,7 +540,8 @@ <h5>Requirement Progress</h5>
                   data-bs-content="{{ popover_text | e }}"
                 >
                   View
-                </a>         
+                </a>   
+                {% endif %}      
                 </li>
                 </br>
               {% endfor %}

From 6f5caa3f822081cb97ae25e2939aaee39f784cbe Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Tue, 11 Nov 2025 19:21:48 -0500
Subject: [PATCH 25/42] minor changes

---
 app/logic/certification.py          | 3 ---
 app/templates/main/userProfile.html | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 9790ab103..c304c8430 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -112,9 +112,6 @@ def getCertRequirements(certification=None, username=None):
                     cert.requirement.missedTerms = len(termsMissed(cert.requirement.id, username))
                     cert.requirement.missedDescriptions = termsMissed(cert.requirement.id, username)
                     cert.requirement.totalTerms = len(termsInTotal(username))
-                elif cert.requirement.frequency == "twice":
-                    cert.requirement.missedTerms = max(0, 2 - cert.requirement.attendedTerms)
-                    cert.requirement.missedDescriptions = ([termsMissed(cert.requirement.id, username)[0], termsMissed(cert.requirement.id, username)[1]])
                 elif cert.requirement.frequency == "annual":
                     totalTerms = len(termsInTotal(username))
                     cert.requirement.attendedAnnual = len(termsAttended(cert.requirement.id, username))
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 3a8a248cc..03b0b1118 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -505,7 +505,7 @@ <h5>Requirement Progress</h5>
                   {% endif %}
                 </span>
                 {% set popover_text = "" %}
-                {% if req.attendedTerms %}
+                {% if req.frequency == "term" %}
                   {% if req.attendedDescriptions|length > 0 or req.missedDescriptions|length > 0 %}
                     {% if req.attendedDescriptions|length > 0 %}
                       {% set popover_text = popover_text ~ "Attended: <br>" ~ (req.attendedDescriptions | join(', ')) %}
@@ -522,8 +522,8 @@ <h5>Requirement Progress</h5>
                   {% endif %}
                 {% elif req.frequency == "once" and req.completed %}
                   {% set popover_text = "Attended on " ~ (req.attendedTerm) %}
-                {% elif req.frequency == "twice" and req.completed %}
-                  {% set popover_text = "Attended the certification: " ~ (req.attendedTerm | join(', ')) ~ "." %}
+                {% elif req.frequency == "twice"%}
+                  {% set popover_text = "Attended the certification: " ~ (req.attendedDescriptions | join(', ')) ~ "." %}
                 {% elif req.frequency == "annual" %}
                   {% if req.attendedDescriptions|length > 0 %}
                     {% set popover_text = "Attended: <br>" ~ (req.attendedDescriptions | join(', ')) %}

From 13b26370f406a965a2608f6a81183db64a2371c1 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Tue, 11 Nov 2025 19:25:58 -0500
Subject: [PATCH 26/42] final changes hopefully

---
 app/templates/main/userProfile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 03b0b1118..be206a678 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -521,7 +521,7 @@ <h5>Requirement Progress</h5>
                     {% set popover_text = "You haven’t attended any terms yet." %}
                   {% endif %}
                 {% elif req.frequency == "once" and req.completed %}
-                  {% set popover_text = "Attended on " ~ (req.attendedTerm) %}
+                  {% set popover_text = "Attended: " ~ (req.attendedTerm) %}
                 {% elif req.frequency == "twice"%}
                   {% set popover_text = "Attended the certification: " ~ (req.attendedDescriptions | join(', ')) ~ "." %}
                 {% elif req.frequency == "annual" %}

From f50de7dc644367357389cd85cd7ebaf340c1585d Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Tue, 11 Nov 2025 19:31:00 -0500
Subject: [PATCH 27/42] changes terms toe vents

---
 app/templates/main/userProfile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index be206a678..b51d0197e 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -518,7 +518,7 @@ <h5>Requirement Progress</h5>
                       {% set popover_text = popover_text ~ "<br>Missed: None" %}
                     {% endif %}
                   {% else %}
-                    {% set popover_text = "You haven’t attended any terms yet." %}
+                    {% set popover_text = "You haven’t attended any events yet." %}
                   {% endif %}
                 {% elif req.frequency == "once" and req.completed %}
                   {% set popover_text = "Attended: " ~ (req.attendedTerm) %}

From fbc5522dc15f17e3535270720ecf497e7c684471 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Wed, 12 Nov 2025 13:40:31 -0500
Subject: [PATCH 28/42] added the view and did some jinja templating

---
 app/templates/main/userProfile.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index b51d0197e..9642f38a7 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -517,8 +517,6 @@ <h5>Requirement Progress</h5>
                     {% else %}
                       {% set popover_text = popover_text ~ "<br>Missed: None" %}
                     {% endif %}
-                  {% else %}
-                    {% set popover_text = "You haven’t attended any events yet." %}
                   {% endif %}
                 {% elif req.frequency == "once" and req.completed %}
                   {% set popover_text = "Attended: " ~ (req.attendedTerm) %}
@@ -528,8 +526,9 @@ <h5>Requirement Progress</h5>
                   {% if req.attendedDescriptions|length > 0 %}
                     {% set popover_text = "Attended: <br>" ~ (req.attendedDescriptions | join(', ')) %}
                   {% endif %}
+                {% else %}
+                  {% set popover_text = "You haven’t attended any event(s) yet." %}
                 {% endif %}
-                {% if popover_text != "" %}
                 <a
                   href="#"
                   type="button"
@@ -541,7 +540,6 @@ <h5>Requirement Progress</h5>
                 >
                   View
                 </a>   
-                {% endif %}      
                 </li>
                 </br>
               {% endfor %}

From edf7ea5fd616b057aa60aff90d2ee0668293cdde Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Wed, 12 Nov 2025 13:43:49 -0500
Subject: [PATCH 29/42] added the view and did some jinja templating

---
 app/templates/main/userProfile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index 9642f38a7..d0b85f07d 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -521,7 +521,7 @@ <h5>Requirement Progress</h5>
                 {% elif req.frequency == "once" and req.completed %}
                   {% set popover_text = "Attended: " ~ (req.attendedTerm) %}
                 {% elif req.frequency == "twice"%}
-                  {% set popover_text = "Attended the certification: " ~ (req.attendedDescriptions | join(', ')) ~ "." %}
+                  {% set popover_text = "Attended: " ~ (req.attendedDescriptions | join(', ')) ~ "." %}
                 {% elif req.frequency == "annual" %}
                   {% if req.attendedDescriptions|length > 0 %}
                     {% set popover_text = "Attended: <br>" ~ (req.attendedDescriptions | join(', ')) %}

From 18c6d2b15c2477bbd99ae7e7c7897d6569669fc4 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Wed, 12 Nov 2025 13:44:57 -0500
Subject: [PATCH 30/42] added the view and did some jinja templating

---
 app/templates/main/userProfile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index d0b85f07d..3cea0e815 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -521,7 +521,7 @@ <h5>Requirement Progress</h5>
                 {% elif req.frequency == "once" and req.completed %}
                   {% set popover_text = "Attended: " ~ (req.attendedTerm) %}
                 {% elif req.frequency == "twice"%}
-                  {% set popover_text = "Attended: " ~ (req.attendedDescriptions | join(', ')) ~ "." %}
+                  {% set popover_text = "Attended: " ~ (req.attendedDescriptions | join(', ')) %}
                 {% elif req.frequency == "annual" %}
                   {% if req.attendedDescriptions|length > 0 %}
                     {% set popover_text = "Attended: <br>" ~ (req.attendedDescriptions | join(', ')) %}

From b6eba3b6db675b6d4908652344f26bff21e4607f Mon Sep 17 00:00:00 2001
From: makindeo <makindeo@berea.edu>
Date: Wed, 12 Nov 2025 16:47:26 -0500
Subject: [PATCH 31/42] Adjusted structure of termsInTotal() function to make
 it more readable

---
 app/logic/certification.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index c304c8430..b7125e73b 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -63,7 +63,36 @@ def termsInTotal(username):
             break  
     return totalTerms
 
-
+def termsInTotal(username):
+    """
+    Returns a list of Fall + Spring semesters a student has attended, like ["Fall 2023", "Spring 2024"]
+    """
+    user = User.select().where(User.username == username).get()
+    currentTerm = g.current_term
+    studentStanding = user.rawClassLevel
+    currentTermIsFall = currentTerm.description.startswith("Fall")
+    fallAndSpringTerms = []
+    
+    classLevelToYears = {"Freshman": 1, "Sophomore": 2, "Junior": 3, "Senior": 4}
+    yearsCompleted = classLevelToYears.get(studentStanding)
+    
+    if currentTerm.isSummer or currentTermIsFall:
+        studentStartYear = currentTerm.year - yearsCompleted + 1
+        totalTermsList = (yearsCompleted) * 2 - 1
+    else:  # Spring
+        studentStartYear = currentTerm.year - yearsCompleted
+        totalTermsList = (yearsCompleted) * 2
+    
+    for i in range(totalTermsList):
+        if i % 2 == 0:  # Fall
+            semester = "Fall"
+            year = studentStartYear + i // 2
+        else:  # Spring
+            semester = "Spring"
+            year = studentStartYear + i // 2 + 1
+        fallAndSpringTerms.append(f"{semester} {year}")
+    
+    return fallAndSpringTerms
 
 def getCertRequirementsWithCompletion(*, certification, username):
     """

From c3de4af28528adaaf92815d08b344e8db0654bf0 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Fri, 14 Nov 2025 19:17:45 -0500
Subject: [PATCH 32/42] worked on the username and other rawclasslevel
 possibility

---
 app/logic/certification.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index c304c8430..93857878c 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -13,11 +13,10 @@ def termsAttended(certification, username):
     Retrieve terms attended by a user for certification and filter them based on frequency of a term
     '''
     attendedTerms = []
-    if username:
-        attendance = (RequirementMatch.select()
-                                      .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event)) 
-                                      .where(RequirementMatch.requirement_id == certification)  
-                                      .where(EventParticipant.user == username))  
+    attendance = (RequirementMatch.select()
+                                    .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event)) 
+                                    .where(RequirementMatch.requirement_id == certification)  
+                                    .where(EventParticipant.user == username))  
     for termRecord in range(len(attendance)):
         if not attendance[termRecord].event.term.isSummer:
             attendedTerms.append(attendance[termRecord].event.term.description)

From 1a9b7fa838f821d6e7bd2b9e02bbda79f3bc4af8 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Tue, 18 Nov 2025 11:10:51 -0500
Subject: [PATCH 33/42] function created and working

---
 app/logic/certification.py       | 50 +++++++++-----------------------
 tests/code/test_certification.py | 37 ++++++++++++++---------
 2 files changed, 37 insertions(+), 50 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 74b4b6b9f..f937c7c18 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -59,39 +59,22 @@ def termsInTotal(username):
                     season = "Spring"
                     year = startYear + (k // 2) + 1
                 totalTerms.append(f"{season} {year}")
+            break
+        elif user.rawClassLevel == "NULL" or user.rawClassLevel == "Graduating" or user.rawClassLevel == "Non-Degree":
+            totalTermsCount = 8
+            currentYear = currentTerm.year
+            currentSeason = "Fall" if "Fall" in currentTerm.description else "Spring"
+            for a in range(totalTermsCount):
+                totalTerms.append(f"{currentSeason} {currentYear}")
+                if currentSeason == "Fall":
+                    currentSeason = "Spring"
+                else: 
+                    currentSeason = "Fall"
+                    currentYear -= 1
+            list.reverse(totalTerms) 
             break  
     return totalTerms
 
-def termsInTotal(username):
-    """
-    Returns a list of Fall + Spring semesters a student has attended, like ["Fall 2023", "Spring 2024"]
-    """
-    user = User.select().where(User.username == username).get()
-    currentTerm = g.current_term
-    studentStanding = user.rawClassLevel
-    currentTermIsFall = currentTerm.description.startswith("Fall")
-    fallAndSpringTerms = []
-    
-    classLevelToYears = {"Freshman": 1, "Sophomore": 2, "Junior": 3, "Senior": 4}
-    yearsCompleted = classLevelToYears.get(studentStanding)
-    
-    if currentTerm.isSummer or currentTermIsFall:
-        studentStartYear = currentTerm.year - yearsCompleted + 1
-        totalTermsList = (yearsCompleted) * 2 - 1
-    else:  # Spring
-        studentStartYear = currentTerm.year - yearsCompleted
-        totalTermsList = (yearsCompleted) * 2
-    
-    for i in range(totalTermsList):
-        if i % 2 == 0:  # Fall
-            semester = "Fall"
-            year = studentStartYear + i // 2
-        else:  # Spring
-            semester = "Spring"
-            year = studentStartYear + i // 2 + 1
-        fallAndSpringTerms.append(f"{semester} {year}")
-    
-    return fallAndSpringTerms
 
 def getCertRequirementsWithCompletion(*, certification, username):
     """
@@ -126,7 +109,6 @@ def getCertRequirements(certification=None, username=None):
                 .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event))
                 .where(EventParticipant.user.is_null(True) | (EventParticipant.user == username))
                 .order_by(Certification.id, CertificationRequirement.order.asc(nulls="LAST")))
-
         # we have to add the is not null check so that `cert.requirement` always exists
         reqList = reqList.where(Certification.id == certification, CertificationRequirement.id.is_null(False))
         certificationList = []
@@ -154,7 +136,6 @@ def getCertRequirements(certification=None, username=None):
                             .first()
                         )
                     cert.requirement.attendedTerm = term_record.event.term.description 
-
             certificationList.append(cert.requirement)
 
         # the .distinct() doesn't work efficiently, so we have to manually go through the list and removed duplicates that exist
@@ -166,20 +147,15 @@ def getCertRequirements(certification=None, username=None):
             if certificationList[certificationIndex] not in validCertification:
                 validCertification.add(certificationList[certificationIndex])
                 uniqueCertification.append(certificationList[certificationIndex])
-                
             certificationIndex += 1
-            
         certificationList = uniqueCertification
-        
         return certificationList
-    
     certificationDict = {}
     for cert in reqList:
         if cert.id not in certificationDict.keys():
             certificationDict[cert.id] = {"data": cert, "requirements": []}
         if getattr(cert, 'requirement', None):
             certificationDict[cert.id]["requirements"].append(cert.requirement)
-            
     return certificationDict
 
 def updateCertRequirements(certId, newRequirements):
diff --git a/tests/code/test_certification.py b/tests/code/test_certification.py
index 282fd93bb..1f266d3cc 100644
--- a/tests/code/test_certification.py
+++ b/tests/code/test_certification.py
@@ -93,6 +93,16 @@ def test_termsInTotal():
             assert totalTerms == ["Fall 2017", "Spring 2018", "Fall 2018", "Spring 2019", "Fall 2019", "Spring 2020", "Fall 2020", "Spring 2021"]
         transaction.rollback()
 
+    with mainDB.atomic() as transaction:
+        with app.app_context():
+            Term.update(isCurrentTerm=False).execute()
+            Term.create(id = 1000, description = "Spring 2020", year = 2020, academicYear = 2019-2020, isSummer = False, isCurrentTerm = True, termOrder = 2020-1)
+            g.current_term = getCurrentTerm() 
+            User.create(username='zawn', rawClassLevel='Graduating') 
+            totalTerms = termsInTotal(username='zawn')
+            assert totalTerms == ["Fall 2016", "Spring 2017", "Fall 2017", "Spring 2018", "Fall 2018", "Spring 2019", "Fall 2019", "Spring 2020"]
+        transaction.rollback()
+
     with mainDB.atomic() as transaction:
         with app.app_context():
             Term.update(isCurrentTerm=False).execute()
@@ -127,19 +137,20 @@ def test_getCertRequirements():
 def test_getCertRequirementsWithCompletion():
 
     with mainDB.atomic() as transaction:
-        # add two matches for the same requirement to make sure we only return one row per requirement
-        RequirementMatch.create(event_id=14, requirement_id=10)
-        EventParticipant.create(event_id=14, user_id='ramsayb2')
-        RequirementMatch.create(event_id=13, requirement_id=10)
-        EventParticipant.create(event_id=13, user_id='ramsayb2')
-        
-        cprCert = 3
-        cprReqs = getCertRequirementsWithCompletion(certification=cprCert, username='ramsayb2')
-       
-        assert len(cprReqs) == 2
-        assert not cprReqs[0].completed, "The first event should not be marked as completed"
-        assert cprReqs[1].completed, "The second event should be marked as completed"
-
+        with app.app_context():
+            # # add two matches for the same requirement to make sure we only return one row per requirement
+            Term.update(isCurrentTerm=False).execute()
+            Term.create(id=1000, description="Spring 2020", year=2020, academicYear=2019-2020, isSummer=False, isCurrentTerm=True, termOrder=2020-1)
+            g.current_term = getCurrentTerm()
+            RequirementMatch.create(event_id=14, requirement_id=10)
+            EventParticipant.create(event_id=14, user_id='ramsayb2')
+            RequirementMatch.create(event_id=13, requirement_id=10)
+            EventParticipant.create(event_id=13, user_id='ramsayb2')
+            cprcert = 3
+            cprreqs = getCertRequirementsWithCompletion(certification=cprcert, username='ramsayb2')
+            assert len(cprreqs) == 2
+            assert not cprreqs[0].completed, "The first event should not be completed"
+            assert cprreqs[1].completed, "The second event should be completed"
         transaction.rollback()
 
 @pytest.mark.integration

From cd905b52d061b533bb04b13e2c3247fe337392ab Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Wed, 19 Nov 2025 12:34:08 -0500
Subject: [PATCH 34/42]  added docstring

---
 app/logic/certification.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index f937c7c18..598d7dec4 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -35,6 +35,20 @@ def termsMissed(certification, username):
     return missedTerms
 
 def termsInTotal(username):
+    '''
+    This function calculates all the terms a student have enrolled based on their class level.
+    This is under the impression that as Bonnor Scholars they start their term in Fall and end in four year along with Summer not being counted.
+    Thus, if the current term is summer it is changed to Fall for display purpose.
+    The logic is as follows:
+        we get the current term and current term description (Spring 2022).
+        we get the user's class level (Freshman, Sophomore, Junior, Senior) and loop to see which level they are in.
+        Based on their level and based on the current term description if it is Fall because spring is the last term of each semester it is even and we intially populate 
+            based on even count then we minus 1 to get the correct number of terms.
+        Then if its Spring we set the start year (the year Fall where they start Bonner) to (if they are senior in 2022) current year (2022) - level(3 ie index) -1 (because each student starts 
+            at Fall mid year so -1 along -4 will successfully push it to 2018) - (2018, 2019)(2019, 2020)(2020, 2021)(2021, 2022)
+        While for Fall we don't have that additional -1 to comne with the logic and we use %2 to find if its even which is Spring or odd if its Fall.
+        Then the edge case of NULL, Graduating, Non-Degree is handled by assuming they have been here for 4 years (8 terms) and we populate the terms based on current term backwards.
+    '''
     currentTerm = g.current_term
     currentDesc = currentTerm.description 
     if currentTerm.isSummer:

From 04dd221cdf29a950a67f81eea2cdd6061f3cb52f Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Thu, 20 Nov 2025 11:20:43 -0500
Subject: [PATCH 35/42]  added updated docstring

---
 app/logic/certification.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 598d7dec4..6ecc429a4 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -36,18 +36,8 @@ def termsMissed(certification, username):
 
 def termsInTotal(username):
     '''
-    This function calculates all the terms a student have enrolled based on their class level.
-    This is under the impression that as Bonnor Scholars they start their term in Fall and end in four year along with Summer not being counted.
-    Thus, if the current term is summer it is changed to Fall for display purpose.
-    The logic is as follows:
-        we get the current term and current term description (Spring 2022).
-        we get the user's class level (Freshman, Sophomore, Junior, Senior) and loop to see which level they are in.
-        Based on their level and based on the current term description if it is Fall because spring is the last term of each semester it is even and we intially populate 
-            based on even count then we minus 1 to get the correct number of terms.
-        Then if its Spring we set the start year (the year Fall where they start Bonner) to (if they are senior in 2022) current year (2022) - level(3 ie index) -1 (because each student starts 
-            at Fall mid year so -1 along -4 will successfully push it to 2018) - (2018, 2019)(2019, 2020)(2020, 2021)(2021, 2022)
-        While for Fall we don't have that additional -1 to comne with the logic and we use %2 to find if its even which is Spring or odd if its Fall.
-        Then the edge case of NULL, Graduating, Non-Degree is handled by assuming they have been here for 4 years (8 terms) and we populate the terms based on current term backwards.
+    The function returns all non-summer academic terms a student should have, based on their class level where it finds
+    the start term and populate from it with Fall-start alignment and special handling for NULL/Non-degree class level
     '''
     currentTerm = g.current_term
     currentDesc = currentTerm.description 

From 146589e75f0b2fc7fd4a7c409dbd627442c4cf53 Mon Sep 17 00:00:00 2001
From: Rue Haile <hailer@berea.edu>
Date: Thu, 20 Nov 2025 22:47:38 -0500
Subject: [PATCH 36/42] currently working for all except null status

---
 app/logic/certification.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 6ecc429a4..0336ece55 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -23,16 +23,7 @@ def termsAttended(certification, username):
     totalTerms = termsInTotal(username)
     attendedTerms = {term for term in attendedTerms if term in totalTerms}
     return attendedTerms
-            
-def termsMissed(certification, username): 
-    '''
-    Calculate how many certification-eligible terms a student has missed based on their class level
-    and attendance record.
-    '''
-    totalTerms = termsInTotal(username)   
-    attendedTerms = termsAttended(certification, username)
-    missedTerms = [term for term in totalTerms if term not in attendedTerms]
-    return missedTerms
+ 
 
 def termsInTotal(username):
     '''
@@ -64,8 +55,9 @@ def termsInTotal(username):
                     year = startYear + (k // 2) + 1
                 totalTerms.append(f"{season} {year}")
             break
-        elif user.rawClassLevel == "NULL" or user.rawClassLevel == "Graduating" or user.rawClassLevel == "Non-Degree":
+    if user.rawClassLevel == "NULL" or user.rawClassLevel == "Graduating" or user.rawClassLevel == "Non-Degree":
             totalTermsCount = 8
+            print ("dora")  
             currentYear = currentTerm.year
             currentSeason = "Fall" if "Fall" in currentTerm.description else "Spring"
             for a in range(totalTermsCount):
@@ -76,9 +68,18 @@ def termsInTotal(username):
                     currentSeason = "Fall"
                     currentYear -= 1
             list.reverse(totalTerms) 
-            break  
     return totalTerms
 
+def termsMissed(certification, username): 
+    '''
+    Calculate how many certification-eligible terms a student has missed based on their class level
+    and attendance record.
+    '''
+    totalTerms = termsInTotal(username) 
+    attendedTerms = termsAttended(certification, username)
+    missedTerms = [term for term in totalTerms if term not in attendedTerms]
+    return missedTerms
+
 
 def getCertRequirementsWithCompletion(*, certification, username):
     """

From 5610de96aaab971974841421e05d42652cef999b Mon Sep 17 00:00:00 2001
From: Rue Haile <hailer@berea.edu>
Date: Fri, 21 Nov 2025 10:06:52 -0500
Subject: [PATCH 37/42] Populating correctly for grguated students

---
 app/logic/certification.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 0336ece55..f45d69462 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -55,9 +55,9 @@ def termsInTotal(username):
                     year = startYear + (k // 2) + 1
                 totalTerms.append(f"{season} {year}")
             break
-    if user.rawClassLevel == "NULL" or user.rawClassLevel == "Graduating" or user.rawClassLevel == "Non-Degree":
-            totalTermsCount = 8
-            print ("dora")  
+   
+    if user.rawClassLevel is None or user.rawClassLevel in ["NULL", "Graduating", "Non-Degree"]:
+            totalTermsCount = 8 
             currentYear = currentTerm.year
             currentSeason = "Fall" if "Fall" in currentTerm.description else "Spring"
             for a in range(totalTermsCount):

From e3e4f1f8f66485d6af63b1ef278f8dff00b8cb35 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Thu, 27 Nov 2025 11:05:39 -0500
Subject: [PATCH 38/42] make sure if the duplicate removing function doesn't
 remove the once frequency certification if completed is exist later in the
 list

---
 app/logic/certification.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index f45d69462..418d72fd4 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -85,9 +85,9 @@ def getCertRequirementsWithCompletion(*, certification, username):
     """
     Differentiate between simple requirements and requirements completion checking.
     """
-    return getCertRequirements(certification, username)
+    return getCertRequirements(certification, username, reqCheck=True)
 
-def getCertRequirements(certification=None, username=None):
+def getCertRequirements(certification=None, username=None, reqCheck=False):
     """
     Return the requirements for all certifications, or for one if requested.
 
@@ -111,8 +111,7 @@ def getCertRequirements(certification=None, username=None):
                 .select(Certification, CertificationRequirement, completedCase.alias("completed"))
                 .join(CertificationRequirement, JOIN.LEFT_OUTER, attr="requirement")
                 .join(RequirementMatch, JOIN.LEFT_OUTER)
-                .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event))
-                .where(EventParticipant.user.is_null(True) | (EventParticipant.user == username))
+                .join(EventParticipant, JOIN.LEFT_OUTER, on=(RequirementMatch.event == EventParticipant.event) & (EventParticipant.user == username))
                 .order_by(Certification.id, CertificationRequirement.order.asc(nulls="LAST")))
         # we have to add the is not null check so that `cert.requirement` always exists
         reqList = reqList.where(Certification.id == certification, CertificationRequirement.id.is_null(False))
@@ -149,11 +148,20 @@ def getCertRequirements(certification=None, username=None):
         uniqueCertification = []
         
         for cert in certificationList:
-            if certificationList[certificationIndex] not in validCertification:
-                validCertification.add(certificationList[certificationIndex])
-                uniqueCertification.append(certificationList[certificationIndex])
+            req = certificationList[certificationIndex]
+            print(req.id, req.completed, "nyeet")
+            if req not in validCertification:
+                validCertification.add(req)
+                uniqueCertification.append(req)
+            # Override incomplete requirement when a completed 'once' requirement is found when removing duplicates
+            elif reqCheck and req.frequency == "once" and req.completed: 
+                for i in range(len(uniqueCertification)):
+                    if uniqueCertification[i].id == req.id and not uniqueCertification[i].completed:
+                        uniqueCertification[i] = req
+                        validCertification.add(req)
             certificationIndex += 1
         certificationList = uniqueCertification
+        print("Final List:", certificationList[0].id, certificationList[0].completed)
         return certificationList
     certificationDict = {}
     for cert in reqList:

From 01fbd07ee15fab28afff327ddf151960a5510c9a Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Fri, 28 Nov 2025 13:39:49 -0500
Subject: [PATCH 39/42] its the print statements that were breaking

---
 app/logic/certification.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 418d72fd4..901274bc9 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -149,7 +149,6 @@ def getCertRequirements(certification=None, username=None, reqCheck=False):
         
         for cert in certificationList:
             req = certificationList[certificationIndex]
-            print(req.id, req.completed, "nyeet")
             if req not in validCertification:
                 validCertification.add(req)
                 uniqueCertification.append(req)
@@ -161,7 +160,6 @@ def getCertRequirements(certification=None, username=None, reqCheck=False):
                         validCertification.add(req)
             certificationIndex += 1
         certificationList = uniqueCertification
-        print("Final List:", certificationList[0].id, certificationList[0].completed)
         return certificationList
     certificationDict = {}
     for cert in reqList:

From f22d5a22fd8513fff96e555a13bdcf5e0d05482e Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Wed, 10 Dec 2025 18:00:24 -0500
Subject: [PATCH 40/42] found a bug that could cause problem with none, null,
 graduating and non-degree- fixed it

---
 app/logic/certification.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 901274bc9..7021b71c8 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -31,12 +31,16 @@ def termsInTotal(username):
     the start term and populate from it with Fall-start alignment and special handling for NULL/Non-degree class level
     '''
     currentTerm = g.current_term
-    currentDesc = currentTerm.description 
+    currentDesc = currentTerm.description
+    print("see", currentTerm.isSummer) 
     if currentTerm.isSummer:
         currentDesc = f"Fall {currentTerm.year}"
+        print("here1")
     user = User.select().where(User.username == username).get()
     classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
     totalTerms = []
+    print("user level", user.rawClassLevel)
+    print("current desc", currentDesc)
     for level, name in enumerate(classLevel):
         if user.rawClassLevel == name:
             totalTermsCount = (level + 1) * 2
@@ -59,7 +63,7 @@ def termsInTotal(username):
     if user.rawClassLevel is None or user.rawClassLevel in ["NULL", "Graduating", "Non-Degree"]:
             totalTermsCount = 8 
             currentYear = currentTerm.year
-            currentSeason = "Fall" if "Fall" in currentTerm.description else "Spring"
+            currentSeason = "Fall" if "Fall" in currentDesc else "Spring"
             for a in range(totalTermsCount):
                 totalTerms.append(f"{currentSeason} {currentYear}")
                 if currentSeason == "Fall":

From fe25769749a442041bdf7e65e82b990fe2a16706 Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Wed, 10 Dec 2025 18:16:56 -0500
Subject: [PATCH 41/42] fixed the bug and remove print statements

---
 app/logic/certification.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index 7021b71c8..bc64feeb8 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -32,15 +32,11 @@ def termsInTotal(username):
     '''
     currentTerm = g.current_term
     currentDesc = currentTerm.description
-    print("see", currentTerm.isSummer) 
     if currentTerm.isSummer:
         currentDesc = f"Fall {currentTerm.year}"
-        print("here1")
     user = User.select().where(User.username == username).get()
     classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
     totalTerms = []
-    print("user level", user.rawClassLevel)
-    print("current desc", currentDesc)
     for level, name in enumerate(classLevel):
         if user.rawClassLevel == name:
             totalTermsCount = (level + 1) * 2

From 5b077fc7bdcdcecda818d1fed333335667fbb78b Mon Sep 17 00:00:00 2001
From: zawn <zawn@berea.edu>
Date: Thu, 18 Dec 2025 15:13:50 -0500
Subject: [PATCH 42/42] adjusting what to show when the current term is summer

---
 app/logic/certification.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/logic/certification.py b/app/logic/certification.py
index bc64feeb8..8562e09b5 100644
--- a/app/logic/certification.py
+++ b/app/logic/certification.py
@@ -32,9 +32,11 @@ def termsInTotal(username):
     '''
     currentTerm = g.current_term
     currentDesc = currentTerm.description
-    if currentTerm.isSummer:
-        currentDesc = f"Fall {currentTerm.year}"
     user = User.select().where(User.username == username).get()
+    if currentTerm.isSummer and user.rawClassLevel == "Freshman":
+        currentDesc = f"Fall {currentTerm.year}"
+    elif currentTerm.isSummer:
+        currentDesc = f"Spring {currentTerm.year}"
     classLevel = ["Freshman", "Sophomore", "Junior", "Senior"]
     totalTerms = []
     for level, name in enumerate(classLevel):