Selectively remove service transcript entry for banned programs

app/controllers/main/routes.py

@@ -3,7 +3,7 @@
 from peewee import JOIN
 from http import cookies
 from playhouse.shortcuts import model_to_dict
-from flask import request, render_template, g, abort, flash, redirect, url_for
+from flask import request, render_template, g, abort, flash, redirect, url_for,jsonify
 
 from app.controllers.main import main_bp
 from app import app
@@ -55,7 +55,7 @@ def landingPage():
                                          .distinct()
                                          .execute())  # Ensure only unique programs are included
 
-    return render_template("/main/landingPage.html", 
+    return render_template("/main/landingPage.html",
                            managerProgramDict=managerProgramDict,
                            term=g.current_term,
                            programsWithEventsList=programsWithEventsList)
@@ -73,20 +73,20 @@ def events(selectedTerm, activeTab, programID):
     if selectedTerm:
         currentTerm = selectedTerm
     currentTime = datetime.datetime.now()
-    
+
     listOfTerms = Term.select()
     participantRSVP = EventRsvp.select(EventRsvp, Event).join(Event).where(EventRsvp.user == g.current_user)
     rsvpedEventsID = [event.event.id for event in participantRSVP]
 
-    term = Term.get_by_id(currentTerm) 
-    
+    term = Term.get_by_id(currentTerm)
+
     currentEventRsvpAmount = getEventRsvpCountsForTerm(term)
     studentLedEvents = getStudentLedEvents(term)
     countUpcomingStudentLedEvents = getUpcomingStudentLedCount(term, currentTime)
     trainingEvents = getTrainingEvents(term, g.current_user)
     bonnerEvents = getBonnerEvents(term)
     otherEvents = getOtherEvents(term)
-    
+
     managersProgramDict = getManagerProgramDict(g.current_user)
 
     return render_template("/events/event_list.html",
@@ -146,7 +146,7 @@ def viewUsersProfile(username):
                                            ProgramBan.program == program,
                                            ProgramBan.endDate > datetime.datetime.now()).execute())
             userParticipatedTrainingEvents = getParticipationStatusForTrainings(program, [volunteer], g.current_term)
-            try: 
+            try:
                 allTrainingsComplete = False not in [attended for event, attended in userParticipatedTrainingEvents[username]] # Did volunteer attend all events
             except KeyError:
                 allTrainingsComplete = False
@@ -201,7 +201,7 @@ def emergencyContactInfo(username):
                                 contactInfo=contactInfo,
                                 readOnly=readOnly
                                 )
-    
+
     elif request.method == 'POST':
         if g.current_user.username != username:
             abort(403)
@@ -210,8 +210,8 @@ def emergencyContactInfo(username):
         if not rowsUpdated:
             EmergencyContact.create(user = username, **request.form)
         createAdminLog(f"{g.current_user} updated {username}'s emergency contact information.")
-        flash('Emergency contact information saved successfully!', 'success') 
-        
+        flash('Emergency contact information saved successfully!', 'success')
+
         if request.args.get('action') == 'exit':
             return redirect (f"/profile/{username}")
         else:
@@ -243,7 +243,7 @@ def insuranceInfo(username):
         if not rowsUpdated:
             InsuranceInfo.create(user = username, **request.form)
         createAdminLog(f"{g.current_user} updated {username}'s emergency contact information.")
-        flash('Insurance information saved successfully!', 'success') 
+        flash('Insurance information saved successfully!', 'success')
 
         if request.args.get('action') == 'exit':
             return redirect (f"/profile/{username}")
@@ -254,7 +254,7 @@ def insuranceInfo(username):
 def travelForm(username):
     if not (g.current_user.username == username or g.current_user.isCeltsAdmin):
         abort(403)
-   
+
     user = (User.select(User, EmergencyContact, InsuranceInfo)
                 .join(EmergencyContact, JOIN.LEFT_OUTER).switch()
                 .join(InsuranceInfo, JOIN.LEFT_OUTER)
@@ -449,6 +449,48 @@ def serviceTranscript(username):
                             startDate = startDate,
                             userData = user)
 
