Merge branch '506_bluprint_users' into 531_page_with_admin_pages

app/db/db_methods.py

@@ -59,6 +59,8 @@ def get_user(username):
     else:
         return None
 
+def get_all_users():
+    return users_collection.find()
 
 # Returns True if user was found and updated and false if not (username can not be changed!)
 def edit_user(user):
@@ -306,6 +308,21 @@ def get_logs_cursor(filter={}, limit=10, offset=0, sort=None, order=None):
 
     return rows, count
 
+def get_user_cursor(filter={}, limit=10, offset=0, sort=None, order=None):
+    sort = 'username' if sort == 'username' else sort
+
+    count = users_collection.count_documents(filter)
+    rows = users_collection.find(filter)
+
+    if sort and order in ("asc, desc"):
+        rows = rows.sort(sort, pymongo.ASCENDING if order ==
+                                                    "asc" else pymongo.DESCENDING)
+
+    rows = rows.skip(offset) if offset else rows
+    rows = rows.limit(limit) if limit else rows
+
+    return rows, count
+
 
 # Get stats for one user, return a list in the form
 # [check_id, login, time of check_id's creation, result(0/1)]

app/routes/users.py

@@ -0,0 +1,91 @@
+import json
+from flask import abort, Blueprint, render_template, request, jsonify
+from flask_login import current_user
+from functools import wraps
+from app.db.db_methods import get_all_users, get_user
+from utils import checklist_filter, format_check_for_table
+from db import db_methods
+
+users = Blueprint('users', __name__, template_folder='templates', static_folder='static')
+
+
+def admin_required(route_func):
+    @wraps(route_func)
+    def my_wrapper(*args, **kwargs):
+        if current_user and current_user.is_admin:
+            return route_func(*args, **kwargs)
+        abort(403)
+    return my_wrapper
+
+@users.route("/data")
+@admin_required
+def users_data():
+    filters = request.args.get("filter", "{}")
+    try:
+        filters = json.loads(filters)
+        filters = filters if filters else {}
+    except Exception as e:
+        # logger.warning("Can't parse filters")
+        # logger.warning(repr(e))
+        filters = {}
+    filter_query = {}
+    if f_username := filters.get("username", None):
+        filter_query["username"] = {"$regex": f_username}
+
+    if f_name := filters.get("name", None):
+        filter_query["name"] = {"$regex": f_name}
+
+    if f_formats := filters.get("all_formats", None):
+        filter_query["formats"] = {"$regex": f_formats}
+
+    if f_criteria := filters.get("all_criteria", None):
+        filter_query["criteria"] = {"$regex": f_criteria}
+
+    if f_check_counts := filters.get("check_counts", None):
+        try:
+            f_check_counts_value, f_check_counts_cond = int(f_check_counts.split()[1]), f_check_counts.split()[0]
+            if f_check_counts_cond == '>':
+                filter_query["$expr"] = {"$gte": [{"$size": "$presentations"}, f_check_counts_value]}
+            elif f_check_counts_cond == "<":
+                filter_query["$expr"] = {"$lte": [{"$size": "$presentations"}, f_check_counts_value]}
+        except ValueError:
+            pass
+
+    limit = request.args.get("limit", "")
+    limit = int(limit) if limit.isnumeric() else 10
+
+    offset = request.args.get("offset", "")
+    offset = int(offset) if offset.isnumeric() else 0
+
+    sort = request.args.get("sort", "")
+    sort = 'username' if not sort else sort
+
+    order = request.args.get("order", "")
+    order = 'username' if not order else order
+
+    rows, count = db_methods.get_user_cursor(filter=filter_query, limit=limit, offset=offset, sort=sort, order=order)
+
+    response = {
+        "total": count,
+        "rows": [{
+            "username": item["username"],
+            "name": item["name"],
+            "all_formats": item["formats"],
+            "all_criteria": item["criteria"],
+            "check_counts": len(item["presentations"]),
+
+        } for item in rows]
+    }
+    return jsonify(response)
+
+
+@users.route('/', methods=["GET"])
+@admin_required
+def index():
+    return render_template('user_list.html')
+
+@users.route('/<username>', methods=["GET"])
+@admin_required
+def user_info(username):
+    user_info = get_user(username)
+    return render_template('one_user_info.html', user_info=user_info)

app/server.py

@@ -31,6 +31,7 @@
 from utils import checklist_filter, decorator_assertion, get_file_len, format_check
 from app.main.checks import CRITERIA_INFO
 from routes.admin import admin
+from routes.users import users
 
 logger = get_root_logger('web')
 UPLOAD_FOLDER = '/usr/src/project/files'
@@ -52,6 +53,7 @@
 app.config['CELERY_BROKER_URL'] = os.environ.get("CELERY_BROKER_URL", "redis://localhost:6379")
 
 app.register_blueprint(admin, url_prefix='/admin')
+app.register_blueprint(users, url_prefix='/users')
 
 
 app.logger.addHandler(get_logging_stdout_handler())

app/templates/one_user_info.html

