[Bigdata-commit] SF.net SVN: bigdata:[8030] branches/RDR/bigdata-war/src/html

[<tob...@us...>]

Revision: 8030
          http://sourceforge.net/p/bigdata/code/8030
Author:   tobycraig
Date:     2014-04-02 22:43:05 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
#843 - Show query details upon request and update overall numbers too when a query's details are requested

Modified Paths:
--------------
    branches/RDR/bigdata-war/src/html/css/style.css
    branches/RDR/bigdata-war/src/html/js/workbench.js

Modified: branches/RDR/bigdata-war/src/html/css/style.css
===================================================================
--- branches/RDR/bigdata-war/src/html/css/style.css	2014-04-02 20:53:52 UTC (rev 8029)
+++ branches/RDR/bigdata-war/src/html/css/style.css	2014-04-02 22:43:05 UTC (rev 8030)
@@ -209,5 +209,6 @@
 
 #running-queries div.query-details {
    border-bottom: 1px solid;
+   overflow-x: scroll;
 }
 

Modified: branches/RDR/bigdata-war/src/html/js/workbench.js
===================================================================
--- branches/RDR/bigdata-war/src/html/js/workbench.js	2014-04-02 20:53:52 UTC (rev 8029)
+++ branches/RDR/bigdata-war/src/html/js/workbench.js	2014-04-02 22:43:05 UTC (rev 8030)
@@ -811,7 +811,20 @@
 
 $('#show-queries').click(function(e) {
    e.preventDefault();
-   $.get('/bigdata/status?showQueries', function(data) {
+   showQueries(false);
+});
+
+$('#show-query-details').click(function(e) {
+   e.preventDefault();
+   showQueries(true);
+});
+
+function showQueries(details) {
+   var url = '/bigdata/status?showQueries';
+   if(details) {
+      url += '=details';
+   }
+   $.get(url, function(data) {
       // get data inside a jQuery object
       data = $('<div>').append(data);
 
@@ -822,7 +835,6 @@
       $('#running-queries').empty();
 
       data.find('h1').each(function(i, e) {
-         // per running query, data is structured h1 form (with numbers/cancel data) h2 pre (with SPARQL)
          e = $(e);
          // get numbers string, which includes cancel link
          var form = e.next();
@@ -832,18 +844,25 @@
          // get query id
          var queryId = form.find('input[type=hidden]').val();
          // get SPARQL
-         var sparql = form.next().next().html();
+         var sparqlContainer = form.next().next();
+         var sparql = sparqlContainer.html();
 
+         if(details) {
+            var queryDetails = $('<div>').append(sparqlContainer.nextUntil('h1')).html();
+         } else {
+            var queryDetails = '<a href="#">Details</a>';
+         }
+
          // got all data, create a li for each query
-         var li = $('<li><div class="query"><pre>' + sparql + '</pre></div><div class="query-numbers">' + numbers + ', <a href="#" class="cancel-query">Cancel</a></div><div class="query-details"><a href="#" class="query-details collapsed">Details</a></div>');
+         var li = $('<li><div class="query"><pre>' + sparql + '</pre></div><div class="query-numbers">' + numbers + ', <a href="#" class="cancel-query">Cancel</a></div><div class="query-details">' + queryDetails + '</div>');
          li.find('a').data('queryId', queryId);
          $('#running-queries').append(li);
       });
 
       $('.cancel-query').click(cancelQuery);
-      $('a.query-details').click(getQueryDetails);
+      $('.query-details a').click(getQueryDetails);
    });
-});
+}
 
 function cancelQuery(e) {
    e.preventDefault();
@@ -854,8 +873,27 @@
    }
 }
 
-function getQueryDetails(e) {}
+function getQueryDetails(e) {
+   e.preventDefault();
+   var id = $(this).data('queryId');
+   $.ajax({url: '/bigdata/status?showQueries=details&queryId=' + id,
+      success: function(data) {
+         // get data inside a jQuery object
+         data = $('<div>').append(data);
 
+         // update status numbers
+         getStatusNumbers(data);
+
+         // details begin after second pre
+         var details = $('<div>').append($(data.find('pre')[1]).nextAll()).html();
+
+         $(this).parent().html(details);
+      },
+      context: this
+   });
+}
+
+
 /* Performance */
 
 $('#tab-selector a[data-target=performance]').click(function(e) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.