gnuplot object now has structure

diff --git a/templates/user.html.ep b/templates/user.html.ep
index ae314fd..caea7d3 100644 (file)
--- a/templates/user.html.ep
+++ b/templates/user.html.ep
@@ -24,7 +24,7 @@
         self.code = null;
         self.response = null;
        self.selected_username = null;
-       self.gnuplot_sql = null;
+       self.gnuplot = {};
        self.ldap = null;
        self.message = null;
       };
@@ -52,16 +52,16 @@
        this.select = function(crm) {
                console.log( 'crm = ',crm );
                self.selected_username = crm.USERNAME;
-               self.gnuplot_sql = null;
+               self.gnuplot = {};
                $xhr('JSON'
                        , '/g/LDAP_search/' + self.selected_username + '?callback=JSON_CALLBACK'
                        , function(code, response) {
                                console.debug( code, response );
                                self.ldap = response;
-                               var sql = 'select timestamp,h->\'Max_down\' as Max_down,h->\'Max_up\' as Max_up from cpe_Davolink where username = \'' + response[0].cn + '\' order by timestamp desc limit 100';
-                               console.info( 'sql', sql );
-                               self.gnuplot_sql = '/gnuplot?hide=1;with=points;sql=' + sql;
-                               self.message = 'generating ADSL graph for '+response[0].cn + ' ' + sql;
+                               self.gnuplot.sql = 'select timestamp,h->\'Max_down\' as Max_down,h->\'Max_up\' as Max_up from cpe_Davolink where username = \'' + response[0].cn + '\' order by timestamp desc limit 100';
+                               self.gnuplot.img = '/gnuplot?hide=1;with=points;sql=' + self.gnuplot.sql;
+                               console.info( 'gnuplot', self.gnuplot );
+                               self.message = 'generating ADSL graph for '+response[0].cn + ' ';
                        }
                );
                self.message = 'LDAP search for '+self.selected_username;
@@ -157,15 +157,19 @@ th, td {
     <tt>{{selected_username}}</tt>
 
     <ul ng:show="ldap">
+       <h2>LDAP entry</h2>
     <li ng:repeat="c in keys(ldap)"><tt>{{c}}</tt> {{ldap[0][c]}}</li>
     </ul>
 
-    <ng:include src="gnuplot_sql" ng:show="gnuplot_sql">
+    <h2 ng:show="gnuplot.title">{{gnuplot.title}}</h2>
+    <ng:include src="gnuplot.img" ng:show="gnuplot.img" onload="message = 'done'">
+    <pre ng:show="gnuplot.sql">{{gnuplot.sql}}</pre>
 
   </div>
 
     <input type=checkbox name=debug value=1>
     <pre ng:show=debug>
+gnuplot={{gnuplot}}
 message={{message}}
 url={{url}}
 code={{code}}