From 8129b2f7571db66ac0ac7d37894dd8c4b12c8299 Mon Sep 17 00:00:00 2001
From: Matthew Grotke <mgrotke@gmail.com>
Date: Mon, 1 Jun 2026 23:09:45 -0400
Subject: [PATCH] Development

---
 docker/routlin-dash/app/pages/dhcpleases/content.json | 8 ++------
 docker/routlin-dash/app/view_page.py                  | 7 +++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/docker/routlin-dash/app/pages/dhcpleases/content.json b/docker/routlin-dash/app/pages/dhcpleases/content.json
index c60a91d..098e1df 100644
--- a/docker/routlin-dash/app/pages/dhcpleases/content.json
+++ b/docker/routlin-dash/app/pages/dhcpleases/content.json
@@ -54,12 +54,8 @@
           "field": "vlan_name"
         },
         {
-          "label": "Last Active",
-          "field": "last_active"
-        },
-        {
-          "label": "Expires",
-          "field": "expires"
+          "label": "Renews",
+          "field": "renews"
         },
         {
           "label": "Recent",
diff --git a/docker/routlin-dash/app/view_page.py b/docker/routlin-dash/app/view_page.py
index 2b2e998..08f8994 100644
--- a/docker/routlin-dash/app/view_page.py
+++ b/docker/routlin-dash/app/view_page.py
@@ -26,7 +26,7 @@ def _get_vendor(mac):
     if _mac_parser is None:
         return ''
     try:
-        return _mac_parser.get_manuf(mac) or ''
+        return _mac_parser.get_comment(mac) or _mac_parser.get_manuf(mac) or ''
     except Exception:
         return ''
 
@@ -217,7 +217,7 @@ def live_dhcp_leases():
                     if expiry < now:
                         continue
                     obtained_ts = (expiry - lease_secs) if lease_secs else None
-                    obtained    = relative_time(obtained_ts) if obtained_ts else '-'
+                    renews_ts   = (expiry - lease_secs // 2) if lease_secs else None
                     recent      = (obtained_ts is not None and restart_time is not None
                                    and obtained_ts >= restart_time)
                     mac_norm = parts[1].lower()
@@ -237,8 +237,7 @@ def live_dhcp_leases():
                         'mac_address': parts[1],
                         'vendor':      _get_vendor(parts[1]),
                         'vlan_name':   vlan_name,
-                        'last_active': obtained,
-                        'expires':     relative_time_future(expiry),
+                        'renews':      relative_time_future(renews_ts) if renews_ts else relative_time_future(expiry),
                         'recent':      recent,
                     })
         except Exception: