Interface graduation management

admin/graduationManagement

@@ -0,0 +1,39 @@
+{% set title = "Graduation Management" %}
+{% extends "base.html" %}
+
+{% block scripts %}
+  {{super()}}
+  <script type="module" src="/static/js/graduationManagement.js"></script>
+  <script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.js"></script>
+
+  {% block styles %}
+    {{super()}}
+    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/jquery.dataTables.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
+  {% endblock %}
+{% endblock %}
+
+{% block app_content %}
+<h1 class="text-center mb-5">Graduation Management</h1>
+<h2>Graduating/Graduated Students</h2>
+<table class="display" id="gradStudentsTable">
+    <thead>
+        <tr>
+            <th>Name</th>
+            <th>Graduated</th>
+            <th>Class Level</th>
+        </tr>
+    </thead>
+  <tbody>
+    {% for user in users %}
+    <tr>
+      <td>{{ user.username }}</td>
+      <td>{{ user.hasGraduated }}</td>
+      <td>{{ user.classLevel }}</td>
+
+    </tr>
+    {%endfor%}
+  </tbody>  
+</table>
+
+{% endblock %}

app/controllers/admin/__init__.py

@@ -11,4 +11,5 @@
 from app.controllers.admin import userManagement 
 from app.controllers.admin import volunteers
 from app.controllers.admin import minor
+from app.controllers.admin import graduationManagement
 

app/controllers/admin/graduationManagement.py

@@ -0,0 +1,72 @@
+from flask import render_template, g, abort, request, redirect, url_for, flash, send_file
+from app.models.user import User
+from app.controllers.admin import admin_bp
+from app.logic.bonner import getBonnerCohorts
+from app.models.bonnerCohort import BonnerCohort
+
+from app.logic.graduationManagement import getGraduatedStudent, removeGraduatedStudent, makeGraduatedXls
+from app.logic.minor import getMinorProgress
+
+
+@admin_bp.route('/admin/graduationManagement', methods=['GET'])
+def gradManagement():
+
+    if not g.current_user.isAdmin:
+        abort(403)
+
+    users = User.select(User.username, User.hasGraduated, User.classLevel, User.firstName, User.lastName).where(User.classLevel=='Senior')
+
+    CCEusers = getMinorProgress()
+
+    bonnercohorts = getBonnerCohorts()
+
+    return render_template('/admin/graduationManagement.html', 
+                           users = users, 
+                           bonnercohorts = bonnercohorts,
+                           CCEstudents = CCEusers)
+
+
+@admin_bp.route('/<username>/hasGraduated/', methods=['POST'])
+def hasGraduated(username):
+    """
+    This function 
+    username: unique value of a user to correctly identify them
+    """
+    try:
+        success = getGraduatedStudent(username)
+        if success:
+            return "", 200
+        else:
+            return "", 500
+
+    except Exception as e:
+        print(e)
+        return "Error Updating Graduation Status", 500
+
+@admin_bp.route('/<username>/hasNotGraduated/', methods=['POST'])
+def hasNotGraduated(username):
+    """
+    This function removes 
+    username: unique value of a user to correctly identify them
+    """
+    try:
+        removed = removeGraduatedStudent(username)
+        if removed:
+            flash("Graduation status has been updated!", "success")
+            return "", 200
+        else:
+            flash("Error!", "Failed to update graduation status.")
+            return "", 500
+    except Exception as e:
+        print(e)
+        return "Error Updating Graduation Status", 500
+
+@admin_bp.route("/gradStudentsxls/<filterType>", methods=['GET'])
+def gradsxls(filterType):
+    if not g.current_user.isCeltsAdmin:
+        abort(403)
+    print(filterType, '#####')
+    # filterType = request.args.get('filterType', 'all')
+    newfile = makeGraduatedXls(filterType)
+    return send_file(open(newfile, 'rb'), download_name='GraduatedStudents.xlsx', as_attachment=True)
+

app/logic/graduationManagement.py

