From 64806710ab9c8dfa3b4fced78641eb5f6b9d282a Mon Sep 17 00:00:00 2001
From: Heikki Hannikainen <hessu@hes.iki.fi>
Date: Wed, 8 Aug 2012 18:24:42 +0000
Subject: [PATCH] web: Show error messages when status.json or counterdata
 downloads fail. Automatically update the graph every 60 seconds. Fixed
 fixed-point floating point rounding for negative rates.

git-svn-id: http://repo.ham.fi/svn/aprsc/trunk@615 3ce903b1-3385-4e86-93cd-f9a4a239f7ac
---
 src/web/aprsc.css  | 22 ++++++++++++++++++
 src/web/aprsc.js   | 58 ++++++++++++++++++++++++++++++++++++++++++----
 src/web/index.html |  4 +++-
 3 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/src/web/aprsc.css b/src/web/aprsc.css
index 3accb20..f0cbf8a 100644
--- a/src/web/aprsc.css
+++ b/src/web/aprsc.css
@@ -43,3 +43,25 @@ td.ar {
 	text-align: right;
 }
 
+
+/* message */
+div.msg_e {
+	background-color: #f2d2d2;
+}
+
+div.msg_i {
+	background-color: #ecf581;
+}
+
+div.msg_s {
+	background-color: #c8ffc4;
+}
+
+div.msg_e, div.msg_i, div.msg_s {
+	border: thin solid #bdbdbd;
+	padding: 5px;
+	margin: 5px 25px 5px 0px;
+	border-radius: 5px;
+	width: 450px;
+}
+
diff --git a/src/web/aprsc.js b/src/web/aprsc.js
index 0e55ee8..e092621 100644
--- a/src/web/aprsc.js
+++ b/src/web/aprsc.js
@@ -1,5 +1,15 @@
 <!--
 
+function top_status(c, s)
+{
+	if (!c) {
+		$('#status').hide('fast');
+		return;
+	}
+	
+	$('#status').hide().html('<div class="' + c + '">' + s + '</div>').show('fast');
+}
+
 function isUndefined(v)
 {
 	var undef;
@@ -389,7 +399,8 @@ function calc_rate(key, value, no_s)
 			rate *= -1;
 			prefix = '-';
 		}
-		else if (rate >= 10)
+		
+		if (rate >= 10)
 			rate = rate.toFixed(0);
 		else if (rate >= 1)
 			rate = rate.toFixed(1);
@@ -398,7 +409,7 @@ function calc_rate(key, value, no_s)
 		else if (rate == 0)
 			rate = '0';
 		else
-			rate = rate.toFixed(3);
+			rate = rate.toFixed(2);
 		if (!no_s)
 			rate += '/s';
 		rate = prefix + rate;
@@ -413,9 +424,11 @@ function render(d)
 	if (d['server'] && d['server']['t_now']) {
 		var s = d['server'];
 		
-		if (s['server_id'])
+		if (s['server_id']) {
 			document.title = htmlent(s['server_id']) + ' aprsc status';
-			
+			$('#serverid').html(htmlent(s['server_id']));
+		}
+		
 		if (s['t_now'])
 			$('#upt').html(' at ' + timestr(s['t_now']));
 		
@@ -467,10 +480,25 @@ function update_status()
 		url: '/status.json',
 		dataType: 'json',
 		cache: false,
-		error: function() {
+		timeout: 5000,
+		error: function(jqXHR, stat, errorThrown) {
+			var msg = '';
+			if (stat == 'timeout')
+				msg = 'Status download timed out. Network or server down?';
+			else if (stat == 'error')
+				msg = 'Status download failed with an error. Network or server down?';
+			else
+				msg = 'Status download failed (' + stat + ').';
+				
+			if (errorThrown)
+				msg += '<br />HTTP error: ' + htmlent(errorThrown);
+				
+			top_status('msg_e', msg);
+			
 			setTimeout(function() { update_status(); }, 10000);
 		},
 		success: function(data) {
+			top_status();
 			render(data);
 			setTimeout(function() { update_status(); }, 10000);
 		}
@@ -524,10 +552,18 @@ var graphs = {
 	'dupecheck.uniques_out': { 'label': 'Unique packets/s', 'div' : 60 }
 };
 
+var graph_timer;
+
 function load_graph(k)
 {
 	var d = graphs[k];
 	
+	if (graph_timer) { 
+		clearTimeout(graph_timer);
+		graph_timer = 0;
+	}
+		
+	
 	graph_selected = k;
 	$('.grtd').removeClass('grtd_sel');
 	$('#' + k.replace('.', '_')).addClass('grtd_sel');
@@ -535,8 +571,20 @@ function load_graph(k)
 	$.ajax({
 		url: '/counterdata?' + k,
 		dataType: 'json',
+		timeout: 5000,
 		success: function(data) {
+			top_status();
 			graph_fill(data, d);
+			graph_timer = setTimeout(function() { load_graph(graph_selected); }, 60000);
+		},
+		error: function(jqXHR, stat, errorThrown) {
+			msg = 'Graph data download failed (' + stat + '). Server or network down?';
+			
+			if (errorThrown)
+				msg += '<br />HTTP error: ' + htmlent(errorThrown);
+				
+			top_status('msg_e', msg);
+			graph_timer = setTimeout(function() { load_graph(graph_selected); }, 60000);
 		}
 	});
 }
diff --git a/src/web/index.html b/src/web/index.html
index 67b5811..99a1296 100644
--- a/src/web/index.html
+++ b/src/web/index.html
@@ -12,7 +12,9 @@
 <body>
 
 <div style='float: right;'><img src="/aprsc-logo2.png" /></div>
-<div class="page_title" id="title">aprsc status <span id='upt'></span></div>
+<div class="page_title" id="title"><span id='serverid'></span> aprsc status <span id='upt'></span></div>
+<div id='status'></div>
+
 <h3>Server</h3>
 <table id='server'></table>