Dev -> Prod

app/controllers/admin/routes.py

@@ -1,6 +1,6 @@
 from flask import request, render_template, url_for, g, redirect
 from flask import flash, abort, jsonify, session, send_file
-from peewee import DoesNotExist, fn, IntegrityError
+from peewee import DoesNotExist, IntegrityError
 from playhouse.shortcuts import model_to_dict
 import json
 from datetime import datetime
@@ -27,6 +27,7 @@
 from app.models.term import Term
 from app.models.eventViews import EventView
 from app.models.courseStatus import CourseStatus
+from app.models.programManager import ProgramManager
 
 from app.logic.userManagement import getAllowedPrograms, getAllowedTemplates
 from app.logic.createLogs import createActivityLog
@@ -75,6 +76,13 @@ def templateSelect():
     if not programs:
         abort(403)
     visibleTemplates = getAllowedTemplates(g.current_user)
+
+    # Create extravaganza QR code if it doesn't exist
+    imgPath = app.config["files"]["image_path"] + "/extravaganza_qr.png"
+    if not os.path.exists(imgPath):
+        import qrcode
+        img = qrcode.make(request.url.split("/")[-2] + "/extravaganza")
+        img.save(imgPath)
     return render_template("/events/templateSelector.html",
                             programs=programs,
                             celtsSponsoredProgram = Program.get(Program.isOtherCeltsSponsored),
@@ -97,7 +105,7 @@ def createEvent(templateid, programid):
         return redirect(url_for("admin.program_picker"))
 
     # Get the data from the form or from the template
-    eventData = template.templateData
+    eventData = template.templateData    
     eventData['program'] = program
 
     if request.method == "GET":
@@ -113,9 +121,8 @@ def createEvent(templateid, programid):
     # Try to save the form
     if request.method == "POST":
         savedEvents = None
-        eventData.update(request.form.copy())
+        eventData.update(request.form.copy())        
         eventData = preprocessEventData(eventData)
-
         if eventData.get('isSeries'):
             eventData['seriesData'] = json.loads(eventData['seriesData'])
             succeeded, savedEvents, failedSavedOfferings = attemptSaveMultipleOfferings(eventData, getFilesFromRequest(request))
@@ -128,9 +135,8 @@ def createEvent(templateid, programid):
             try:
                 savedEvents, validationErrorMessage = attemptSaveEvent(eventData, getFilesFromRequest(request))
             except Exception as e:
-                print("Failed saving regular event", e)
+                print("Failed saving regular event: ", e)
                 validationErrorMessage = "Failed to save event."
-
         if savedEvents:
             rsvpCohorts = request.form.getlist("cohorts[]")
             if rsvpCohorts:
@@ -144,10 +150,10 @@ def createEvent(templateid, programid):
 
             if program:
                 if len(savedEvents) > 1 and eventData.get('isRepeating'):
-                    createActivityLog(f"Created a repeating series, <a href=\"{url_for('admin.eventDisplay', eventId = savedEvents[0].id)}\">{savedEvents[0].name[:-7]}</a>, for {program.programName}, with a start date of {datetime.strftime(savedEvents[0].startDate, '%m/%d/%Y')}. The last event in the series will be on {datetime.strftime(savedEvents[-1].startDate, '%m/%d/%Y')}.")
+                    createActivityLog(f'''Created a repeating series, <a href=\"{url_for('admin.eventDisplay', eventId = savedEvents[0].id)}\">{savedEvents[0].name[:-7]}</a>, for {program.programName}, with a start date of {datetime.strftime(savedEvents[0].startDate, '%m/%d/%Y')}. The last event in the series will be on {datetime.strftime(savedEvents[-1].startDate, '%m/%d/%Y')}.''')
                 elif len(savedEvents) >= 1 and eventData.get('isSeries'):
                     eventDates = [eventData.startDate.strftime('%m/%d/%Y') for eventData in savedEvents]
-                    eventList = ', '.join(f"<a href=\"{url_for('admin.eventDisplay', eventId=event.id)}\">{event.name}</a>" for event in savedEvents)
+                    eventList = ', '.join(f'''<a href=\"{url_for('admin.eventDisplay', eventId=event.id)}\">{event.name}</a>''' for event in savedEvents)
 
                     if len(savedEvents) > 1:
                         #creates list of events created in a multiple series to display in the logs
@@ -159,9 +165,9 @@ def createEvent(templateid, programid):
                     createActivityLog(f"Created series {eventList} for {program.programName}, with start dates of {eventDates}.")
 
                 else:
-                    createActivityLog(f"Created event <a href=\"{url_for('admin.eventDisplay', eventId = savedEvents[0].id)}\">{savedEvents[0].name}</a> for {program.programName}, with a start date of {datetime.strftime(eventData['startDate'], '%m/%d/%Y')}.")
+                    createActivityLog('''Created event <a href=\"{url_for('admin.eventDisplay', eventId = savedEvents[0].id)}\">{savedEvents[0].name}</a> for {program.programName}, with a start date of {datetime.strftime(eventData['startDate'], '%m/%d/%Y')}.''')
             else:
-                createActivityLog(f"Created a non-program event, <a href=\"{url_for('admin.eventDisplay', eventId = savedEvents[0].id)}\">{savedEvents[0].name}</a>, with a start date of {datetime.strftime(eventData['startDate'], '%m/%d/%Y')}.")
+                createActivityLog(f'''Created a non-program event, <a href=\"{url_for('admin.eventDisplay', eventId = savedEvents[0].id)}\">{savedEvents[0].name}</a>, with a start date of {datetime.strftime(eventData['startDate'], '%m/%d/%Y')}.''')
 
             return redirect(url_for("admin.eventDisplay", eventId = savedEvents[0].id))
         else:
@@ -180,8 +186,6 @@ def createEvent(templateid, programid):
         for year, cohort in rawBonnerCohorts.items():
             if cohort:
                 bonnerCohorts[year] = cohort
-
-
     return render_template(f"/events/{template.templateFile}",
                            template = template,
                            eventData = eventData,
@@ -239,7 +243,7 @@ def renewEvent(eventId):
             return redirect(url_for('admin.eventDisplay', eventId = eventId))
 
         copyRsvpToNewEvent(priorEvent, newEvent[0])
-        createActivityLog(f"Renewed {priorEvent['name']} as <a href='event/{newEvent[0].id}/view'>{newEvent[0].name}</a>.")
+        createActivityLog(f'''Renewed {priorEvent['name']} as <a href='event/{newEvent[0].id}/view'>{newEvent[0].name}</a>.''')
         flash("Event successfully renewed.", "success")
         return redirect(url_for('admin.eventDisplay', eventId = newEvent[0].id))
 
@@ -289,10 +293,14 @@ def eventDisplay(eventId):
 
 
     if request.method == "POST": # Attempt to save form
-        eventData = request.form.copy()
+        eventData = request.form.copy()        
         try:
             savedEvents, validationErrorMessage = attemptSaveEvent(eventData, getFilesFromRequest(request))
 
+        except IntegrityError as e:
+            print("Error saving event:", e)
+            savedEvents = False
+            validationErrorMessage = "This combination of settings is not allowed."
         except Exception as e:
             print("Error saving event:", e)
             savedEvents = False
@@ -682,3 +690,15 @@ def displayEventFile():
     isChecked = fileData.get('checked') == 'true'
     eventfile.changeDisplay(fileData['id'], isChecked)
     return ""
+
+@admin_bp.route("/handbookSignature", methods=["POST"])
+def handbookSignature():
+    if not (g.current_user.username == request.form.get('studentUsername')):
+        abort(403)
+
+    signer = g.current_user
+    signer.lastHandbookSignature = datetime.now()
+    signer.signatureTerm = g.current_term
+    signer.save()
+
+    return ""

app/controllers/admin/userManagement.py

@@ -1,20 +1,31 @@
-from flask import render_template,request, flash, g, abort, redirect, url_for, jsonify
-from playhouse.shortcuts import model_to_dict
-from peewee import fn, JOIN, DoesNotExist
+import os
+from pathlib import Path
 import re
 
+from flask import render_template,request, flash, g, abort, redirect, send_file, url_for, jsonify, session
+from peewee import fn, JOIN, DoesNotExist
+from playhouse.shortcuts import model_to_dict
+from werkzeug.utils import secure_filename
+
+
+from app import app
+from app.logic.term import changeCurrentTerm
 from app.controllers.admin import admin_bp
-from app.models.user import User
-from app.models.program import Program
 from app.logic.fileHandler import FileHandler
-from app.logic.userManagement import addCeltsAdmin,addCeltsStudentStaff,removeCeltsAdmin,removeCeltsStudentStaff
+from app.logic.userManagement import addCeltsAdmin,addCeltsStudentStaff, createSpreadsheetForRosters,removeCeltsAdmin,removeCeltsStudentStaff
 from app.logic.userManagement import changeProgramInfo
+from app.logic.participants import getTrainingsForInterestedParticipants, getParticipantsForProgramForAY
 from app.logic.utils import selectSurroundingTerms
 from app.logic.term import addNextTerm, changeCurrentTerm
+from app.logic.users import getProgramInterest
 from app.logic.volunteers import setProgramManager
 from app.models.attachmentUpload import AttachmentUpload
 from app.models.programManager import ProgramManager
+from app.models.programBan import ProgramBan
+from app.models.user import User
+from app.models.term import Term
 from app.models.user import User
+from app.models.program import Program
 
 @admin_bp.route('/admin/manageUsers', methods = ['POST'])
 def manageUsers():
@@ -114,28 +125,87 @@ def userManagement():
     if not g.current_user.isCeltsAdmin:
         currentPrograms = currentPrograms.where(ProgramManager.user == g.current_user.username)
 
-    currentPrograms = currentPrograms.group_by(Program.id)
-
+    currentPrograms = list(currentPrograms.group_by(Program.id))
     currentAdmins = list(User.select().where(User.isCeltsAdmin))
     currentStudentStaff = list(User.select().where(User.isCeltsStudentStaff))
+
     if g.current_user.isCeltsAdmin or g.current_user.isProgramManager:
         return render_template('admin/userManagement.html',
                                 terms = terms,
-                                programs = list(currentPrograms),
+                                programs = currentPrograms,
                                 currentAdmins = currentAdmins,
                                 currentStudentStaff = currentStudentStaff,
                                 )
     abort(403)
 
 @admin_bp.route('/admin/changeTerm', methods=['POST'])
 def changeTerm():
-    termData = request.form
-    term = int(termData["id"])
-    changeCurrentTerm(term)
+    newTerm = changeCurrentTerm(int(request.form.get('id')))
+    flash(f"Current term successfully changed to {newTerm.description}", "success")
+
     return ""
 
 @admin_bp.route('/admin/addNewTerm', methods = ['POST'])
 def addNewTerm():
-    addNextTerm()
-    flash("New term added", "success")
+    newTerm = addNextTerm()
+    flash(f"Successfully added {newTerm.description}", "success")
+
     return ""
+
+@admin_bp.route('/upload/<userFileCategory>/<userTermId>', methods = ['POST'])
+def upload(userFileCategory, userTermId):
+    try:
+        handbookTerm = Term.get_by_id(userTermId)
+    except DoesNotExist:
+        abort(405)
+
+    if userFileCategory not in ["laborHandbook", "volunteerHandbook"]:
+        abort(405)
+    fileCategory = userFileCategory
+
+    # Save file to fs
+    file = request.files[fileCategory]
+    newFilename = g.current_term.academicYear + "-" + fileCategory + "." + secure_filename(file.filename).split(".")[-1]
+
+    dir_path = Path(app.config['files']['base_path'], fileCategory)
+    dir_path.mkdir(parents=True, exist_ok=True)
+    full_path = os.path.join(dir_path, newFilename)
+    if os.path.exists(full_path):
+        os.remove(full_path)
+    file.save(full_path)
+
+    # Update all terms in the Academic Year with the handbook filename
+    for ayTerm in Term.select().where(Term.academicYear == handbookTerm.academicYear):
+        setattr(ayTerm, fileCategory, newFilename)
+        ayTerm.save()
+
+    # refresh the session with the new object
+    changeCurrentTerm(g.current_term, refreshOnly=True)
+
+    flash(f"Handbook saved successfully to {ayTerm.description}!", "success")
+    return redirect(request.referrer)
+
+@admin_bp.route('/viewRoster/<programID>', methods = ['GET'])
+def viewRoster(programID):
+    program = Program.get_by_id(programID)
+
+    interestedUsers = list(getProgramInterest(program)) 
+    trainedAndInterested = getTrainingsForInterestedParticipants(program, interestedUsers)
+    lastYearsParticipants = getParticipantsForProgramForAY(program, g.current_term.previousAcademicYear)
+    currentYearsParticipants = getParticipantsForProgramForAY(program, g.current_term.academicYear)
+    return render_template('admin/viewRoster.html',
+                           program = program,
+                           interestedUsers = interestedUsers, 
+                           trainedAndInterested = trainedAndInterested,
+                           lastYearsParticipants = lastYearsParticipants,
+                           currentYearsParticipants = currentYearsParticipants
+                                )
+
+@admin_bp.route('/exportRosters/<programID>/<academicYear>', methods = ['GET'])
+def exportRosters(programID, academicYear):
+    try:
+        outFile = createSpreadsheetForRosters(academicYear, programID)
+        filepath = os.path.abspath(outFile)
+        return send_file(filepath, as_attachment=True, download_name=filepath.split("/")[-1], mimetype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
+    except DoesNotExist:
+        abort(403)

app/controllers/admin/volunteers.py

@@ -11,12 +11,12 @@
 from app.models.insuranceInfo import InsuranceInfo
 from app.logic.searchUsers import searchUsers
 from app.logic.volunteers import updateEventParticipants, getEventLengthInHours, addUserBackgroundCheck, setProgramManager, deleteUserBackgroundCheck
-from app.logic.participants import trainedParticipants, addPersonToEvent, getParticipationStatusForTrainings, sortParticipantsByStatus
+from app.logic.participants import addPersonToEvent, getParticipationStatusForTrainings, sortParticipantsByStatus
 from app.logic.events import getPreviousSeriesEventData, getEventRsvpCount
 from app.models.eventRsvp import EventRsvp
 from app.models.backgroundCheck import BackgroundCheck
 from app.logic.createLogs import createActivityLog, createRsvpLog
-from app.logic.users import getBannedUsers, isBannedFromEvent
+from app.logic.users import getBannedUsers, isBannedFromEvent, trainedParticipants
 
 
 @admin_bp.route('/searchVolunteers/<query>', methods = ['GET'])