Merge pull request #24 from paulasmuth/adminui_fixes (11482c42) · Commits · github_fork / Clip

fnordmetric-webui/fnordmetric-webui-datepicker.js

+16 −7

Original line number	Diff line number	Diff line
		@@ -25,13 +25,10 @@ FnordMetric.util.DatePicker = function(elem, dp_input, viewport, callback) {
		var curr_date = new Date().getDate();
		var curr_month = new Date().getMonth();

		var selected_ts = new Date(
		parseInt(dp_input.getAttribute("id"), 10));
		var selected_ts;
		//var selected_day = selected_ts.getDate();
		var selected_hours =
		FnordMetric.util.appendLeadingZero(selected_ts.getHours());
		var selected_minutes =
		FnordMetric.util.appendLeadingZero(selected_ts.getMinutes());
		var selected_hours;
		var selected_minutes;

		var human_days = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"];

		@@ -56,8 +53,8 @@ FnordMetric.util.DatePicker = function(elem, dp_input, viewport, callback) {
		FnordMetric.util.appendLeadingZero(minutes);

		var ts = new Date(year, month, day, hours, minutes).getTime();
		dp_input.setAttribute("timestamp", ts);
		callback(ts);
		dp_input.setAttribute("timestamp", ts);
		resetDatepicker();
		}

		@@ -66,6 +63,18 @@ FnordMetric.util.DatePicker = function(elem, dp_input, viewport, callback) {
		dp_widget.className = "datepicker_widget active";
		isCurrMonth = month == curr_month;

		selected_ts = new Date(
		parseInt(dp_input.getAttribute("id"), 10));

		selected_hours =
		FnordMetric.util.appendLeadingZero(
		selected_ts.getHours());

		selected_minutes =
		FnordMetric.util.appendLeadingZero(
		selected_ts.getMinutes());


		var input_container = document.createElement("div");
		input_container.className = "input_container";
		var separator = document.createElement("span");

fnordmetric-webui/fnordmetric-webui-embedpopup.js

+0 −26

Original line number	Diff line number	Diff line
		@@ -97,29 +97,3 @@ FnordMetric.util.embedPopup = function(elem) {
		"render" : render,
		}
		}

		/* function closePopup() {
		elem.removeChild(popup);
		loader.destroy(elem);
		}

		var loader = FnordMetric.util.Loader();
		loader.onClick(closePopup);
		loader.display(elem);
		var popup = document.createElement("div");
		popup.className = "popup";
		var close_btn = FnordMetric.createButton(
		"#", undefined, "X");
		var innerWindow = document.createElement("div");
		innerWindow.className = "inner_window";
		innerWindow.innerHTML = text;

		popup.appendChild(close_btn);
		popup.appendChild(innerWindow);
		elem.appendChild(popup);

		close_btn.onclick = function(e) {
		e.preventDefault();
		closePopup();
		}
		*/

fnordmetric-webui/fnordmetric-webui-metriclist.js

+1 −1

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

		function onRowClick() {
		var end = Date.now();
		var start = end - 300000;
		var start = end - 3600000;
		var raw_url =
		"metric_list?metric="+ this.firstChild.id +
		"&view=value&start_time=" + start +

fnordmetric-webui/fnordmetric-webui-metricpreviewwidget.js

+48 −29

Original line number	Diff line number	Diff line
		@@ -21,21 +21,18 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		var metric = query_params.innerViewValue;
		var table_container = document.createElement("div");
		var chart_container = document.createElement("div");
		var load_pane = document.createElement("div");
		var now = Date.now();
		var columns = [];
		var elems = {};


		var defaults = {
		view : "value",
		columns: "",
		end_time : now,
		/* 5 minutes */
		time_to_end : 300000,
		time_to_end : 3600000,
		/* 1 second */
		t_step : 1000,
		t_window : 1000,
		t_step : 10000,
		t_window : 5000,
		by: ""
		}

		@@ -149,30 +146,45 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {

		}

		function updateDateTimeElems(title, input) {
		var start = FnordMetric.util.getDateTimeString(
		getQueryParamOrDefaultValue("start_time"));
		var end = getQueryParamOrDefaultValue("end_time");
		var end_str = FnordMetric.util.getDateTimeString(end);
		function updateDateTimeElems(title, input, start_time, end_time) {
		var start_time = (start_time !== undefined) ?
		start_time : getQueryParamOrDefaultValue("start_time");
		var start_str =
		FnordMetric.util.getDateTimeString(start_time);

		var end_time = (end_time !== undefined) ?
		end_time : getQueryParamOrDefaultValue("end_time");
		var end_str = FnordMetric.util.getDateTimeString(end_time);


		if (input != null) {
		input.value = end_string;
		input.setAttribute("id", end);
		input.value = end_str;
		input.setAttribute("id", end_time);
		}

		title.innerHTML =
		start + " — " + end_str;
		start_str + " — " + end_str;
		}

		function onDateSubmit(ts) {
		var start =
		ts - getQueryParamOrDefault(time_to_end);
		updateURLParams("end_time", ts);
		updateURLParams("start_time", start);

		function onDateSubmit(timestamp) {
		var timestamp = parseInt(timestamp, 10);
		var start_time =
		parseInt(getQueryParamOrDefaultValue("start_time"), 10);
		var end_time =
		parseInt(getQueryParamOrDefaultValue("end_time"), 10);

		start_time = timestamp - (end_time - start_time);
		updateURLParams("end_time", timestamp);
		updateURLParams("start_time", start_time);

		runQuery();
		updateDateTimeElems(elems.timespan_title, null);

		//FIXME is it better to make the title elem accessible?
		var title = elem.querySelector(".current_date");
		updateDateTimeElems(title, null, start_time, timestamp);
		}


		function initElems() {
		var initial_timespan;
		var group_buttons = [];
		@@ -424,7 +436,8 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		start_time =
		end_time - FnordMetric.util.toMilliSeconds(this.value);
		updateURLParams("start_time", start_time);
		updateDateTimeElems(timespan_title, null);
		updateDateTimeElems(
		timespan_title, null, start_time, end_time);
		runQuery();
		}, false);

		@@ -436,19 +449,25 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
		start_time = start_time - diff;
		updateURLParams("end_time", end_time);
		updateURLParams("start_time", start_time);
		updateDateTimeElems(timespan_title, elems.date);
		updateDateTimeElems(
		timespan_title, datepicker, start_time, end_time);
		runQuery();
		}, false);

		next_timespan.addEventListener('click', function(e) {
		e.preventDefault();
		var start = start_time;
		var end = parseInt(end_time ,10) + (end_time - start);

		if (end <= now) {
		start_time = end_time;
		end_time = parseInt(end_time ,10) + (end_time - start);
		end_time = end;
		updateURLParams("start_time", start_time);
		updateURLParams("end_time", end_time);
		updateDateTimeElems(timespan_title, elems.date);
		updateDateTimeElems(
		timespan_title, datepicker, start_time, end_time);
		runQuery();
		}
		}, false);

fnordmetric-webui/fnordmetric-webui-util.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ FnordMetric.util.parseMilliTS = function(ts) {
		return (ts + (ts == 1? " minute" : " minutes"));
		}

		ts = ts / 360000;
		ts = ts / 3600000;
		return (ts + (ts == 1? " hour" : " hours"));
		}

Admin message