Add user log page

Author: mbillow

conditional/__init__.py

@@ -90,6 +90,7 @@ def database_processor(logger, log_method, event_dict): # pylint: disable=unused
 from conditional.blueprints.slideshow import slideshow_bp
 from conditional.blueprints.cache_management import cache_bp
 from conditional.blueprints.co_op import co_op_bp
+from conditional.blueprints.logs import log_bp
 
 app.register_blueprint(dashboard_bp)
 app.register_blueprint(attendance_bp)
@@ -103,6 +104,7 @@ def database_processor(logger, log_method, event_dict): # pylint: disable=unused
 app.register_blueprint(slideshow_bp)
 app.register_blueprint(cache_bp)
 app.register_blueprint(co_op_bp)
+app.register_blueprint(log_bp)
 
 from conditional.util.ldap import ldap_get_member
 

conditional/blueprints/cache_management.py

@@ -41,7 +41,7 @@ def clear_cache():
     user_name = request.headers.get('x-webauth-user')
     account = ldap_get_member(user_name)
 
-    if not ldap_is_eval_director(account) or not ldap_is_rtp(account):
+    if not ldap_is_eval_director(account) and not ldap_is_rtp(account):
         return redirect("/dashboard")
 
     log = logger.new(request=request)

conditional/blueprints/logs.py

@@ -0,0 +1,31 @@
+import structlog
+
+from flask import Blueprint, request
+
+from conditional.models.models import UserLog
+
+from conditional.util.ldap import ldap_is_eboard
+from conditional.util.ldap import ldap_is_rtp
+from conditional.util.ldap import ldap_get_member
+
+from conditional.util.flask import render_template
+
+logger = structlog.get_logger()
+
+log_bp = Blueprint('log_bp', __name__)
+
+@log_bp.route('/logs')
+def display_logs():
+    log = logger.new(request=request)
+    log.info('Display Logs')
+
+    username = request.headers.get('x-webauth-user')
+    account = ldap_get_member(username)
+    log.info(account.displayName)
+
+    if not ldap_is_eboard(account) and not ldap_is_rtp(account):
+        return "must be rtp or eboard", 403
+
+    logs = UserLog.query.all()
+
+    return render_template(request, "logs.html", logs=logs, username=username)

conditional/blueprints/member_management.py

@@ -224,30 +224,33 @@ def edit_uid(uid, flask_request):
     account = ldap_get_member(uid)
     active_member = post_data['activeMember']
 
-    room_number = post_data['roomNumber']
-    onfloor_status = post_data['onfloorStatus']
-    housing_points = post_data['housingPoints']
-    log.info('Edit {} - Room: {} On-Floor: {} Points: {}'.format(
-        uid,
-        post_data['roomNumber'],
-        post_data['onfloorStatus'],
-        post_data['housingPoints']))
-
-    ldap_set_roomnumber(account, room_number)
-    if onfloor_status:
-        # If a OnFloorStatusAssigned object exists, don't make another
-        if not ldap_is_member_of_group(account, "onfloor"):
-            db.session.add(OnFloorStatusAssigned(uid, datetime.now()))
-            ldap_add_member_to_group(account, "onfloor")
-    else:
-        for ofs in OnFloorStatusAssigned.query.filter(OnFloorStatusAssigned.uid == uid):
-            db.session.delete(ofs)
-        db.session.flush()
-        db.session.commit()
-
-        if ldap_is_member_of_group(account, "onfloor"):
-            ldap_remove_member_from_group(account, "onfloor")
-    ldap_set_housingpoints(account, housing_points)
+    username = flask_request.headers.get('x-webauth-user')
+    current_account = ldap_get_member(username)
+    if ldap_is_eval_director(current_account):
+        room_number = post_data['roomNumber']
+        onfloor_status = post_data['onfloorStatus']
+        housing_points = post_data['housingPoints']
+        log.info('Edit {} - Room: {} On-Floor: {} Points: {}'.format(
+            uid,
+            post_data['roomNumber'],
+            post_data['onfloorStatus'],
+            post_data['housingPoints']))
+
+        ldap_set_roomnumber(account, room_number)
+        if onfloor_status:
+            # If a OnFloorStatusAssigned object exists, don't make another
+            if not ldap_is_member_of_group(account, "onfloor"):
+                db.session.add(OnFloorStatusAssigned(uid, datetime.now()))
+                ldap_add_member_to_group(account, "onfloor")
+        else:
+            for ofs in OnFloorStatusAssigned.query.filter(OnFloorStatusAssigned.uid == uid):
+                db.session.delete(ofs)
+            db.session.flush()
+            db.session.commit()
+
+            if ldap_is_member_of_group(account, "onfloor"):
+                ldap_remove_member_from_group(account, "onfloor")
+        ldap_set_housingpoints(account, housing_points)
 
     # Only update if there's a diff
     log.info('Set {} Active: {}'.format(uid, active_member))

