display last ping for user

[APKPM.git] / public / user.html

diff --git a/public/user.html b/public/user.html
index 92b3225..e8d3f1d 100644 (file)
--- a/public/user.html
+++ b/public/user.html
@@ -88,12 +88,29 @@ console.debug( cols );
        self.r.table = $resource('/table/:table');
        self.table_update = function () {
                if ( ! self.username || ! self.cpe.table_name ) return;
+
+               self.message.ping = self.username+' loading';
+               self.r.table.get({ username: self.username, table: 'ping', limit: 1 }, function(ping) {
+                       $log.info('ping', ping);
+                       self.message.ping = null;
+                       var hash = {};
+                       for(var i = 0; i <= ping.columns.length; i++) {
+                               hash[ping.columns[i]] = ping.rows[0][i];
+                       }
+                       self.cpe.ping = hash;
+                       $log.info('ping hash', hash);
+               });
+
                self.message.table = self.username + ' loading from ' + self.cpe.table_name;
-               self.r.table.get({ username: self.username, table: self.cpe.table_name, limit: self.cpe.limit }, function(table) {
+               self.r.table.get({ username: self.username, table: self.cpe.table_name, limit: self.cpe_limit }, function(table) {
                        $log.info( 'table', table );
                        self.cpe.table = table;
-                       self.message.table = table.rows.length == 0 ? 'no results' : null;
-                       
+                       self.message.table = null;
+                       if ( table.rows.length == 0 ) {
+                               self.message.table = 'no results for '+self.username;
+                               return;
+                       }
+
                        if ( h_cols = self.cpe_hash[self.cpe.parser] ) {
                                self.gnuplot_draw( h_cols );
                        } else {
@@ -114,7 +131,8 @@ console.debug( cols );
                self.LDAP = null;
                self.selected_username = null;
                self.gnuplot = {};
-               self.cpe = { limit: 1 };
+               self.cpe = {};
+               self.cpe_limit = 1;
        };
 
        self.message = {};
@@ -124,9 +142,8 @@ console.debug( cols );
        });
 
        self.clear();
-       self.cpe_limit = self.cpe.limit;
        self.$watch('cpe_limit', function() {
-               $log.info( 'limit', self.cpe.limit = self.cpe_limit );
+               $log.info( 'cpe_limit', self.cpe_limit );
                self.table_update();
        });
 
@@ -173,25 +190,6 @@ angular.formatter('include', {
   </script>
 
 <style type="text/css">
-#columns {
-       position: fixed;
-       top: 0;
-       right: 0;
-       z-index: 10;
-       background: #eee;
-}
-
-#columns > span {
-       float: right;
-}
-
-#columns ul {
-       display: none;
-}
-
-#columns:hover ul {
-       display: block;
-}
 
 table {
        border-collapse:collapse;
@@ -218,16 +216,29 @@ th, td {
        position: fixed;
 }
 
-#gnuplot_cols {
-       float: right;
-       background: #eee;
-       padding: 0.5em;
+.panel_right {
+       z-index: 10;
+       position: absolute;
+       right: 0;
+       background: #ffc;
+       padding: 3px;
+}
+
+.panel_right ul {
+       padding: 0;
 }
 
-#gnuplot_cols li {
+.panel_right ul > li {
        list-style-type: none;
 }
-       
+
+.panel_right > label {
+       float: right;
+}
+
+li > tt {
+       font-weight: bold;
+}
 
 </style>
 
@@ -235,7 +246,7 @@ th, td {
 
    <form ng:submit="CRM_search()">
     <label for="args">username:
-    <input type="text" name="search_username" placeholder="test" size="10" ng:required />
+    <input type="text" name="search_username" placeholder="test" size="10" autofocus ng:required />
     </label>
     <input type="submit" value="search in CRM">
     <input type="reset"  ng:click="clear()" value="clear">
@@ -246,11 +257,15 @@ th, td {
 
    </form>
 
-<div id="columns" ng:show="CRM">
-<span>Add columns</span>
-<ul>
-<li ng:repeat="c in keys(CRM)" ng:show="columns.indexOf(c) < 0" ng:click="columns.push(c)">{{c}}
-</ul>
+
+<div class="panel_right" ng:show="CRM">
+ <label>
+  Add columns
+  <input type=checkbox name=show_columns>
+ </label>
+ <ul ng:show="show_columns">
+  <li ng:repeat="c in keys(CRM)" ng:show="columns.indexOf(c) < 0" ng:click="columns.push(c)">{{c}}
+ </ul>
 </div>
 
     <table ng:show="CRM">
@@ -272,7 +287,16 @@ th, td {
      <li ng:repeat="c in keys(LDAP)"><tt>{{c}}</tt> {{LDAP[0][c]}}</li>
     </ul>
 
-    <ul ng:show="cpe.table" id="gnuplot_cols">
+    <div ng:show="cpe.ping">
+     ping <tt>{{cpe.ping.ip}}</tt> rtt <tt>{{cpe.ping.rtt}}</tt> at <tt>{{cpe.ping.timestamp}}</tt>
+    </div>
+
+   <div class="panel_right" ng:show="cpe.table">
+    <label>
+     Graph columns
+     <input type=checkbox name=show_gnuplot_cols>
+    </label>
+    <ul ng:show="show_gnuplot_cols">
      <input type=button ng:click="gnuplot_draw(gnuplot.cols)" value="Redraw graph">
      <li ng:repeat="(k,v) in cpe.table.rows[0][cpe.table.hash_col]">
         <label>
@@ -282,6 +306,7 @@ th, td {
      </li>
      <input type=button ng:click="gnuplot_draw(gnuplot.cols)" value="Redraw graph">
     </ul>
+   </div>
 
     <ng:include src="gnuplot.img" ng:show="gnuplot.img" onload="message.gnuplot = null" ></ng:include>