working for the most part

app/views/group_views.py

@@ -6,8 +6,8 @@ group = Blueprint('group', __name__, url_prefix='/group')
 
 @group.route('/')
 def group_list():
-    groups = get_all_groups()
-    return render_template('group_list.html', groups=groups)
+    available_groups = get_all_groups()
+    return render_template('group_list.html', available_groups=available_groups)
 
 
 @group.route('/add', methods=['POST'])

app/views/index_views.py

@@ -3,9 +3,8 @@ from datetime import datetime
 from db_interface import (
     get_connection,
     get_vendor_info,
-    get_all_groups,
     get_latest_auth_logs,
-    lookup_mac_verbose
+    get_all_groups,
 )
 import pytz
 
@@ -15,7 +14,6 @@ def time_ago(dt):
     if not dt:
         return "n/a"
 
-    # Use configured timezone
     tz_name = current_app.config.get('APP_TIMEZONE', 'UTC')
     local_tz = pytz.timezone(tz_name)
 
@@ -51,31 +49,6 @@ def homepage():
                            latest_accept=latest_accept,
                            latest_reject=latest_reject)
 
-@index.route('/stats')
-def stats():
-    accept_entries = get_latest_auth_logs('Access-Accept')
-    reject_entries = get_latest_auth_logs('Access-Reject')
-    available_groups = get_all_groups()
-    
-    # Process entries to add vendor and time-ago
-    from datetime import datetime, timezone
-    import humanize
-
-    def enrich(entry):
-        from db_interface import get_vendor_info, get_user_by_mac
-        entry['vendor'] = get_vendor_info(entry['mac_address'])
-        entry['ago'] = humanize.naturaltime(datetime.now(timezone.utc) - entry['timestamp'])
-        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
-        return entry
-
-    accept_entries = [enrich(e) for e in accept_entries]
-    reject_entries = [enrich(e) for e in reject_entries]
-
-    return render_template("stats.html", accept_entries=accept_entries, reject_entries=reject_entries, available_groups=available_groups)
-
 @index.route('/lookup_mac', methods=['POST'])
 def lookup_mac():
     mac = request.form.get('mac', '').strip()
@@ -85,7 +58,6 @@ def lookup_mac():
     result = lookup_mac_verbose(mac)
     return jsonify({"mac": mac, "output": result})
 
-
 def get_summary_counts():
     conn = get_connection()
     cursor = conn.cursor(dictionary=True)

app/views/stats_views.py

@@ -0,0 +1,82 @@
+from flask import Blueprint, render_template, request, current_app, redirect, url_for
+from db_interface import get_latest_auth_logs, get_all_groups, get_vendor_info, get_user_by_mac, add_user
+import pytz
+import humanize
+from datetime import datetime, timezone, timedelta
+
+stats = Blueprint('stats', __name__)
+
+def get_time_filter_delta(time_range):
+    return {
+        "last_minute": timedelta(minutes=1),
+        "last_5_minutes": timedelta(minutes=5),
+        "last_10_minutes": timedelta(minutes=10),
+        "last_hour": timedelta(hours=1),
+        "last_6_hours": timedelta(hours=6),
+        "last_12_hours": timedelta(hours=12),
+        "last_day": timedelta(days=1),
+        "last_30_days": timedelta(days=30),
+    }.get(time_range)
+
+@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'
+    limit = 1000  # Fetch enough to allow filtering by time later
+
+    # Timezone setup
+    tz_name = current_app.config.get('APP_TIMEZONE', 'UTC')
+    local_tz = pytz.timezone(tz_name)
+
+    def is_within_selected_range(ts):
+        if time_range == "all":
+            return True
+        delta = get_time_filter_delta(time_range)
+        if not delta or not ts:
+            return True
+        now = datetime.now(timezone.utc)
+        if ts.tzinfo is None:
+            ts = ts.replace(tzinfo=timezone.utc)
+        return (now - ts) <= delta
+
+    def enrich(entry):
+        if entry.get('timestamp') and entry['timestamp'].tzinfo is None:
+            entry['timestamp'] = entry['timestamp'].replace(tzinfo=timezone.utc)
+
+        local_time = entry['timestamp'].astimezone(local_tz)
+        entry['ago'] = humanize.naturaltime(datetime.now(local_tz) - local_time)
+
+        vendor_info = get_vendor_info(entry['mac_address']) or {}
+        entry['vendor'] = vendor_info.get('vendor', 'Unknown Vendor')
+
+        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
+
+        return entry
+
+    # Get and enrich logs after filtering
+    accept_entries = [enrich(e) for e in get_latest_auth_logs('Access-Accept', limit) if is_within_selected_range(e.get('timestamp'))]
+    reject_entries = [enrich(e) for e in get_latest_auth_logs('Access-Reject', limit) if is_within_selected_range(e.get('timestamp'))]
+    fallback_entries = [enrich(e) for e in get_latest_auth_logs('Accept-Fallback', limit) if is_within_selected_range(e.get('timestamp'))]
+
+    available_groups = get_all_groups()
+
+    return render_template(
+        "stats.html",
+        accept_entries=accept_entries,
+        reject_entries=reject_entries,
+        fallback_entries=fallback_entries,
+        available_groups=available_groups,
+        time_range=time_range
+    )
+
+@stats.route('/add', methods=['POST'])
+def add():
+    mac = request.form['mac_address']
+    desc = request.form.get('description', '')
+    group_id = request.form.get('group_id')  # keep as string since VARCHAR
+    current_app.logger.info(f"Received MAC={mac}, DESC={desc}, VLAN={group_id}")
+
+    add_user(mac, desc, group_id)
+    return redirect(url_for('stats.stats_page'))

app/views/user_views.py

@@ -1,5 +1,5 @@
-from flask import Blueprint, render_template, request, redirect, url_for
-from db_interface import get_all_users, get_all_groups, add_user, update_description, update_vlan, delete_user, refresh_vendors
+from flask import Blueprint, render_template, request, redirect, url_for, flash
+from db_interface import get_all_users, get_all_groups, add_user, update_description, update_vlan, delete_user, refresh_vendors, get_user_by_mac
 
 user = Blueprint('user', __name__, url_prefix='/user')