pvl-verkko: comparison pvl/verkko/hosts.py

equal deleted inserted replaced

-:47faf2ac32d0
+:589249097230
 if self.error :
 return "{self.state}: {self.error}".format(self=self)
 else :
 return self.state
-def when (self) :
+def seen (self) :
 return (
 html.span(title=self.first_seen)(self.first_seen.strftime(self.DATE_FMT)),
 '-',
 html.span(title=self.last_seen)(self.last_seen.strftime(self.DATE_FMT)),
 )
 db.mapper(Host, db.dhcp_hosts, properties=dict(
 #id      = db.dhcp_hosts.c.rowid,
 #state   = db.dhcp_hosts.c.,
 ))
 class BaseHandler (web.Handler) :
 HOST_ATTRS = {
 'id':       Host.id,
 'net':      Host.gw,
 'ip':       Host.ip,
 render_cell('ip', host.ip, filter=True),
 render_cell('mac', host.mac, filter=True, htmlvalue=host.render_mac()),
 render_cell('name', host.name, htmlvalue=host.render_name()),
 render_cell('gw', host.gw),
-html.td(host.when()),
+html.td(host.seen()),
 html.td(class_=host.state_class(), title=host.state_title())(host.state),
 ) for i, host in enumerate(hosts)
 ),
 html.tfoot(
 html.tr(
 class RealtimeHandler (web.Handler) :
 TITLE = "Pseudo-Realtime hosts.."
 JS = (
 #"/static/jquery/jquery.js",
 'http://code.jquery.com/jquery-1.8.2.js',
+'/static/js/spin.js',
 '/static/hosts.js',
 )
 def process (self) :
 hosts = self.db.query(Host).order_by(Host.last_seen.desc())
 hosts = list(hosts)
 hosts.reverse()
 if hosts :
 t = hosts[-1].last_seen
-hosts = [{'id': host.id, 't': dt2ts(host.last_seen), 'ip': host.ip, 'mac': host.mac} for host in hosts]
+hosts = [dict(
+id      = host.id,
+ip      = host.ip,
+mac     = host.mac,
+name    = host.name,
+gw      = host.gw,
+seen    = unicode(html.div(host.seen())),
+state       = host.state,
+state_class = host.state_class(),
+t       = dt2ts(host.last_seen),
+) for host in hosts]
 else :
 hosts = []
 data = dict(
 def render (self) :
 params = dict(
 url     = self.url(),
 t       = dt2ts(self.t),
+host    = self.url(ItemHandler, id='0'),
 )
 params = json.dumps(params)
-return (
+COLUMNS = (
-html.input(type='submit', id='refresh', value="Refresh", _selfclosing=False),
+'#', 'IP', 'MAC', 'Hostname', 'Network', 'Seen', 'State'
-html.ul(id='hosts')(
+)
-html.li(id=host.id)("{host.ip} / {host.mac}".format(host=host)) for host in self.hosts
+return html.div(id='wrapper')(
+html.input(type='submit', id='refresh', value="Refresh"),
+html.table(id='hosts')(
+html.thead(
+html.tr(
+html.th(title) for title in COLUMNS
+),
+),
+html.tbody(
+html.tr(id=host.id)(
+html.td(html.a(href=self.url(ItemHandler, id=host.id))('#')),
+(
+html.td(value) for value in (
+host.ip, host.mac, host.name, host.gw, host.seen(),
+)
+),
+html.td(class_=host.state_class())(host.state),
+) for host in self.hosts
+)
 ),
 html.script(type='text/javascript')("""
 $(document).ready(hosts_realtime({params}));
 """.format(params=params)
 )

changeset 26	589249097230
parent 25	47faf2ac32d0
child 27	38d050c657da