remove obsolete css
[APKPM.git] / public / user.html
index 8771f4a..1e3ee78 100644 (file)
@@ -1,6 +1,6 @@
 <!doctype html>
 <html xmlns:ng="http://angularjs.org">
- <script src="http://code.angularjs.org/angular-0.9.12.min.js" ng:autobind></script>
+ <script src="http://code.angularjs.org/angular-0.9.17.min.js" ng:autobind></script>
  <body>
   <script>
     function user($xhr,$resource,$log) {
                if ( ! username ) username = self.search_username;
                $log.info( 'CRM_search', username );
                self.clear();
+               self.message.CRM = 'search for '+username;
                self.r.CRM_search.query({username: username}, function(CRM) {
                        self.CRM = CRM;
                        $log.info( 'CRM', CRM )
+                       if ( ! CRM.length ) {
+                               self.message.CRM = 'no results';
+                               return;
+                       }
+                       self.message.CRM = null;
                        if ( CRM.length == 1 ) {
                                self.selected_username = CRM[0].USERNAME;
-                               $log.info( 'auto-selected', self.selected_username );
+                               $log.info( 'auto-selected ', self.selected_username );
                        }
                });
        };
                if ( ! username ) username = self.selected_username;
 
                if ( ! username ) {
-                       $log.error( 'no username for LDAP_search' );
+                       self.message.LDAP = 'no username';
                        return;
                }
                $log.info( 'LDAP_search', username );
+               self.clear_LDAP();
                self.selected_username = username;
-               self.LDAP = {};
-               self.cpe = {};
-               self.gnuplot = {};
+               self.message.LDAP = 'search '+username;
                self.r.LDAP_search.query({ username: username }, function(LDAP) {
                        self.LDAP = LDAP;
                        $log.info( 'LDAP', LDAP );
-                       self.cpe = {
-                               parser: LDAP[0]._cpe_parser,
-                               table: 'cpe_' + LDAP[0]._cpe_parser,
-                       };
+                       if ( self.LDAP.length == 0 ) {
+                               self.message.LDAP ='no results for '+username;
+                               return;
+                       }
+                       self.cpe.parser = LDAP[0]._cpe_parser;
+                       self.cpe.table_name  = 'cpe_' + LDAP[0]._cpe_parser;
                        self.username = LDAP[0].cn;
+                       self.message.LDAP = null;
                        $log.info( 'cpe', self.cpe );
                });
        };
 
        self.gnuplot_draw = function(h_cols) {
                $log.info( 'gnuplot_draw', h_cols );
-               if (h_cols) self.gnuplot.cols = h_cols;
+               if (h_cols.length) {
+                       self.gnuplot.cols = h_cols;
+               } else {
+                       $log.warn("no columns for gnuplot");
+                       return;
+               }
+
+               self.message.gnuplot = 'redrawing '+h_cols.join(' ');
+
                var cols = [ 'timestamp' ];
                for ( var i = 0; i < h_cols.length; i++ ) {
                        cols.push( 'h->\'' + h_cols[i] + '\' as "' + h_cols[i] + '"' );
@@ -70,28 +86,53 @@ console.debug( cols );
        };
 
        self.r.table = $resource('/table/:table');
-       self.$watch('username', function() {
-               if ( ! self.username || ! self.cpe.table ) return;
-               self.r.table.get({ username: self.username, table: self.cpe.table }, function(table) {
+       self.table_update = function () {
+               if ( ! self.username || ! self.cpe.table_name ) return;
+               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) {
                        $log.info( 'table', table );
-                       self.cpe.rows = table.rows;
+                       self.cpe.table = table;
+                       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 {
-                               self.message = 'no graph defined for ' + self.cpe.parser;
+                               self.message.gnuplot = 'no graph for ' + self.cpe.parser;
                        }
                });
-       });
+       };
+       self.$watch('username', self.table_update );
  
-      this.clear = function() {
-       self.CRM = null;
-       self.LDAP = null;
-       self.selected_username = null;
-       self.gnuplot = {};
-       self.cpe = {};
-       self.message = null;
-      };
+       this.clear = function() {
+               $log.info('clear');
+               self.CRM = null;
+               this.clear_LDAP();
+       }
+
+       this.clear_LDAP = function() {
+               $log.info('clear_LDAP');
+               self.LDAP = null;
+               self.selected_username = null;
+               self.gnuplot = {};
+               self.cpe = { limit: 1 };
+       };
+
+       self.message = {};
+
+       self.$watch('selected_username', function() {
+               if ( self.selected_username == null ) self.clear_LDAP();
+       });
+
+       self.clear();
+       self.cpe_limit = self.cpe.limit;
+       self.$watch('cpe_limit', function() {
+               $log.info( 'limit', self.cpe.limit = self.cpe_limit );
+               self.table_update();
+       });
 
        this.columns = [
                'USERNAME',
@@ -105,8 +146,7 @@ console.debug( cols );
 
        this.cpe_hash = {
                'Davolink': [ 'Max_down', 'Max_up' ],
-//             'Davolink': [ 'select timestamp,h->\'Max_down\' as Max_down,h->\'Max_up\' as Max_up from cpe_Davolink where username = \'', '\' order by timestamp desc limit 100' ],
-//             'EasyGateway':
+               'EasyGateway': [ 'upstreamCurrRate', 'upstreamMaxRate', 'upstreamNoiseMargin' ],
        };
 
       this.keys = function(h) {
@@ -122,28 +162,21 @@ console.debug( cols );
     }
 
     user.$inject = ['$xhr','$resource','$log'];
-  </script>
 
-<style type="text/css">
-#columns {
-       position: fixed;
-       top: 0;
-       right: 0;
-       z-index: 10;
-       background: #eee;
-}
+// http://jsfiddle.net/gronky/cLEck/
+angular.formatter('include', {
+    parse: function(apply, value, list) {
+        angular.Array[apply ? 'add' : 'remove'](list, value);
+        return apply;
+    },
+    format: function(apply, value, list) {
+        return angular.Array.indexOf(list, value) != -1;
+    },
+});
 
-#columns > span {
-       float: right;
-}
-
-#columns ul {
-       display: none;
-}
+  </script>
 
