- Issue #45

- Serie options moved to the js
- On empty charts, hide legends and set the correct date to hide the point.

src/psm/Util/Server/HistoryGraph.class.php

@@ -130,7 +130,7 @@ class HistoryGraph {
 			'latency_avg' => count($uptimes) > 0 ? round(($latency_avg / count($uptimes)), 4) : 0,
 			'server_lines'	=> sizeof($lines) ? '[' . implode(',', $lines) . ']' : '',
 			'server_down'	=> sizeof($down) ? '[' . implode(',', $down) . ']' : '',
-			'series' => "[{label: '".psm_get_lang('servers', 'latency')."', lineWidth: 1}]",
+			'series' => "[{label: '".psm_get_lang('servers', 'latency')."'}]",
 			'plotmode' => 'hour',
 			'buttons' => $buttons,
 			'chart_id' => $server_id . '_uptime',
@@ -194,13 +194,13 @@ class HistoryGraph {
 				continue;
 			}
 			$lines_merged[] = '[' . implode(',', $line_value) . ']';
-			$series[] = "{label: '".psm_get_lang('servers', $line_key)."', lineWidth: 1}";
+			$series[] = "{label: '".psm_get_lang('servers', $line_key)."'}";
 		}
 		if($last_date) {
 			$down[] = '[' . $last_date . ',0]';
 		}
 		$buttons = array();
-		$buttons[] = array('mode' => 'week', 'label' => psm_get_lang('servers', 'week'));
+		$buttons[] = array('mode' => 'week2', 'label' => psm_get_lang('servers', 'week'));
 		$buttons[] = array('mode' => 'month', 'label' => psm_get_lang('servers', 'month'), 'class_active' => 'btn-info');
 		$buttons[] = array('mode' => 'year', 'label' => psm_get_lang('servers', 'year'));
 
@@ -211,7 +211,7 @@ class HistoryGraph {
 			'server_down'	=> sizeof($down) ? '[' . implode(',', $down) . ']' : '',
 			'series' => sizeof($series) ? '[' . implode(',', $series) . ']' : '',
 			'plotmode' => 'month',
-			'end_timestamp' => $time_end,
+			'end_timestamp' => $time_end ? $time_end : '',
 			'buttons' => $buttons,
 			// make sure to add chart id after buttons so its added to those tmeplates as well
 			'chart_id' => $server_id . '_history',

static/js/history.js

@@ -51,6 +51,8 @@ function create_plot($this, mode)
 	mode = mode || $this.attr('data-plotMode') || 'hour';
 	$this.attr('data-plotMode', mode);
 	var timeStamp, tickFormat;
+	var showMarker = false;
+	var showLegend = true;
 	switch(mode)
 	{
 		case 'year':
@@ -62,8 +64,10 @@ function create_plot($this, mode)
 			tickFormat = day_format;
 			break;
 		case 'week':
+		case 'week2':
 			timeStamp = 1000 * 60 * 60 * 24 * 7;
 			tickFormat = short_date_format;
+			showMarker = (mode == 'week2');
 			break;
 		case 'day':
 			timeStamp = 1000 * 60 * 60 *24;
@@ -71,12 +75,12 @@ function create_plot($this, mode)
 			break;
 		case 'hour':
 		default:
+			showMarker = true;
 			timeStamp = 1000 * 60 * 60;
 			tickFormat = short_time_format;
 			break;
 	}
 
-
 	var downArray = new Array();
 	var down = $this.attr('data-down');
 	if(down) {
@@ -98,11 +102,27 @@ function create_plot($this, mode)
 		}
 	}
 
+	var series = eval($this.attr('data-series'));
+	if(Array.isArray(series)) {
+		for (var i=0; i<series.length; i++)
+		{
+			$.extend(true, series[i], {
+				markerOptions: {
+					show: showMarker
+				},
+				lineWidth: 1
+			});
+		}
+	} else {
+		series = [{}];
+		showLegend = false;
+	}
+
 	plot = $.jqplot($this.attr('id'), lines, {
 		title: $this.attr('data-title'),
-        series: eval($this.attr('data-series')),
+        series: series,
 		legend: {
-			show: true,
+			show: showLegend,
 			placement: 'insideGrid',
 			location: 'nw'
 		},