Bonner checkmark profile

app/controllers/admin/routes.py

@@ -327,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,
         ))

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, declareMinorInterest, 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))

app/logic/certification.py

@@ -1,14 +1,68 @@
 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
 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):
+    '''
+    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): 
+    '''
+    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.
+    '''
+    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}'
+        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
+        elif str(user.rawClassLevel) == "None":
+            missedTerms = 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)
 
@@ -28,7 +82,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 :(
@@ -43,26 +96,41 @@ 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))
-        reqList = reqList.distinct()
-
-        certs = []
+        certificationList = []
         for cert in reqList:
             if username:
                 cert.requirement.completed = bool(cert.__dict__['completed'])
-            certs.append(cert.requirement)
-        return certs
-
-        #return [cert.requirement for cert in reqList]
+                # 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 = len(termsAttended(cert.requirement.id, username))
+                    cert.requirement.attendedDescriptions = termsAttended(cert.requirement.id, username)
+            certificationList.append(cert.requirement)
+
+        # 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 = uniqueCertification
+
+        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):
     """

app/static/js/userProfile.js

@@ -17,6 +17,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`)
@@ -215,7 +220,7 @@ $(document).ready(function(){
         reloadWithAccordion(target)
       }
     });
-});
+  });
 
   $(".deleteNoteButton").click(function() {
     let username = $(this).data('username')
@@ -326,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

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() %}
@@ -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>

app/templates/main/userProfile.html

@@ -44,7 +44,9 @@ <h1>{{volunteer.firstName}} {{volunteer.lastName}}</h1>
     {% if volunteer.major -%}
     <div>{{volunteer.major}}</div>
     {% endif %}
-    <div>{{volunteer.processedClassLevel}}</div>
+    {% if volunteer.classLevel %}
+    <div>{{volunteer.classLevel}} </div>
+    {% endif %}
     {% if volunteer.cpoNumber %}
       <div>
       {{volunteer.cpoNumber}} 
@@ -459,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 #}
@@ -508,11 +511,28 @@ <h5>Notes</h5>
               <h5>Requirement Progress</h5>
               <ul>
               {% for req in bonnerRequirements %}
-                <li>{{req.name}}
-                {% if req.completed %}
+                <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}}
+                </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 %}
+                {% elif 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" %}
+                    <span class="bi bi-x fs-3"></span>
+                    <span class="bi bi-x fs-3"></span>
                 {% endif %}
                 </li>
               {% endfor %}
@@ -522,6 +542,7 @@ <h5>Requirement Progress</h5>
         </div>
       </div>
     </div>
+  </div>
   {% endif %}
 <!-- ################# Bonner Scholar ################ -->
 </div>