Graduation management first page

app/controllers/admin/volunteers.py

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

app/logic/participants.py

@@ -193,8 +193,8 @@ def sortParticipantsByStatus(event):
         # if rsvp is required for the event, grab all volunteers that are in the waitlist
         eventWaitlistData = [volunteer for volunteer in (eventParticipants + eventRsvpData) if volunteer.rsvpWaitlist and event.isRsvpRequired]
 
-        # put the rest of the users that are not on the waitlist into the volunteer data
-        eventVolunteerData = [volunteer for volunteer in eventNonAttendedData if volunteer not in eventWaitlistData]
+        # put all participants and non-waitlisted RSVPs into the volunteer data
+        eventVolunteerData = [volunteer for volunteer in (eventParticipants + eventNonAttendedData) if volunteer not in eventWaitlistData]
         eventNonAttendedData = []
 
     return eventNonAttendedData, eventWaitlistData, eventVolunteerData, eventParticipants

app/logic/volunteerSpreadsheet.py

@@ -225,7 +225,25 @@ def calculateRetentionRate(fallDict, springDict):
 
     return retentionDict
 
+def laborAttendanceByTerm(academicYear):
+    """Get labor students and their meeting attendance count for each term"""
+    base = getBaseQuery(academicYear)
 
+    query = (base.select(
+        fn.CONCAT(User.firstName, ' ', User.lastNAme).alias('fullName'), 
+        User.bnumber, 
+        User.email, 
+        Term.description, 
+        fn.COUNT(EventParticipant.event_id).alias('meetingsAttended'), 
+    )
+    .where(Event.isLaborOnly == True)
+    .group_by(User.username, Term.description)
+    .order_by(User.lastName, Term.description)
+    )
+
+    columns = ("Full Name", "B-Number", "Email", "Term", "Meetings Attended")
+    return (query.tuples())
+
 def makeDataXls(sheetName, sheetData, workbook, sheetDesc=None):
     # assumes the length of the column titles matches the length of the data
     (columnTitles, dataTuples) = sheetData

app/static/js/graduationManagement.js

@@ -18,8 +18,7 @@ $(document).ready(function() {
         return true;
     });
 
-    $('.graduated-checkbox').not('.hasHandler').addClass("hasHandler") 
-    $('.graduated-checkbox').change(checkboxClickHandler);
+    $(document).on('change', '.graduated-checkbox', checkboxClickHandler);
 
     initializePage()
 
@@ -123,9 +122,7 @@ $(document).ready(function() {
     }
 
     function redrawTable() {
-        gradStudentsTable.draw(); 
-        $('.graduated-checkbox').not('.hasHandler').change(checkboxClickHandler);
-        $('.graduated-checkbox').not('.hasHandler').addClass("hasHandler") 
+        gradStudentsTable.draw();
     }
 
     function checkboxClickHandler() {
@@ -137,20 +134,22 @@ $(document).ready(function() {
             data: {status: hasGraduated ? 1 : 0},
             url: `/${username}/setGraduationStatus`,
             success: function(response) {
-                initializePage()
                 msgFlash(`Saved graduation status for ${username}.`, "success", 1000)
                 const row = $(`tr[data-username="${username}"]`);
+                var currentPage = gradStudentsTable.page();
                 if (hasGraduated) {
                     row.data('status', 'alumni');
                     $(`#${username}ClassLevel`).text("Alumni");
                     if (!showGraduatedStudents()) {
                         row.addClass('hidden');
-                        redrawTable();
                     }
                 } else {
                     row.data('status', 'enrolled');
                     $(`#${username}ClassLevel`).text("Senior");
+                    row.removeClass('hidden');
                 }
+                gradStudentsTable.draw();
+                gradStudentsTable.page(currentPage).draw(false);
             },
             error: function(status, error) {
                 console.error("Error updating graduation status:", error);

app/templates/events/volunteerDetails.html

@@ -59,31 +59,30 @@ <h4 class="nameSelect" nowrap><b>{{ participant.user.firstName }} {{ participant
 {% macro printParticipants(type, attended, rsvp, waitlist) %}
     {% set seen = [] %}
     {% set combinedParticipants = attended + rsvp + waitlist %}
-    {% for p in combinedParticipants %}
-        {% set username = p.user.username %}
-        {% if username not in seen %}
-            {% set _ = seen.append(username) %}
-            {% set status = none %}
-            {% if p in attended %}
-                {% set status = 'attended'%}
-            {% elif p in rsvp %}
-                {% set status = 'rsvp'%}
-            {% elif p in waitlist %}
-                {% set status = 'waitlist'%}
-            {% endif %}
-            {% if status %}
-                {% if type == 'card' %}
-                    {{ createCard(p, status) }}
-                {% elif type == 'table' %}
-                    {{ createTable(p, status) }}
-                {% endif %}
-            {% endif %}
-        {% endif %}
+        {% for p in combinedParticipants | unique %}
+      {% if p in rsvp and not event.isRsvpRequired %}
+      {{createTable(p, 'invited') if type == 'table' else createCard(p, 'invited') }}
+      {% endif %}
+      {% if p in rsvp and event.isRsvpRequired %}
+          {{createTable(p, 'rsvp') if type == 'table' else createCard(p, 'rsvp') }}
+      {% endif %}
+      {% if p in attended%}
+          {{createTable(p, 'attended') if type == 'table' else createCard(p, 'attended') }}
+      {% endif %}
+      {% if p in waitlist %}
+          {{createTable(p, 'waitlisted') if type == 'table' else createCard(p, 'waitlisted') }}
+      {% endif %}
     {% endfor %}
 {% endmacro %}
 
 {% macro createCheckbox(checkboxName) %}
-    {% set labelText = "RSVP" if checkboxName == 'rsvp' else 'Waitlist' if checkboxName == 'waitlist' else 'Attended' %}
+    {%- set labelMap = {
+        'rsvp': 'RSVP',
+        'waitlist': 'Waitlisted',
+        'attended': 'Attended',
+        'invited': 'Invited'
+    } -%}
+    {% set labelText = labelMap.get(checkboxName, 'Invited') %}
     <input class="displayCheckbox noprint" type="checkbox" name="selected_items" id="{{checkboxName}}Select" checked>
     <label for="{{checkboxName}}Select">{{labelText}}</label><br>
 {% endmacro %}
@@ -105,7 +104,7 @@ <h3 style="text-align: center; width:180%;">
       <div class="row">
         <div class="col">
           <label><b>Volunteer Groups:</b></label><br>
-          {% if rsvpUser %}
+          {% if rsvpUser and event.isRsvpRequired %}
              {{createCheckbox('rsvp')}}
           {% endif %}
           {% if waitlistUser %}
@@ -114,6 +113,9 @@ <h3 style="text-align: center; width:180%;">
           {% if attendedUser %}
             {{createCheckbox('attended')}}
           {% endif %}
+            {% if rsvpUser and not event.isRsvpRequired %}
+            {{createCheckbox('invited')}}
+          {% endif %}
         </div>
         <div class="col">
           <label><b>Included Information:</b></label><br>