+@main_bp.route('/profile/<username>/removeFromTranscript/<program_id>', methods=['GET'])
+def checkRemoved(username, program_id):
+    # Check if the user is banned from the program
+    user = User.get_or_none(User.username == username)
+    if user is None:
+        abort(404)
+
+    try:
+        program_ban = ProgramBan.get((ProgramBan.program == program_id) & (ProgramBan.user == user))
+        # If the user is banned, check if it's marked for removal from transcript
+        if program_ban.removeFromTranscript:
+            return jsonify({'removedFromTranscript': True})
+        else:
+            return jsonify({'removedFromTranscript': False})
+    except ProgramBan.DoesNotExist:
+        return jsonify({'status': 'error', 'message': 'ProgramBan not found'})
+
+@main_bp.route('/profile/<username>/updateTranscript/<program_id>', methods=['POST'])
+def update_transcript(username, program_id):
+    # Check user permissions
+    user = User.get_or_none(User.username == username)
+    if user is None:
+        abort(404)
+    if user != g.current_user and not g.current_user.isAdmin:
+        abort(403)
+
+    # Get the data sent from the client-side JavaScript
+    data = request.json
+
+    # Retrieve removeFromTranscript value from the request data
+    removeFromTranscript = data.get('removeFromTranscript')
+
+    # Update the ProgramBan object matching the program_id and username
+    try:
+        program_ban = ProgramBan.get((ProgramBan.program == program_id) & (ProgramBan.user == user))
+        program_ban.removeFromTranscript = removeFromTranscript
+        program_ban.save()
+        return jsonify({'status': 'success'})
+    except ProgramBan.DoesNotExist:
+        return jsonify({'status': 'error', 'message': 'ProgramBan not found'})
+
+
 @main_bp.route('/searchUser/<query>', methods = ['GET'])
 def searchUser(query):
 
@@ -474,12 +516,12 @@ def getDietInfo():
     dietaryInfo = request.form
     user = dietaryInfo["user"]
     dietInfo = dietaryInfo["dietInfo"]
-    
+
     if (g.current_user.username == user) or g.current_user.isAdmin:
         updateDietInfo(user, dietInfo)
-        userInfo = User.get(User.username == user) 
+        userInfo = User.get(User.username == user)
         if len(dietInfo) > 0:
-            createAdminLog(f"Updated {userInfo.fullName}'s dietary restrictions to {dietInfo}.") if dietInfo.strip() else None 
+            createAdminLog(f"Updated {userInfo.fullName}'s dietary restrictions to {dietInfo}.") if dietInfo.strip() else None
         else:
             createAdminLog(f"Deleted all {userInfo.fullName}'s dietary restrictions dietary restrictions.")
 

app/logic/transcript.py

