diff --git a/docker/routlin-dash/app/pages/dhcpleases/content.json b/docker/routlin-dash/app/pages/dhcpleases/content.json index d6102ca..d12239e 100644 --- a/docker/routlin-dash/app/pages/dhcpleases/content.json +++ b/docker/routlin-dash/app/pages/dhcpleases/content.json @@ -55,8 +55,8 @@ "field": "vlan_name" }, { - "label": "Last Renewal", - "field": "last_active" + "label": "Lease Renewed", + "field": "lease_renewed" }, { "label": "Renews", diff --git a/docker/routlin-dash/app/pages/dhcpleases/view.py b/docker/routlin-dash/app/pages/dhcpleases/view.py index e83e143..266be71 100644 --- a/docker/routlin-dash/app/pages/dhcpleases/view.py +++ b/docker/routlin-dash/app/pages/dhcpleases/view.py @@ -128,13 +128,13 @@ def live_dhcp_leases(): obtained_ts = (expiry - lease_secs) if lease_secs else None renews_ts = (expiry - lease_secs // 2) if lease_secs else None if obtained_ts is None: - last_active = '-' + lease_renewed = '-' elif obtained_ts <= now: - last_active = relative_time(obtained_ts, now, short=True) + ' ago' + lease_renewed = relative_time(obtained_ts, now, short=True) + ' ago' elif renews_ts and renews_ts > now: - last_active = 'ETA ' + relative_time(renews_ts, now, short=True) + lease_renewed = 'ETA ' + relative_time(renews_ts, now, short=True) else: - last_active = 'ETA soon' + lease_renewed = 'ETA soon' mac_norm = parts[1].lower() device_h = parts[3] if parts[3] != '*' else None res_h = mac_to_res.get(mac_norm) @@ -153,7 +153,7 @@ def live_dhcp_leases(): 'mac_address': parts[1], 'vendor': _vendor_cell(_get_vendor(parts[1])), 'vlan_name': vlan_name, - 'last_active': last_active, + 'lease_renewed': lease_renewed, 'renews': 'in ' + relative_time(renews_ts or expiry, now, short=True), 'status': _status_badge(arp_entry.get('state', '')), }) @@ -169,7 +169,7 @@ def live_dhcp_leases(): 'mac_address': mac, 'vendor': _vendor_cell(_get_vendor(mac)), 'vlan_name': _vlan_for_ip(arp['ip'], vlans), - 'last_active': '', + 'lease_renewed': '', 'renews': '', 'status': _status_badge(arp['state']), })