Student admin

app/controllers/admin/routes.py

@@ -40,13 +40,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.isCeltsAdmin or g.current_user.isCeltsStudentStaff or g.current_user.isCeltsStudentAdmin :
         allprograms = getAllowedPrograms(g.current_user)
         visibleTemplates = getAllowedTemplates(g.current_user)
         return render_template("/events/template_selector.html",
@@ -59,7 +58,7 @@ def templateSelect():
 
 @admin_bp.route('/eventTemplates/<templateid>/<programid>/create', methods=['GET','POST'])
 def createEvent(templateid, programid):
-    if not (g.current_user.isAdmin or g.current_user.isProgramManagerFor(programid)):
+    if not (g.current_user.isAdmin or g.current_user.isCeltsStudentAdmin or g.current_user.isProgramManagerFor(programid)):
         abort(403)
 
     # Validate given URL
@@ -144,7 +143,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 (g.current_user.isCeltsStudentStaff and 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,
@@ -169,7 +168,7 @@ def eventDisplay(eventId):
         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.isProgramManagerForEvent(event) or g.current_user.isCeltsStudentAdmin)
     if 'edit' in request.url_rule.rule and notPermitted:
         abort(403)
 
@@ -268,7 +267,7 @@ def eventDisplay(eventId):
 
 @admin_bp.route('/event/<eventId>/cancel', methods=['POST'])
 def cancelRoute(eventId):
-    if g.current_user.isAdmin:
+    if g.current_user.isAdmin or g.current_user.isCeltsStudentAdmin:
         try:
             cancelEvent(eventId)
             return redirect(request.referrer)
@@ -330,7 +329,7 @@ def userProfile():
 
 @admin_bp.route('/search_student', methods=['GET'])
 def studentSearchPage():
-    if g.current_user.isAdmin:
+    if g.current_user.isAdmin or g.current_user.isCeltsStudentAdmin:
         return render_template("/admin/searchStudentPage.html")
     abort(403)
 

app/controllers/admin/volunteers.py

@@ -54,7 +54,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 (g.current_user.isCeltsStudentStaff and isProgramManager)):
         abort(403)
 
     eventParticipantData = list(EventParticipant.select(EventParticipant, User).join(User).where(EventParticipant.event==event))
@@ -108,7 +108,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.isCeltsStudentStaff and g.current_user.isProgramManagerForEvent(event))):
         abort(403)
 
     eventRsvpData = list(EventRsvp.select().where(EventRsvp.event==event))

app/controllers/main/routes.py

@@ -113,7 +113,7 @@ def viewUsersProfile(username):
         else:
             abort(403)  # Error 403 if non admin/student-staff user trys to access via url
 
-    if (g.current_user == volunteer) or g.current_user.isAdmin:
+    if (g.current_user == volunteer) or g.current_user.isAdmin or g.current_user.isCeltsStudentAdmin:
         upcomingEvents = getUpcomingEventsForUser(volunteer)
         participatedEvents = getParticipatedEventsForUser(volunteer)
         programs = Program.select()
@@ -429,7 +429,7 @@ def serviceTranscript(username):
     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:
+    if user != g.current_user and not g.current_user.isAdmin and not g.current_user.isCeltsStudentAdmin:
         abort(403)
 
     slCourses = getSlCourseTranscript(username)

app/logic/userManagement.py