conditional/templates/logs.html

@@ -0,0 +1,36 @@
+{% extends "nav.html" %}
+{% block title %}
+User Logs
+{% endblock %}
+{% block body %}
+
+<div class="container main">
+    <h3 class="page-title">User Logs</h3>
+    <div class="panel panel-default">
+    <div class="panel-body table-fill">
+    <table class="table table-striped no-bottom-margin" data-module="table" data-searchable="true" data-sort-column="0" data-sort-order="desc" data-length-changable="true" data-page-length="100">
+    	<thead>
+    		<th>ID</th>
+    		<th>Method</th>
+    		<th>User</th>
+    		<th>Blueprint</th>
+    		<th>URL</th>
+    		<th>Description</th>
+    	</thead>
+    	<tbody>
+    		{% for log in logs %}
+    		<tr>
+    			<td>{{log.timestamp}}</td>
+    			<td>{{log.method}}</td>
+    			<td>{{log.uid}}</td>
+    			<td>{{log.blueprint}}</td>
+    			<td>{{log.path}}</td>
+    			<td>{{log.description}}</td>
+    		</tr>
+			{% endfor %}
+    	</tbody>
+    </table>
+    </div>
+    </div>
+</div>
+{% endblock %}

conditional/templates/nav.html

@@ -33,9 +33,9 @@
                 </li>
 
                 <li><a href="/housing"><span class="glyphicon glyphicon-home"></span> Housing</a></li>
-                
+
                 <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-ok"></span> Attendance 
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-ok"></span> Attendance
                     {% if is_eboard and pending_review != 0 %}
                     ({{pending_review}})
                     {% endif %}
@@ -51,8 +51,8 @@
                         {% endif %}
                     </ul>
                 </li>
-                
-                {% if is_eval_director or is_financial_director or is_rtp%}
+
+                {% if is_eboard or is_rtp%}
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-wrench"></span> Admin<span class="caret"></span></a>
                     <ul class="dropdown-menu">
@@ -67,6 +67,8 @@
                             <li><a href="/slideshow/spring"><span class="glyphicon glyphicon-eye-open"></span> Membership Evaluations Presentation</a></li>
                         {% endif %}
 
+                        <li><a href="/logs"><span class="glyphicon glyphicon-list"></span> User Logs</a></li>
+
                         {% if is_eval_director or is_rtp %}
                             <li><a href="/clearcache"><span class="glyphicon glyphicon-floppy-remove"></span> Clear Cache</a></li>
                         {% endif %}

frontend/javascript/modules/table.js

@@ -17,7 +17,8 @@ export default class Table {
       info: false,
       paging: !(this.table.dataset.paginated === 'false'),
       pagingType: "numbers",
-      order: []
+      order: [],
+      pageLength: this.table.dataset.pageLength || 10
     };
 
     // Just remove the search input from the DOM instead of disabling it