@@ -1,77 +1,88 @@
-from peewee import fn
-
-from app.models.course import Course
-from app.models.courseParticipant import CourseParticipant
-from app.models.program import Program
-from app.models.courseInstructor import CourseInstructor
-from app.models.user import User
-from app.models.term import Term
-from app.models.eventParticipant import EventParticipant
-from app.models.event import Event
-
-def getProgramTranscript(username):
-    """
-    Returns a Program query object containing all the programs for
-    current user.
-    """
-    # Add up hours earned in a term for each program they've participated in
-
-    EventData = (Event.select(Event, fn.SUM(EventParticipant.hoursEarned).alias("hoursEarned"))
-                      .join(EventParticipant)
-                      .where(EventParticipant.user == username)
-                      .group_by(Event.program, Event.term)
-                      .order_by(Event.term)
-                      .having(fn.SUM(EventParticipant.hoursEarned > 0)))
-    transcriptData = {}
-    for event in EventData:
-        if event.program in transcriptData:
-            transcriptData[event.program].append([event.term.description, event.hoursEarned])
-        else:
-            transcriptData[event.program] = [[event.term.description, event.hoursEarned]]
-    return transcriptData
-
-def getSlCourseTranscript(username):
-    """
-    Returns a SLCourse query object containing all the training events for
-    current user.
-    """
-
-    slCourses = (Course.select(Course, fn.SUM(CourseParticipant.hoursEarned).alias("hoursEarned"))
-                       .join(CourseParticipant, on=(Course.id == CourseParticipant.course))
-                       .where(CourseParticipant.user == username)
-                       .group_by(Course.courseName, Course.term))
-
-    return slCourses
-
-def getTotalHours(username):
-    """
-    Get the toal hours from events and courses combined.
-    """
-    eventHours = (EventParticipant.select(fn.SUM(EventParticipant.hoursEarned))
-                                 .where(EventParticipant.user == username)).scalar()
-    courseHours =  (CourseParticipant.select(fn.SUM(CourseParticipant.hoursEarned))
-                                    .where(CourseParticipant.user == username)).scalar()
-
-    allHours = {"totalEventHours": (eventHours or 0),
-                "totalCourseHours": (courseHours or 0),
-                "totalHours": (eventHours or 0) + (courseHours or 0)}
-    return allHours
-
-def getStartYear(username):
-    """
-    Returns the users start term for participation in the CELTS organization
-    """
-
-    startDate = (EventParticipant.select(Term.year)
-                                 .join(Event)
-                                 .join(Term).where(EventParticipant.user == username)
-               + CourseParticipant.select(Term.year)
-                                 .join(Course)
-                                 .join(Term)
-                                 .where(CourseParticipant.user == username)
-                ).order_by(Event.term.year).first()
-
-    if startDate:
-        return startDate.event.term.year
-
-    return "N/A"
+from peewee import fn
+
+from app.models.course import Course
+from app.models.courseParticipant import CourseParticipant
+from app.models.program import Program
+from app.models.programBan import ProgramBan
+from app.models.courseInstructor import CourseInstructor
+from app.models.user import User
+from app.models.term import Term
+from app.models.eventParticipant import EventParticipant
+from app.models.event import Event
+
+def getProgramTranscript(username):
+    """
+    Returns a Program query object containing all the programs for
+    the current user.
+    """
+    # Add up hours earned in a term for each program they've participated in
+
+    EventData = (Event.select(Event, fn.SUM(EventParticipant.hoursEarned).alias("hoursEarned"))
+                      .join(EventParticipant)
+                      .where(EventParticipant.user == username)
+                      .group_by(Event.program, Event.term)
+                      .order_by(Event.term)
+                      .having(fn.SUM(EventParticipant.hoursEarned > 0)))
+
+    # Fetch all ProgramBan objects for the user
+    BannedProgramsForParticipant = ProgramBan.select().where(ProgramBan.user == username)
+
+    # Create a set of program IDs to remove from transcript
+    programsToremoveFromTranscript = {bannedProgram.program_id for bannedProgram in BannedProgramsForParticipant if bannedProgram.removeFromTranscript}
+    transcriptData = {}
+
+    # Iterate through EventData and populate transcriptData
+    for event in EventData:
+        if event.program.id not in programsToremoveFromTranscript:  # Check if program is not in programs to be removed from transcript
+            if event.program in transcriptData:
+                transcriptData[event.program].append([event.term.description, event.hoursEarned])
+            else:
+                transcriptData[event.program] = [[event.term.description, event.hoursEarned]]
+
+    return transcriptData
+
+def getSlCourseTranscript(username):
+    """
+    Returns a SLCourse query object containing all the training events for
+    current user.
+    """
+
+    slCourses = (Course.select(Course, fn.SUM(CourseParticipant.hoursEarned).alias("hoursEarned"))
+                       .join(CourseParticipant, on=(Course.id == CourseParticipant.course))
+                       .where(CourseParticipant.user == username)
+                       .group_by(Course.courseName, Course.term))
+
+    return slCourses
+
+def getTotalHours(username):
+    """
+    Get the toal hours from events and courses combined.
+    """
+    eventHours = (EventParticipant.select(fn.SUM(EventParticipant.hoursEarned))
+                                 .where(EventParticipant.user == username)).scalar()
+    courseHours =  (CourseParticipant.select(fn.SUM(CourseParticipant.hoursEarned))
+                                    .where(CourseParticipant.user == username)).scalar()
+
+    allHours = {"totalEventHours": (eventHours or 0),
+                "totalCourseHours": (courseHours or 0),
+                "totalHours": (eventHours or 0) + (courseHours or 0)}
+    return allHours
+
+def getStartYear(username):
+    """
+    Returns the users start term for participation in the CELTS organization
+    """
+
+    startDate = (EventParticipant.select(Term.year)
+                                 .join(Event)
+                                 .join(Term).where(EventParticipant.user == username)
+               + CourseParticipant.select(Term.year)
+                                 .join(Course)
+                                 .join(Term)
+                                 .where(CourseParticipant.user == username)
+                ).order_by(Event.term.year).first()
+
+    if startDate:
+        return startDate.event.term.year
+
+    return "N/A"

app/logic/users.py

@@ -5,6 +5,7 @@
 from app.models.note import Note
 from app.models.user import User
 from app.models.profileNote import ProfileNote
+from app.models.programBan import ProgramBan
 from app.models.backgroundCheck import BackgroundCheck
 from app.models.backgroundCheckType import BackgroundCheckType
 from app.logic.volunteers import addUserBackgroundCheck

app/models/programBan.py

@@ -9,3 +9,6 @@ class ProgramBan(baseModel):
     endDate = DateField(null=True)
     banNote = ForeignKeyField(Note, null=False)
     unbanNote = ForeignKeyField(Note, null=True)
+    removeFromTranscript = BooleanField(default=False)
+
+