@@ -52,7 +52,7 @@ def changeProgramInfo(newProgramName, newContactEmail, newContactName, newLocati
 
 def getAllowedPrograms(currentUser):
     """Returns a list of all visible programs depending on who the current user is."""
-    if currentUser.isCeltsAdmin:
+    if currentUser.isCeltsAdmin or g.current_user.isCeltsStudentAdmin:
         return Program.select().order_by(Program.programName)
     else:
         return Program.select().join(ProgramManager).where(ProgramManager.user==currentUser).order_by(Program.programName)

app/models/user.py

@@ -15,6 +15,7 @@ class User(baseModel):
     isStaff = BooleanField(default = False)
     isCeltsAdmin = BooleanField(default  =False)
     isCeltsStudentStaff = BooleanField(default = False)
+    isCeltsStudentAdmin = BooleanField(default = False)
     dietRestriction = TextField(null=True)
 
     # override BaseModel's __init__ so that we can set up an instance attribute for cache

app/templates/eventNav.html

@@ -15,7 +15,7 @@
 {% block app_content %}
     {% block content_pageHeading %}
     <div class="text-center">
-        {% if g.current_user.isAdmin %}
+        {% if g.current_user.isAdmin or g.current_user.isCeltsStudentAdmin %}
             {{ eventheader(page_title, eventData, 'large', isNewEvent) }}
         {% endif %}
         {% set alertClass = "alert-danger" if eventPast else "alert-warning"%}
@@ -33,7 +33,7 @@
     {% endblock %}
 
     {% block navbar %}
-        {% if g.current_user.isCeltsAdmin or (g.current_user.isCeltsStudentStaff and g.current_user.isProgramManagerFor(eventData['program'])) %}
+        {% if g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentAdmin or (g.current_user.isCeltsStudentStaff and g.current_user.isProgramManagerFor(eventData['program'])) %}
 
         <div class="btn-group">
             <ul class="nav nav-tabs nav-fill mx-3 mb-3" id="pills-tab" role="tablist">

app/templates/eventView.html

@@ -26,7 +26,7 @@
                 {% set fullWidthTitle = not (g.current_user.isAdmin or image) %}
                 <div class="{{ 'col-md-12' if fullWidthTitle else 'col-md-6'}}">
 
-                    {%if not g.current_user.isAdmin %}
+                    {%if not g.current_user.isAdmin or not g.current_user.isCeltsStudentAdmin %}
                         {{ eventheader(eventData.name, eventData, 'small', isNewEvent) }}
                     {% endif %}
 
@@ -132,7 +132,7 @@ <h3>Contact Information:</h3>
                             <h3>Program Trainings:</h3>
                             {% for training, events in programTrainings.items() %}
                                 {% for eventObj, attended in events %}
-                                    {% if g.current_user.isCeltsAdmin %}
+                                    {% if g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentAdmin %}
                                         <p>{{eventObj.name}}</p>
                                     {% elif attended %}
                                         <p><b>{{eventObj.name}}</b>: Attended</p>
@@ -161,7 +161,7 @@ <h3>Program Trainings:</h3>
                     {% endif %}
                 </div>
                 <div class="rsvp-btn text-center">              
-                    {% if g.current_user.isCeltsAdmin or isProgramManager %}
+                    {% if g.current_user.isCeltsAdmin or g.current_user.isCeltsStudentAdmin or isProgramManager %}
                     <div class="d-flex align-items-center">
                         <i class="bi bi-eye-fill me-2"></i>
                         <span class="me-2">Unique Viewers:</span>

app/templates/sidebar.html

@@ -18,15 +18,15 @@
         </a>
       </li>
 
-      {% if g.current_user.isFaculty and not g.current_user.isAdmin%}
+      {% if g.current_user.isFaculty and not g.current_user.isAdmin and not g.current_user.isCeltsStudentAdmin %}
       <li>
         <a href="/serviceLearning/courseManagement" class="nav-link text-white {{'active' if request.path =='/serviceLearning/courseManagement'}}" {{"aria-current='page'" if request.path =='/serviceLearning/courseManagement'}}>
           Course Proposals
         </a>
       </li>
       {% endif %}
 
-      {% if g.current_user.isAdmin %}
+      {% if g.current_user.isAdmin or g.current_user.isCeltsStudentAdmin %}
       <li>
         <a href="/eventTemplates" class="nav-link text-white {{'active' if 'eventTemplates' in request.path}}" {{"aria-current='page'" if 'eventTemplates' in request.path}}>
           Create Event
@@ -38,7 +38,7 @@
         </a>
       </li>
       <li>
-        {% if not g.current_user.isCeltsStudentStaff %}
+        {% if not g.current_user.isCeltsStudentStaff and not g.current_user.isCeltsStudentAdmin %}
         <a href="/serviceLearning/courseManagement" class="nav-link text-white {{'active' if request.path =='/serviceLearning/courseManagement'}}" {{"aria-current='page'" if request.path =='/serviceLearning/courseManagement'}}>
           Course Proposals
         </a>
@@ -82,6 +82,7 @@ <h6>Current User: {{g.current_user.username}}</h6>
           <select name="newuser" class="form-select" style="margin-bottom: 10px" onchange="this.form.submit()">>
             <option {{"selected" if g.current_user.username == config.default_user }} value="{{config.default_user}}">Default User: {{config.default_user}}</option>
             <option {{"selected" if g.current_user.username == "ramsayb2"}} value="ramsayb2">Admin: ramsayb2</option>
+            <option {{"selected" if g.current_user.username == "bledsoef"}} value="bledsoef">Student Admin: bledsoef</option>
             <option {{"selected" if g.current_user.username == "neillz"}} value="neillz">Student Staff: neillz</option>
             <option {{"selected" if g.current_user.username == "ayisie"}} value="ayisie">Student: ayisie</option>
             <option {{"selected" if g.current_user.username == "heggens"}} value="heggens">Faculty: heggens</option>

database/test_data.py

@@ -208,6 +208,7 @@
         "isCeltsAdmin": False,
         "isFaculty": True,
         "isCeltsStudentStaff": False,
+        "isCeltsStudentAdmin": True,
         "isStaff": True,
     },
 ]