add series to select_expr (074df007) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-metricpreviewwidget.js

+9 −19

Original line number	Diff line number	Diff line
		@@ -131,20 +131,12 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		tw_select.disabled = true;
		step_select.className = "disabled";
		step_select.disabled = true;
		if (show == "Value") {
		group_btns.map(function(btn) {
		btn.className = "disabled";
		});
		} else {
		group_btns.map(function(btn) {
		btn.className = "";
		});
		}
		} else {
		tw_select.className = "";
		tw_select.disabled = false;
		step_select.className = "";
		step_select.disabled = false;
		}
		var by_str = (query_params.by == undefined)?
		"" : query_params.by;
		group_btns.map(function(btn) {
		@@ -156,8 +148,6 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		});
		}

		}

		function updateDateTimeElems(title, input, start_time, end_time) {
		var start_time = (start_time !== undefined) ?
		start_time : getQueryParamOrDefaultValue("start_time");

+5 −6

Original line number	Diff line number	Diff line
		@@ -433,10 +433,11 @@ FnordMetric.util.generateSQLQueryFromParams = function(params) {
		} else if (view == "rollup_sum" \|\| view == "rollup_count" \|\| view == "rollup_mean") {
		draw_stm = "DRAW BARCHART\n AXIS BOTTOM\n AXIS LEFT;";
		var func = (view.split("_"))[1];
		//how to define which column should be selected

		/* if the metric hasn't any labels total is selected */
		var column = (columns[0].length > 0)?
		("`" + columns[0] + "`") : "'total'";
		console.log("column " + columns[0].length);

		select_expr =
		" SELECT " + column + " AS X, " + func + "(value) AS Y";

		@@ -447,11 +448,10 @@ FnordMetric.util.generateSQLQueryFromParams = function(params) {
		hasAggregation = true;
		}
		if (by != undefined && by.length > 0) {
		select_expr += ", " + by + " AS series";
		var series = by.replace(/,/g, " + ',' + ");
		select_expr += ", " + series + " AS series";
		}

		console.log(select_expr);

		/* complete from_expr */
		from_expr += " `" + table_ref + "`\n";

		@@ -493,7 +493,6 @@ FnordMetric.util.generateSQLQueryFromParams = function(params) {
		}
		}

		console.log(group_expr);

		query =
		draw_stm + select_expr + from_expr +