@@ -0,0 +1,65 @@
+{# Accepts: header dependicies, results, id, filename #}
+
+
+{% extends "root.html" %}
+
+{% block title %}Информация о пользователях{% endblock %}
+
+{% block main %}
+<style>
+    .fht-cell {
+        margin: 0 0.2rem 0.2rem;
+    }
+
+    /* .user-list-table th td { border: #54585d; } */
+
+    #user-list-table {
+        table-layout: fixed;
+        word-wrap: break-word;
+    }
+
+    #user-list-table.table-bordered,
+    #user-list-table.table-bordered > thead > tr > th,
+    #user-list-table.table-bordered > tbody > tr > td {
+        border: 1px solid #a1a1a1;
+    }
+</style>
+
+<div class="header row">{% include "header.html" %}</div>
+<div class="holder row">
+    <div class="container-fluid table-responsive-xl">
+    <h3 id="user_title" class="texteous ins">
+        Страница пользователя: <b>{{ user_info.username }}</b>
+    </h3>
+    <a href="{{ url_for('check_list', filter_user=user_info.username) }}"
+                class="col text-center link">Список всех загрузок пользователя</a>
+    <table id="one-user-table" class="table bg-white"
+            data-filter-control="true"
+            data-pagination="true"
+            data-page-list="[5, 10, 25, 50, All]"
+            data-ajax="ajaxRequest"
+            data-query-params="queryParams"
+            data-show-refresh="false"
+            data-auto-refresh="true"
+            data-auto-refresh-interval="10"
+            data-show-auto-refresh="false"
+            data-side-pagination="server"
+            data-icon-size="lg"
+            data-buttons="buttons"
+            data-show-filter-control-switch="true"
+            data-show-button-icons="false"
+            data-show-button-text="true">
+        <thead>
+            <tr>
+                <th data-field="username" data-filter-control="input" data-sortable="true">Username</th>
+                <th data-field="name" data-filter-control="input" data-sortable="true">Name</th>
+                <th data-field="all_formats" data-filter-control="input" data-sortable="true">Formats</th>
+                <th data-field="all_criteria" data-filter-control="input" data-sortable="true">Criteria</th>
+                <th data-field="check_counts" data-filter-control="input" data-sortable="true" title="insert operator and value with space (f.e > 1000)">Count of checks</th>
+            </tr>
+        </thead>
+    </table>
+</div>
+</div>
+
+{% endblock main %}

app/templates/user_list.html

@@ -0,0 +1,65 @@
+{# Accepts: header dependicies, results, id, filename #}
+
+
+{% extends "root.html" %}
+
+{% block title %}Информация о пользователях{% endblock %}
+
+{% block main %}
+<style>
+    .fht-cell {
+        margin: 0 0.2rem 0.2rem;
+    }
+
+    /* .user-list-table th td { border: #54585d; } */
+
+    #user-list-table {
+        table-layout: fixed;
+        word-wrap: break-word;
+    }
+
+    #user-list-table.table-bordered,
+    #user-list-table.table-bordered > thead > tr > th,
+    #user-list-table.table-bordered > tbody > tr > td {
+        border: 1px solid #a1a1a1;
+    }
+</style>
+
+<div class="header row">{% include "header.html" %}</div>
+<div class="holder row">
+    <div class="container-fluid table-responsive-xl">
+    <h3 id="user_title" class="texteous ins">
+        Список пользователей:
+    </h3>
+    <table id="user-list-table" class="table bg-white"
+            data-filter-control="true"
+            data-pagination="true"
+            data-page-list="[5, 10, 25, 50, All]"
+            data-ajax="ajaxRequest"
+            data-query-params="queryParams"
+            data-show-refresh="false"
+            data-auto-refresh="true"
+            data-auto-refresh-interval="10"
+            data-show-auto-refresh="false"
+            data-side-pagination="server"
+            data-icon-size="lg"
+            data-buttons="buttons"
+            data-show-filter-control-switch="true"
+            data-show-button-icons="false"
+            data-show-button-text="true">
+        <thead>
+            <tr>
+                <th data-field="username" data-filter-control="input" data-sortable="true">Username</th>
+                <th data-field="name" data-filter-control="input" data-sortable="true">Name</th>
+                <th data-field="all_formats" data-filter-control="input" data-sortable="true">Formats</th>
+                <th data-field="all_criteria" data-filter-control="input" data-sortable="true">Criteria</th>
+                <th data-field="check_counts" data-filter-control="input" data-sortable="true" title="insert operator and value with space (f.e > 1000)">Count of checks</th>
+            </tr>
+        </thead>
+    </table>
+</div>
+</div>
+
+{% endblock main %}
+
+

assets/scripts/check_list.js

@@ -253,4 +253,4 @@ function downdloadBlob(blob, filename) {
     document.body.appendChild(a);
     a.click();
     a.remove();
-}
+}

assets/scripts/main.js

@@ -28,6 +28,8 @@ import './version';
 import './check_list';
 import './logs';
 import './admin_criterions';
+import './user_list';
+import './one_user_info'
 
 import '../favicon.ico';
 import '../styles/404.css';