diff --git a/app/templates/stats.html b/app/templates/stats.html index 9c02714..7fef905 100644 --- a/app/templates/stats.html +++ b/app/templates/stats.html @@ -18,6 +18,14 @@ + + + + @@ -27,150 +35,188 @@ Auto-refresh every 30s - +
- -
-

Recent Access-Accept

- - - - - - - - - - - - {% for entry in accept_entries %} - - - - - - - - {% endfor %} - -
MAC AddressDescriptionVendorVLANTime
{{ entry.mac_address }}{{ entry.description or '' }}{{ entry.vendor or '...' }}{{ entry.vlan_id or '?' }}{{ entry.ago }}
- {% if total_pages_accept > 1 %} -
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/app/views/stats_views.py b/app/views/stats_views.py index 525351f..68861e2 100644 --- a/app/views/stats_views.py +++ b/app/views/stats_views.py @@ -1,11 +1,11 @@ from flask import Blueprint, render_template, request, current_app, redirect, url_for, jsonify from db_interface import get_latest_auth_logs, count_auth_logs, get_all_groups, get_vendor_info, get_user_by_mac, add_user, get_known_mac_vendors from math import ceil +import re import pytz import humanize from datetime import datetime, timezone, timedelta from time import sleep -import threading stats = Blueprint('stats', __name__) @@ -21,33 +21,53 @@ def get_time_filter_delta(time_range): "last_30_days": timedelta(days=30), }.get(time_range) +def get_pagination_data(current_page, total_pages, max_display=7): + pagination = [] + if total_pages <= max_display: + pagination = list(range(1, total_pages + 1)) + else: + half = max_display // 2 + if current_page <= half: + pagination = list(range(1, max_display + 1)) + elif current_page >= total_pages - half: + pagination = list(range(total_pages - max_display + 1, total_pages + 1)) + else: + pagination = list(range(current_page - half, current_page + half + 1)) + + return { + "pages": pagination, + "show_first": current_page > 1, + "show_last": current_page < total_pages, + "show_prev": current_page > 1, + "show_next": current_page < total_pages, + "prev_page": max(current_page - 1, 1), + "next_page": min(current_page + 1, total_pages), + "first_page": 1, + "last_page": total_pages + } + @stats.route('/stats', methods=['GET', 'POST']) def stats_page(): time_range = request.form.get('time_range') or request.args.get('time_range') or 'last_minute' + per_page = int(request.form.get('per_page') or request.args.get('per_page') or 25) - # Per-card pagination values - per_page = 25 page_accept = int(request.args.get('page_accept', 1)) page_reject = int(request.args.get('page_reject', 1)) page_fallback = int(request.args.get('page_fallback', 1)) - # Timezone setup tz_name = current_app.config.get('APP_TIMEZONE', 'UTC') local_tz = pytz.timezone(tz_name) - # Accept pagination total_accept = count_auth_logs('Access-Accept', time_range) total_pages_accept = ceil(total_accept / per_page) offset_accept = (page_accept - 1) * per_page accept_entries = get_latest_auth_logs('Access-Accept', per_page, time_range, offset_accept) - # Reject pagination total_reject = count_auth_logs('Access-Reject', time_range) total_pages_reject = ceil(total_reject / per_page) offset_reject = (page_reject - 1) * per_page reject_entries = get_latest_auth_logs('Access-Reject', per_page, time_range, offset_reject) - # Fallback pagination total_fallback = count_auth_logs('Accept-Fallback', time_range) total_pages_fallback = ceil(total_fallback / per_page) offset_fallback = (page_fallback - 1) * per_page @@ -64,40 +84,43 @@ def stats_page(): entry['ago'] = 'unknown' vendor_info = get_vendor_info(entry['mac_address'], insert_if_found=False) - entry['vendor'] = vendor_info['vendor'] if vendor_info else None # placeholder + entry['vendor'] = vendor_info['vendor'] if vendor_info else None user = get_user_by_mac(entry['mac_address']) entry['already_exists'] = user is not None entry['existing_vlan'] = user['vlan_id'] if user else None entry['description'] = user['description'] if user else None + match = re.search(r'VLAN\s+(\d+)', entry.get('result', '')) + entry['vlan_id'] = match.group(1) if match else None + return entry - # Enrich entries accept_entries = [enrich(e) for e in accept_entries] reject_entries = [enrich(e) for e in reject_entries] fallback_entries = [enrich(e) for e in fallback_entries] - available_groups = get_all_groups() return render_template( "stats.html", time_range=time_range, + per_page=per_page, accept_entries=accept_entries, reject_entries=reject_entries, fallback_entries=fallback_entries, available_groups=available_groups, page_accept=page_accept, - total_pages_accept=total_pages_accept, + pagination_accept=get_pagination_data(page_accept, total_pages_accept), page_reject=page_reject, - total_pages_reject=total_pages_reject, + pagination_reject=get_pagination_data(page_reject, total_pages_reject), page_fallback=page_fallback, - total_pages_fallback=total_pages_fallback + pagination_fallback=get_pagination_data(page_fallback, total_pages_fallback) ) + @stats.route('/add', methods=['POST']) def add(): mac = request.form['mac_address']