mgrotke/linuxrouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Development

Browse source
This commit is contained in:
Matthew Grotke 2026-06-03 13:25:47 -04:00
parent aca936fcea
commit 898c78e7bc
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docker/routlin-dash/app/pages/dhcpleases/content.json
View file

@ -55,8 +55,8 @@
"field": "vlan_name" "field": "vlan_name"
}, },
{ {
"label": "Last Renewal", "label": "Lease Renewed",
"field": "last_active" "field": "lease_renewed"
}, },
{ {
"label": "Renews", "label": "Renews",

12
docker/routlin-dash/app/pages/dhcpleases/view.py
View file

@ -128,13 +128,13 @@ def live_dhcp_leases():
obtained_ts = (expiry - lease_secs) if lease_secs else None obtained_ts = (expiry - lease_secs) if lease_secs else None
renews_ts = (expiry - lease_secs // 2) if lease_secs else None renews_ts = (expiry - lease_secs // 2) if lease_secs else None
if obtained_ts is None: if obtained_ts is None:
last_active = '-' lease_renewed = '-'
elif obtained_ts <= now: 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: 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: else:
last_active = 'ETA soon' lease_renewed = 'ETA soon'
mac_norm = parts[1].lower() mac_norm = parts[1].lower()
device_h = parts[3] if parts[3] != '*' else None device_h = parts[3] if parts[3] != '*' else None
res_h = mac_to_res.get(mac_norm) res_h = mac_to_res.get(mac_norm)
@ -153,7 +153,7 @@ def live_dhcp_leases():
'mac_address': parts[1], 'mac_address': parts[1],
'vendor': _vendor_cell(_get_vendor(parts[1])), 'vendor': _vendor_cell(_get_vendor(parts[1])),
'vlan_name': vlan_name, 'vlan_name': vlan_name,
'last_active': last_active, 'lease_renewed': lease_renewed,
'renews': 'in ' + relative_time(renews_ts or expiry, now, short=True), 'renews': 'in ' + relative_time(renews_ts or expiry, now, short=True),
'status': _status_badge(arp_entry.get('state', '')), 'status': _status_badge(arp_entry.get('state', '')),
}) })
@ -169,7 +169,7 @@ def live_dhcp_leases():
'mac_address': mac, 'mac_address': mac,
'vendor': _vendor_cell(_get_vendor(mac)), 'vendor': _vendor_cell(_get_vendor(mac)),
'vlan_name': _vlan_for_ip(arp['ip'], vlans), 'vlan_name': _vlan_for_ip(arp['ip'], vlans),
'last_active': '', 'lease_renewed': '',
'renews': '', 'renews': '',
'status': _status_badge(arp['state']), 'status': _status_badge(arp['state']),
}) })