Merge pull request #29 from paulasmuth/adminui_fixes (d1049842) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-metricpreviewwidget.js

+3 −3

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {

		/* checks if required url params are misssing and adds those if so */
		function addRequiredURLParamsForView(value) {
		if (value == "count" \|\| value == "sum" \|\| value == "mean") {
		if (value != "value") {
		var group_by = query_params.by;
		if (group_by == undefined) {
		group_by = defaults.by;
		@@ -96,7 +96,6 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		function runQuery() {
		var querystr =
		FnordMetric.util.generateSQLQueryFromParams(query_params);

		var queryurl = "/query?height=400&width=" + (window.innerWidth - 40);
		FnordMetric.util.displayLoader(chart_container);
		table_container.innerHTML = "";
		@@ -138,7 +137,8 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		tw_select.disabled = false;
		step_select.className = "";
		step_select.disabled = false;
		var by_str = query_params.by;
		var by_str = (query_params.by == undefined)?
		"" : query_params.by;
		group_btns.map(function(btn) {
		if (by_str.indexOf(btn.innerText) > -1) {
		btn.className = "active";

+3 −5

Original line number	Diff line number	Diff line
		@@ -471,13 +471,9 @@ FnordMetric.util.generateSQLQueryFromParams = function(params) {

		group_expr+= ")";

		/* fallback if group_by wasn't selected */
		if (by == undefined && columns != undefined) {
		group_expr += " BY " + columns[0];
		}
		}

		if (by != undefined) {
		if (by != undefined && by.length > 0) {
		hasGroupStm = true;

		group_expr += " BY " + by;
		@@ -489,6 +485,8 @@ FnordMetric.util.generateSQLQueryFromParams = function(params) {
		}
		}

		console.log(group_expr);

		query =
		draw_stm + select_expr + from_expr +
		where_expr + group_expr + ";";