Commit 49cb8285 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

proper result table rendering in query editor result view

parent 1d39abad
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@
    - better error message style
    - compare with yesterday in metric preview widget
    - refresh btn in metric preview widget
    - onunload in quert editor

[ release ]
    - functions: round, median, percentile
+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
  CodeMirror.defineMIME("text/x-chartsql", {
    name: "sql",
    keywords: set(sqlKeywords + "begin draw with"),
    builtin: set("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric axis bottom left right top xdomain ydomain grid inside outside legend title subtitle"),
    builtin: set("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric axis bottom left right top xdomain ydomain grid inside outside legend title subtitle value"),
    atoms: set("false true null unknown linechart barchart areachart pointchart stacked"),
    operatorChars: /^[*+\-%<>!=]/,
    dateSQL: set("date time timestamp"),
+12 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ FnordMetric.util.queryResultView = function() {

    var controls = document.createElement("div");
    controls.className = "metric_preview_secondary_controls";
    controls.innerHTML = "<a>Result Chart</a>"
    controls.innerHTML = "<a style='float: left;'>Result Chart</a>"
    chart_pane.appendChild(controls);

    var controls_embed = FnordMetric.createButton(
@@ -61,8 +61,18 @@ FnordMetric.util.queryResultView = function() {
  }

  function renderTable(table, elem) {
    var controls = document.createElement("div");
    controls.className = "metric_preview_secondary_controls";
    controls.innerHTML = "<a style='float: left;'>Result Table</a>"
    elem.appendChild(controls);


    var table_elem = document.createElement("div");
    table_elem.className = "result_table";
    elem.appendChild(table_elem);

    var table_view = FnordMetric.util.TableView(
      table.columns, elem, 5);
      table.columns, table_elem, 20);

    table.rows.map(function(row) {
      table_view.addRow(row);
+5 −5
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ FnordMetric.util.TableView = function(columns, elem, per_page) {
      updatePage((current_page + 1) % pages, isSortable);
    }

    var label = document.createElement("div");
    label.className = "pagination_label";
    label.innerHTML = from + " - " + until + " of " + total;
    navbar.appendChild(label);

    var ttp_back = FnordMetric.createButton(
      "#", "pagination_tooltip",  "&#8592;");
    ttp_back.onclick = function(e) {
@@ -125,11 +130,6 @@ FnordMetric.util.TableView = function(columns, elem, per_page) {
    }
    navbar.appendChild(ttp_back);

    var label = document.createElement("div");
    label.className = "pagination_label";
    label.innerHTML = from + " - " + until + " of " + total;
    navbar.appendChild(label);

    elem.appendChild(navbar);
  }

+25 −0
Original line number Diff line number Diff line
@@ -561,6 +561,31 @@ input {
  right: 10px;
}

.result_table .pagination_navbar {
  font-size: 90%;
  margin-top: -33px;
}

.result_table .metric_list {
  margin-top: 0;
}

.result_table table.metric_list tr.list_header {
  border-top: none;
  border-bottom: 1px solid #dbdedf;
}

.result_table table.metric_list th, .result_table table.metric_list td {
  height: 34px;
  line-height: 34px;
  font-size: 100%;
}

.result_pane .chart_container a.btn {
  float: right;
  margin-right: 0;
}

.result_pane table.result_table {
  width: 100%;
  max-width: 1500px;