Student admin

app/controllers/admin/routes.py

@@ -44,13 +44,12 @@ def switchUser():
 
     print(f"Switching user from {g.current_user} to",request.form['newuser'])
     session['current_user'] = model_to_dict(User.get_by_id(request.form['newuser']))
-
     return redirect(request.referrer)
 
 
 @admin_bp.route('/eventTemplates')
 def templateSelect():
-    if g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentStaff:
+    if g.current_user.isAdmin:
         allprograms = getAllowedPrograms(g.current_user)
         visibleTemplates = getAllowedTemplates(g.current_user)
         return render_template("/events/template_selector.html",
@@ -148,7 +147,7 @@ def rsvpLogDisplay(eventId):
     eventData = model_to_dict(event, recurse=False)
     eventData['program'] = event.program
     isProgramManager = g.current_user.isProgramManagerFor(eventData['program'])
-    if g.current_user.isCeltsAdmin or (g.current_user.isCeltsStudentStaff and isProgramManager):
+    if g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentAdmin or isProgramManager:
         allLogs = EventRsvpLog.select(EventRsvpLog, User).join(User).where(EventRsvpLog.event_id == eventId).order_by(EventRsvpLog.createdOn.desc())
         return render_template("/events/rsvpLog.html",
                                 event = event,
@@ -172,8 +171,7 @@ def eventDisplay(eventId):
     except DoesNotExist as e:
         print(f"Unknown event: {eventId}")
         abort(404)
-
-    notPermitted = not (g.current_user.isCeltsAdmin or g.current_user.isProgramManagerForEvent(event))
+    notPermitted = not (g.current_user.isCeltsAdmin or (g.current_user.isCeltsStudentAdmin and event.program_id != 5) or g.current_user.isProgramManagerForEvent(event))
     if 'edit' in request.url_rule.rule and notPermitted:
         abort(403)
 

app/controllers/admin/userManagement.py

@@ -3,7 +3,7 @@
 from app.controllers.admin import admin_bp
 from app.models.user import User
 from app.models.program import Program
-from app.logic.userManagement import addCeltsAdmin,addCeltsStudentStaff,removeCeltsAdmin,removeCeltsStudentStaff
+from app.logic.userManagement import addCeltsAdmin,addCeltsStudentStaff,addCeltsStudentAdmin ,removeCeltsAdmin,removeCeltsStudentStaff, removeCeltsStudentAdmin
 from app.logic.userManagement import changeProgramInfo
 from app.logic.utils import selectSurroundingTerms
 from app.logic.term import addNextTerm, changeCurrentTerm
@@ -24,28 +24,40 @@ def manageUsers():
 
     if method == "addCeltsAdmin":
         if user.isStudent and not user.isCeltsStudentStaff: 
-            flash(user.firstName + " " + user.lastName + " cannot be added as a CELTS-Link admin", 'danger')
+            flash(f"{user.fullName} cannot be added as a CELTS-Link Admin.", 'danger')
         else:
             if user.isCeltsAdmin:
-                flash(user.firstName + " " + user.lastName + " is already a CELTS-Link Admin", 'danger')
+                flash(f"{user.fullName} is already a CELTS-Link Admin.", 'danger')
             else: 
                 addCeltsAdmin(user)
-                flash(user.firstName + " " + user.lastName + " has been added as a CELTS-Link Admin", 'success')
+                flash(f"{user.fullName} has been added as a CELTS-Link Admin.", 'success')
     elif method == "addCeltsStudentStaff":
         if not user.isStudent:
-            flash(username + " cannot be added as CELTS Student Staff", 'danger')
+            flash(username + " cannot be added as CELTS Student Staff.", 'danger')
         else:
             if user.isCeltsStudentStaff:
-                flash(user.firstName + " " + user.lastName + " is already a CELTS Student Staff", 'danger')
+                flash(f"{user.fullName} is already a CELTS Student Staff.", 'danger')
             else:
                 addCeltsStudentStaff(user)
-                flash(user.firstName + " " + user.lastName + " has been added as a CELTS Student Staff", 'success')
+                flash(f"{user.fullName} has been added as a CELTS Student Staff.", 'success')
+    elif method == "addCeltsStudentAdmin":
+        if not user.isStudent:
+            flash(username + " cannot be added as CELTS Student Admin.", 'danger')
+        else:
+            if user.isCeltsStudentAdmin:
+                flash(f"{user.fullName} is already a CELTS Student Admin.", 'danger')
+            else:
+                addCeltsStudentAdmin(user)
+                flash(f"{user.fullName} has been added as a CELTS Student Admin.", 'success')
     elif method == "removeCeltsAdmin":
         removeCeltsAdmin(user)
-        flash(user.firstName + " " + user.lastName + " is no longer a CELTS Admin ", 'success')
+        flash(f"{user.fullName} is no longer a CELTS Admin.", 'success')
     elif method == "removeCeltsStudentStaff":
         removeCeltsStudentStaff(user)
-        flash(user.firstName + " " + user.lastName + " is no longer a CELTS Student Staff", 'success')
+        flash(f"{user.fullName} is no longer a CELTS Student Staff.", 'success')
+    elif method == "removeCeltsStudentAdmin":
+        removeCeltsStudentAdmin(user)
+        flash(f"{user.fullName} is no longer a CELTS Student Admin.", 'success')
     return ("success")
 
 @admin_bp.route('/addProgramManagers', methods=['POST'])
@@ -72,7 +84,7 @@ def removeProgramManagers():
 def updateProgramInfo(programID):
     """Grabs info and then outputs it to logic function"""
     programInfo = request.form # grabs user inputs
-    if g.current_user.isCeltsAdmin:
+    if g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentAdmin:
         try:
             changeProgramInfo(programInfo["programName"],  #calls logic function to add data to database
                               programInfo["contactEmail"],
@@ -94,12 +106,14 @@ def userManagement():
     current_programs = Program.select()
     currentAdmins = list(User.select().where(User.isCeltsAdmin))
     currentStudentStaff = list(User.select().where(User.isCeltsStudentStaff))
-    if g.current_user.isCeltsAdmin:
+    currentStudentAdmin = list(User.select().where(User.isCeltsStudentAdmin))
+    if g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentAdmin:
         return render_template('admin/userManagement.html',
                                 terms = terms,
                                 programs = list(current_programs),
                                 currentAdmins = currentAdmins,
                                 currentStudentStaff = currentStudentStaff,
+                                currentStudentAdmin = currentStudentAdmin,
                                 )
     abort(403)
 

app/controllers/admin/volunteers.py

@@ -55,7 +55,7 @@ def manageVolunteersPage(eventID):
 
     isProgramManager = g.current_user.isProgramManagerForEvent(event)
     bannedUsers = [row.user for row in getBannedUsers(event.program)]
-    if not (g.current_user.isCeltsAdmin or (g.current_user.isCeltsStudentStaff and isProgramManager)):
+    if not (g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentAdmin or isProgramManager):
         abort(403)
 
     eventParticipantData = list(EventParticipant.select(EventParticipant, User).join(User).where(EventParticipant.event==event))
@@ -109,7 +109,7 @@ def volunteerDetailsPage(eventID):
         print(f"No event found for {eventID}", e)
         abort(404)
 
-    if not (g.current_user.isCeltsAdmin or (g.current_user.isCeltsStudentStaff and g.current_user.isProgramManagerForEvent(event))):
+    if not (g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentAdmin or g.current_user.isProgramManagerForEvent(event)):
         abort(403)
 
     eventRsvpData = list(EventRsvp.select(EmergencyContact, EventRsvp)

app/logic/userManagement.py

@@ -11,22 +11,26 @@ def addCeltsAdmin(user):
     user = User.get_by_id(user)
     user.isCeltsAdmin = True
     user.save()
-    createAdminLog(f'Made {user.firstName} {user.lastName} a CELTS admin member.')
+    createAdminLog(f'Made f"{user.fullName} a CELTS admin member.')
 
 
 def addCeltsStudentStaff(user):
     user = User.get_by_id(user)
     user.isCeltsStudentStaff = True
     user.save()
-    createAdminLog(f'Made {user.firstName} {user.lastName} a CELTS student staff member.')
+    createAdminLog(f'Made f"{user.fullName} a CELTS student staff member.')
 
+def addCeltsStudentAdmin(user):
+    user = User.get_by_id(user)
+    user.isCeltsStudentAdmin = True
+    user.save()
+    createAdminLog(f'Made {user.fullName} a CELTS student admin member.')
 
 def removeCeltsAdmin(user):
     user = User.get_by_id(user)
     user.isCeltsAdmin = False
     user.save()
-    createAdminLog(f'Removed {user.firstName} {user.lastName} from CELTS admins.')
-
+    createAdminLog(f'Removed f"{user.fullName} from CELTS admins.')
 
 def removeCeltsStudentStaff(user):
     user = User.get_by_id(user)
@@ -38,6 +42,11 @@ def removeCeltsStudentStaff(user):
     createAdminLog(f'Removed {user.firstName} {user.lastName} from a CELTS student staff member'+ 
                    (f', and as a manager of {programManagerRoles}.' if programManagerRoles else "."))
 
+def removeCeltsStudentAdmin(user):
+    user = User.get_by_id(user)
+    user.isCeltsStudentAdmin = False
+    user.save()
+    createAdminLog(f'Removed f"{user.fullName} from a CELTS student admin member.')
 
 def changeProgramInfo(newProgramName, newContactEmail, newContactName, newLocation, programId):
     """Updates the program info with a new sender and email."""
@@ -59,14 +68,16 @@ def getAllowedPrograms(currentUser):
     """Returns a list of all visible programs depending on who the current user is."""
     if currentUser.isCeltsAdmin:
         return Program.select().order_by(Program.programName)
+    elif currentUser.isCeltsStudentAdmin:
+        return Program.select().where(Program.id !=5).order_by(Program.programName)
     else:
         return Program.select().join(ProgramManager).where(ProgramManager.user==currentUser).order_by(Program.programName)
 
 
 
 def getAllowedTemplates(currentUser):
     """Returns a list of all visible templates depending on who the current user is. If they are not an admin it should always be none."""
-    if currentUser.isCeltsAdmin:
+    if currentUser.isCeltsAdmin or currentUser.isCeltsStudentAdmin:
         return EventTemplate.select().where(EventTemplate.isVisible==True).order_by(EventTemplate.name)
     else:
         return []

app/models/user.py

@@ -16,6 +16,7 @@ class User(baseModel):
     isStaff = BooleanField(default = False)
     isCeltsAdmin = BooleanField(default  =False)
     isCeltsStudentStaff = BooleanField(default = False)
+    isCeltsStudentAdmin = BooleanField(default = False)
     dietRestriction = TextField(null=True)
     minorInterest = BooleanField(default=False)
 
@@ -28,7 +29,7 @@ def __init__(self,*args, **kwargs):
 
     @property
     def isAdmin(self):
-        return (self.isCeltsAdmin or self.isCeltsStudentStaff)
+        return (self.isCeltsAdmin or self.isCeltsStudentAdmin or self.isCeltsStudentStaff)
 
     @property
     def isBonnerScholar(self):

app/static/js/userManagement.js

@@ -6,6 +6,9 @@ function callbackAdmin(selected){
 function callbackStudentStaff(selected){
     submitRequest("addCeltsStudentStaff", selected.username)
 }
+function callbackStudentAdmin(selected){
+  submitRequest("addCeltsStudentAdmin", selected.username)
+}
 $(document).ready(function(){
   // Admin Management
   $("#searchCeltsAdminInput").on("input", function(){
@@ -14,6 +17,10 @@ $(document).ready(function(){
   $("#searchCeltsStudentStaffInput").on("input", function(){
       searchUser("searchCeltsStudentStaffInput", callbackStudentStaff, false, null, "student")
   });
+
+  $("#searchCeltsStudentAdminInput").on("input", function(){
+    searchUser("searchCeltsStudentAdminInput", callbackStudentAdmin, false, null, "student")
+  });
   $("#addNewTerm").on("click",function(){
     addNewTerm();
   });
@@ -23,6 +30,9 @@ $(document).ready(function(){
   $(".removeStudentStaff").on("click",function(){
     submitRequest("removeCeltsStudentStaff", $(this).data("username"));
   });
+  $(".removeStudentAdmin").on("click",function(){
+    submitRequest("removeCeltsStudentAdmin", $(this).data("username"));
+  });
   $('#searchCeltsAdminInput').keydown(function(e){
       if (e.key === "Enter"){
           submitRequest("addCeltsAdmin", $(this).val())
@@ -33,7 +43,11 @@ $(document).ready(function(){
           submitRequest("addCeltsStudentStaff", $(this).val())
       }
   });
-
+  $('#searchCeltsStudentAdminInput').keydown(function(e){
+    if (e.key === "Enter"){
+        submitRequest("addCeltsStudentAdmin", $(this).val())
+    }
+});
   for (var i = 1; i <= $('#currentTermList .term-btn').length; i++){
     $("#termFormID_" + i).on("click", function(){
       $(".term-btn").removeClass("active");

app/templates/admin/userManagement.html

@@ -17,64 +17,86 @@
 
 <h1 class="text-center mb-5">Admin Management</h1>
 <div class="accordion" id="adminManagement">
-  <div class="accordion-item">
-    <h3 class="accordion-header" id="headingOne">
-      {% set focus = "open" if not visibleAccordion or visibleAccordion == "user" else "collapsed" %}
-      <button class="accordion-button {{focus}} " type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-        User Management
-      </button>
-    </h3>
-    {% set show = "show" if not visibleAccordion or visibleAccordion == "user" %}
-    <div id="collapseOne" class="accordion-collapse collapse {{show}}" aria-labelledby="headingOne" data-bs-parent="#adminManagement">
-      <div class="accordion-body">
-        <div class="container-fluid col-10">
-          <div class="row d-flex justify-content-center mb-3">
-            <div class="col-md-6 mb-3">
-              <div>
-                {{createInputsButtons("searchCeltsAdminInput", "Add Celts Admin")}}<br>
+  {% if g.current_user.isCeltsAdmin and not g.current_user.isCeltsStudentAdmin %}
+    <div class="accordion-item">
+      <h3 class="accordion-header" id="headingOne">
+        {% set focus = "open" if not visibleAccordion or visibleAccordion == "user" else "collapsed" %}
+        <button class="accordion-button {{focus}} " type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+          User Management
+        </button>
+      </h3>
+      {% set show = "show" if not visibleAccordion or visibleAccordion == "user" %}
+      <div id="collapseOne" class="accordion-collapse collapse {{show}}" aria-labelledby="headingOne" data-bs-parent="#adminManagement">
+        <div class="accordion-body">
+          <div class="container-fluid col-10">
+            <div class="row d-flex mb-3">
+              <div class="col-md-6 mb-3">
+                <div>
+                  {{createInputsButtons("searchCeltsAdminInput", "Add Celts Admin")}}<br>
+                </div>
+                <table class="table mb-3">
+                  <thead>
+                    <tr>
+                      <th scope="col">Current Admin</th>
+                      <th scope="col"></th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {% for admin in currentAdmins %}
+                      <tr>
+                        <td id="{{admin.username}}">{{admin.firstName}} {{admin.lastName}}</td>
+                        <td><button data-username="{{admin.username}}" type="button" class="btn btn-danger view removeAdmin">Remove</button></td>
+                      </tr>
+                    {% endfor %}
+                  </tbody>
+                  </table>
               </div>
-              <table class="table mb-3">
-                <thead>
-                  <tr>
-                    <th scope="col">Current Admin</th>
-                    <th scope="col"></th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {% for admin in currentAdmins %}
-                     <tr>
-                       <td id="{{admin.username}}">{{admin.firstName}} {{admin.lastName}}</td>
-                       <td><button data-username="{{admin.username}}" type="button" class="btn btn-danger view removeAdmin">Remove</button></td>
-                     </tr>
-                  {% endfor %}
-                </tbody>
+              <div class="col-md-6 mb-3">
+                <div>
+                  {{createInputsButtons("searchCeltsStudentStaffInput", "Add Celts Student Staff")}}<br>
+                </div>
+                <table class="table mb-3">
+                  <thead>
+                    <tr>
+                      <th colspan="2" scope="col">Current Student Staff</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {% for studentStaff in currentStudentStaff %}
+                      <tr>
+                        <td id="{{studentStaff.username}}">{{studentStaff.firstName}} {{studentStaff.lastName}}</td>
+                        <td><button data-username="{{studentStaff.username}}" type="button" class="btn btn-danger view removeStudentStaff">Remove</button></td>
+                      </tr>
+                    {% endfor %}
+                  </tbody>
                 </table>
-            </div>
-            <div class="col-md-6 mb-3">
-              <div>
-                {{createInputsButtons("searchCeltsStudentStaffInput", "Add Celts Student Staff")}}<br>
               </div>
-              <table class="table mb-3">
-                <thead>
-                  <tr>
-                    <th colspan="2" scope="col">Current Student Staff</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {% for studentStaff in currentStudentStaff %}
+              <div class="col-md-6 mb-3">
+                <div>
+                  {{createInputsButtons("searchCeltsStudentAdminInput", "Add Celts Student Admin")}}<br>
+                </div>
+                <table class="table mb-3">
+                  <thead>
                     <tr>
-                      <td id="{{studentStaff.username}}">{{studentStaff.firstName}} {{studentStaff.lastName}}</td>
-                      <td><button data-username="{{studentStaff.username}}" type="button" class="btn btn-danger view removeStudentStaff">Remove</button></td>
-                     </tr>
-                  {% endfor %}
-                </tbody>
-              </table>
+                      <th colspan="2" scope="col">Current Student Admin</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {% for studentAdmin in currentStudentAdmin %}
+                      <tr>
+                        <td id="{{studentAdmin.username}}">{{studentAdmin.firstName}} {{studentAdmin.lastName}}</td>
+                        <td><button data-username="{{studentAdmin.username}}" type="button" class="btn btn-danger view removeStudentAdmin">Remove</button></td>
+                      </tr>
+                    {% endfor %}
+                  </tbody>
+                </table>
+              </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-  </div>
+  {% endif %}
   <div class="accordion-item">
     <h3 class="accordion-header" id="headingTwo">
       {% set focus = "open" if visibleAccordion == "term" else "collapsed" %}