-#columns:hover ul {
-       display: block;
-}
+<style type="text/css">
 
 table {
        border-collapse:collapse;
@@ -170,6 +203,27 @@ th, td {
        position: fixed;
 }
 
+.panel_right {
+       z-index: 10;
+       position: absolute;
+       right: 0;
+       background: #ffc;
+       padding: 3px;
+}
+
+.panel_right ul {
+       padding: 0;
+}
+
+.panel_right ul > li {
+       list-style-type: none;
+}
+
+.panel_right > label {
+       float: right;
+}
+
+
 </style>
 
   <div ng:controller="user">
@@ -181,15 +235,21 @@ th, td {
     <input type="submit" value="search in CRM">
     <input type="reset"  ng:click="clear()" value="clear">
 
-    <span id="message" ng:show="message">{{message | html}}</span>
+    <span id="message" ng:show="message.$size()" ng:click="message={}" title="click to close">
+      <div ng:repeat="(category,status) in message" ng:show="status"><b>{{category}}</b> {{status}}</div>
+    </span>
 
    </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">
@@ -208,15 +268,48 @@ th, td {
     <h2><tt>{{selected_username}}</tt> LDAP entry</h2>
 
     <ul ng:show="LDAP">
-     <li ng:repeat="c in keys(LDAP)"><tt>{{c}}</tt> {{LDAP[0][c]}}</li>
+     <li ng:repeat="c in keys(LDAP)">{{c}} <b>{{LDAP[0][c]}}</b></li>
     </ul>
 
-    <ng:include src="gnuplot.img" ng:show="gnuplot.img" onload="message = 'done'" ></ng:include>
-
-    <h2 ng:show="cpe.table">{{cpe.table}} {{username}}</h2>
-    <div ng:show="cpe.rows">
-     <pre>{{cpe.rows[0]}}</pre>
-    </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>
+        <input type="checkbox" name="gnuplot_cols" ng:format="include:k:gnuplot.cols" ng:change="$log.debug(gnuplot_cols)">
+       {{k}} <tt>{{v}}</tt>
+        </label>
+     </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>
+
+    <h2 ng:show="cpe.table_name">{{cpe.table_name}} {{username}}</h2>
+
+    <table ng:show="cpe.table">
+     <tr>
+      <th ng:repeat="c in cpe.table.columns">{{c}}</th>
+     </tr>
+     <tr ng:repeat="r in cpe.table.rows" ng:class-even="'zebra'">
+      <td ng:repeat="v in r">{{v}}</td>
+     </tr>
+     <tr>
+      <td colspan="{{cpe.table.columns.length}}">
+      limit:
+       <label>1<input name="cpe_limit" type="radio" value=1></label>
+       &middot; &middot; &middot;
+       <label>5<input name="cpe_limit" type="radio" value=5></label>
+       &middot; &middot; &middot;
+       <label>10<input name="cpe_limit" type="radio" value=10></label>
+      </td>
+    </tr>
+    </table>
 
   </div>