Commit f77b4f80 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

bottom pagination

parent 11482c42
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@
    - execution info fix

[ release ]
    - functions: round, median, percentile
    - ga js
    - median
    - last insert should not be zero!
    - svg: escape series names, labels!

-----
@@ -32,6 +34,8 @@
    - do I need an external database

[ feature q ]
    - round fn
    - percentiles
    - metric preview widget: auto refresh (on/off)
    - version numbers
    - deb pkg
+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {

  function renderTable(table) {
    var table_view = FnordMetric.util.TableView(
      table.columns, table_container, 25);
      table.columns, table_container, 25, "bottom");
    elem.appendChild(table_container);
    for (i in table.rows) {
      table_view.addRow(table.rows[i]);
+4 −0
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ FnordMetric.views.QueryPlayground = function() {
      FnordMetric.util.setURLQueryString("query_playground", params, true, true);
    }

    if (query_str.length < 3) {
      return;
    }

    FnordMetric.util.displayLoader(result_pane);

    FnordMetric.httpPost("/query", query_str, function(r, duration) {
+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ FnordMetric.util.queryResultView = function() {

  function renderError(msg, elem) {
    var msg_field = document.createElement("div");
    msg_field.className = "error_field";
    msg_field.className = "error_box";
    msg_field.innerHTML = msg;
    elem.appendChild(msg_field);
  }
+8 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ if (FnordMetric.util === undefined) {
  FnordMetric.util = {};
}

FnordMetric.util.TableView = function(columns, elem, per_page) {
FnordMetric.util.TableView = function(columns, elem, per_page, pagination_pos) {
  var all_rows = [];
  var on_row_click = null;

@@ -35,8 +35,13 @@ FnordMetric.util.TableView = function(columns, elem, per_page) {
    pages = Math.ceil(all_rows.length / per_page);
    var offset = current_page * per_page;
    var until = Math.min(offset + per_page, all_rows.length);
    if (pagination_pos != "bottom") {
      renderPagination(offset+1,until, all_rows.length, isSortable);
    }
    renderTable(all_rows.slice(offset, until), isSortable);
    if (pagination_pos == "bottom") {
      renderPagination(offset+1,until, all_rows.length, isSortable);
    }
  }

  function updatePage(page_index, isSortable) {
@@ -107,7 +112,7 @@ FnordMetric.util.TableView = function(columns, elem, per_page) {

  function renderPagination(from, until, total, isSortable) {
    var navbar = document.createElement("div");
    navbar.className = "pagination_navbar metric";
    navbar.className = "pagination_navbar metric " + pagination_pos;

    var ttp_forward = FnordMetric.createButton(
      "#", "pagination_tooltip", "<i class='fa fa-chevron-right'></i>");
Loading