@@ -0,0 +1,104 @@
+from collections import defaultdict
+from typing import List, Dict
+from playhouse.shortcuts import model_to_dict
+from peewee import JOIN, fn, Case, DoesNotExist
+import xlsxwriter
+from app import app
+
+from app.models.user import User
+from app.logic.minor import getMinorProgress
+from app.logic.bonner import getBonnerCohorts
+from app.models.bonnerCohort import BonnerCohort
+from app.models.term import Term
+
+
+def getGraduatedStudent(username):
+    """
+    This function marks students as graduated
+    Parameters:
+    username: username of the user graduating
+    """
+    gradStudent = User.get(User.username == username)
+    if gradStudent:
+        gradStudent.hasGraduated = True
+        gradStudent.save()
+        return True
+    return False
+
+def removeGraduatedStudent(username):
+    """
+    This function unmarks students as graduated
+    Parameters:
+    username: username of the user graduating
+
+    """
+    notGradStudent = User.get(User.username == username)
+    if notGradStudent:
+        notGradStudent.hasGraduated = False
+        notGradStudent.save()
+        return True
+    return False
+
+def makeGraduatedXls(filterType):
+    """
+    Create and save a GraduatedStudent.xlsx file with all of the graduated students.
+    Working with XLSX files: https://xlsxwriter.readthedocs.io/index.html
+
+    Returns:
+        The file path and name to the newly created file, relative to the web root.
+    """
+
+    print('filtertype:' , filterType, "#####")
+
+
+    CCEusers = getMinorProgress()
+    bonnercohorts = getBonnerCohorts()
+
+    filepath = app.config['files']['base_path'] + '/GraduatedStudents.xlsx'
+    workbook = xlsxwriter.Workbook(filepath, {'in_memory': True})
+    worksheet = workbook.add_worksheet('students')
+    bold = workbook.add_format({'bold': True})
+
+    worksheet.write('A1', 'Graduated Students', bold)
+    worksheet.set_column('A:A', 20)
+    prev_year = 1
+    row = 1
+
+    if filterType == 'all':
+        students = User.select().where(User.hasGraduated == True)
+    elif filterType == 'cce':
+        students = [student for student in CCEusers if student['hasGraduated']]
+    # elif filterType == 'bonner':
+    #     students = BonnerCohort.select(BonnerCohort, User).join(User).where(User.hasGraduated == True)
+
+    #     print('##### Student list')
+
+    #     for name in User.select(User.username):
+
+    #         print(name)
+
+    #     print('##### Student list')         
+    #     print('bonner filter selected #####')
+    # elif filterType == 'bonnercohorts':
+    #     students = [student for student in bonnercohorts if student['hasGraduated']]
+    else:
+        students = User.select()
+
+    for student in students:
+        # if filterType == 'bonner' and prev_year != student.year:
+        #     row += 1
+        #     prev_year = student.year
+        #     worksheet.write(row, 0, f"{student.year} - {student.year+1}", bold)
+
+        if filterType == 'cce':
+            worksheet.write(row, 0, f"{student['firstName']} {student['lastName']}")
+            print('CCE student found #####')
+        else:
+            worksheet.write(row, 0, f"{student.firstName} {student.lastName}")
+            print(' (all) student found #####')
+
+        row += 1
+
+    workbook.close()
+
+    return filepath

app/static/css/graduationManagement.css

@@ -0,0 +1,33 @@
+#selectAll-container {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+  margin-bottom: 15px;
+}
+
+.btn-group {
+  margin-right: 10px; /* Space between the dropdown and the buttons */
+
+}
+
+h1 {
+  margin-bottom: 0px;
+  margin-top: 10px;
+}
+
+.container {
+  margin-bottom: 20px; /* Adjust this as needed for proper spacing */
+}
+
+.w-25{
+  margin-bottom: 50px;
+
+ }
+
+
+#cohortFilter{
+  position:absolute;
+  right: 170px;
+  top: -19px;
+
+}