fix sort metric list (f16680fd) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-metriclist.js

+0 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ FnordMetric.views.MetricList = function() {

		function renderMetricList(viewport, metrics, search_item) {
		viewport.innerHTML = "";
		console.log(metrics);

		if (metrics.length == 0) {
		if (search_item != undefined) {

fnordmetric-webui/fnordmetric-webui-tableview.js

+22 −19

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ FnordMetric.util.TableView = function(columns, elem, per_page) {
		var current_page = 0;
		var pages;

		var order = {};

		function render(isSortable) {
		if (isSortable == undefined) {
		isSortable = true;
		@@ -42,9 +44,14 @@ FnordMetric.util.TableView = function(columns, elem, per_page) {
		render(isSortable);
		}

		function resortRows(column_index, order) {
		function resortRows(column_index) {
		var column_order;
		column_order = (order[column_index] == undefined \|\|
		order[column_index] == "desc") ?
		"asc" : "desc";
		order[column_index] = column_order;
		FnordMetric.util.sortMetricList(
		all_rows, column_index, order);
		all_rows, column_index, column_order);
		updatePage(0);
		}

		@@ -60,28 +67,24 @@ FnordMetric.util.TableView = function(columns, elem, per_page) {

		for (var i = 0; i < columns.length; i++) {
		var header_cell = document.createElement("th");
		header_cell.innerHTML = columns[i];
		var title = document.createElement("span");
		title.innerHTML = columns[i];
		header_cell.appendChild(title);
		header.appendChild(header_cell);
		if (i != 1 && isSortable) {
		header_cell.className = "clickable";

		var sort_asc = FnordMetric.createButton(
		"#", "caret left", "▲");
		sort_asc.setAttribute("id", i);
		sort_asc.onclick = function(e) {
		e.preventDefault();
		resortRows(this.id, "asc");
		title.setAttribute("id", i);
		title.className = "clickable";
		title.onclick = function() {
		resortRows(this.id);
		}
		header_cell.appendChild(sort_asc);

		var sort_desc = FnordMetric.createButton(
		"#", "caret", "▼");
		sort_desc.setAttribute("id", i);
		sort_desc.onclick = function(e) {
		var sort = FnordMetric.createButton(
		"#", "caret left", "▲");
		sort.setAttribute("id", i);
		sort.onclick = function(e) {
		e.preventDefault();
		resortRows(this.id, "desc");
		resortRows(this.id);
		}
		header_cell.appendChild(sort_desc);
		header_cell.appendChild(sort);
		}
		}

fnordmetric-webui/fnordmetric-webui-util.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ FnordMetric.httpPost = function(url, request, callback) {

		FnordMetric.util.parseTimestamp = function(timestamp) {
		if (timestamp == 0) {
		return timestamp;
		return "0";
		}

		var time_str;

fnordmetric-webui/fnordmetric-webui.css

+1 −1

Original line number	Diff line number	Diff line
		@@ -609,7 +609,7 @@ table.metric_list th {
		border-right: 1px solid rgb(226, 232, 237);
		}

		table.metric_list th.clickable:hover {
		table.metric_list .clickable:hover {
		cursor:pointer;
		}

Admin message