X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=templates%2Findex.html.ep;h=443408d92e71fd8f0df349be51915cbb2afb27b1;hb=6dfcac9f39721c08bf81c82847d872d46f28f19c;hp=e5a7c09276fb48fadd8f9a014a30096afc3b0b12;hpb=6e03f8c08e990182830f8a8d9b240445af94a55a;p=dweather.git

diff --git a/templates/index.html.ep b/templates/index.html.ep
index e5a7c09..443408d 100644
--- a/templates/index.html.ep
+++ b/templates/index.html.ep
@@ -30,6 +30,13 @@
 
 		var h = new Object();
 
+		var trans = {
+			"Wind" : function (speed) { return (speed * 2.236936).toFixed(1); },
+			"Wind_1m" : function (speed) { return (speed * 2.236936).toFixed(1); },
+			"Wind_Max": function (speed) { return (speed * 2.236936).toFixed(1); }
+		};
+			
+
 		function do_debug(text) {
 			document.getElementById("do_debug").innerHTML = text;
 		}
@@ -41,7 +48,12 @@
 		function fill_html(key,value) {
 			var d = document.getElementById(key);
 			if (d !== null) {
-				d.innerHTML = value;
+				var f = trans[key];
+				if (f && typeof(f) === "function") {
+					d.innerHTML = trans[key](value);
+				} else {
+					d.innerHTML = value;
+				}
 			}
 		}
 
@@ -624,17 +636,20 @@
 			var rainfall = daychart.series[0].data.length > (days * 48);
 			var pressure = daychart.series[1].data.length > (days * 48);
 			var temp = daychart.series[2].data.length > (days * 48);
+			var humidity = daychart.series[3].data.length > (days * 48);
 
 			var hr = js.h;
 			var t = js.t * 1000;
 			var ra = [t, hr.Rain_1h];
 			var pr = [t, hr.Pressure];
 			var te = [t, hr.Temp_Out];
+			var hu = [t, hr.Humidity_Out];
 				
 //			do_debug(js.tm + " " + t + " " + te + "<br>"); 
 			daychart.series[0].addPoint(ra, true, rainfall);
 			daychart.series[1].addPoint(pr, true, pressure);
 			daychart.series[2].addPoint(te, true, temp);
+			daychart.series[3].addPoint(hu, true, humidity);
 		}
 
 		var conv = 2.23694;
@@ -688,36 +703,36 @@
 				<br><br>
 				<table class="table">
 					<tr>
-						<th>Time:</th><td><span id="tm"> </span></td>
-						<th>Sunrise:</th><td><span id="Sunrise"> </span></td>
-						<th>Sunset:</th><td><span id="Sunset"> </span></td>
-						<th>Console Volts:</th><td><span id="Batt_Console"> </span></td>
-						<th>TX Battery OK:</th><td><span id="Batt_TX_OK"> </span></td>
+						<th width="7%">Time:</th><td width="7%"><span id="tm"> </span></td>
+						<th width="7%">Sunrise:</th><td width="7%"><span id="Sunrise"> </span></td>
+						<th width="7%">Sunset:</th><td width="7%"><span id="Sunset"> </span></td>
+						<th width="7%">Console Volts:</th><td width="7%"><span id="Batt_Console"> </span></td>
+						<th width="7%">TX Battery OK:</th><td width="7%"><span id="Batt_TX_OK"> </span></td>
 					</tr>
 					<tr>
-						<th>Pressure:</th><td><span id="Pressure"> </span></td>
+						<th>Pressure:</th><td><span id="Pressure"> </span> mb</td>
 						<th>Trend:</th><td><span id="Pressure_Trend_txt"> </span></td>
 					</tr>
 					<tr>
-						<th>Temperature in:</th><td> <span id="Temp_In"> </span></td>
-						<th>Humidity:</th><td> <span id="Humidity_In"> </span></td>
+						<th>Temperature in:</th><td> <span id="Temp_In"> </span> °C</td>
+						<th>Humidity:</th><td> <span id="Humidity_In"> </span> %</td>
 					</tr>
-					<tr><th>Temperature out:</th><td> <span id="Temp_Out"> </span></td>
-						<th>Min:</th><td> <span id="Temp_Out_Min"> </span> @ <span id="Temp_Out_Min_T"> </span></td>
-						<th>Max:</th><td> <span id="Temp_Out_Max"> </span> @ <span id="Temp_Out_Max_T"> </span></td>
-						<th>Humidity:</th><td> <span id="Humidity_Out"> </span></td>
-						<th>Dew Point:</th><td> <span id="Dew_Point"> </span></td>
+					<tr><th>Temperature out:</th><td> <span id="Temp_Out"> </span> °C</td>
+						<th>Min:</th><td> <span id="Temp_Out_Min"> </span> °C @ <span id="Temp_Out_Min_T"> </span></td>
+						<th>Max:</th><td> <span id="Temp_Out_Max"> </span> °C @ <span id="Temp_Out_Max_T"> </span></td>
+						<th>Humidity:</th><td> <span id="Humidity_Out"> </span> %</td>
+						<th>Dew Point:</th><td> <span id="Dew_Point"> </span> °C</td>
 					</tr>
-					<tr><th>Wind:</th><td><span id="Wind"> </span> m/s @ <span id="Dir"> </span> deg</td>
-						<th>Wind Dir Minute Avg:</th><td> <span id="Dir_1m">  </span></td>
-						<th>Wind Speed Minute Avg:</th><td> <span id="Wind_1m">  </span></td>
+					<tr><th>Wind:</th><td><span id="Dir"> </span> ° @ <span id="Wind"> </span> mph</td>
+						<th>Wind Minute Avg:</th><td> <span id="Dir_1m"> </span> ° @ <span id="Wind_1m"> </span> mph </td>
+						<th>Day Max Speed:</th><td> <span id="Wind_Max"> </span> mph @ <span id="Wind_Max_T"> </span></td>
 					</tr>
 					<tr>
-						<th>Rain 30mins:</th><td> <span id="Rain_1h"> </span></td>
-						<th>Day:</th><td> <span id="Rain_Day"> </span></td>
-						<th>24hrs:</th><td> <span id="Rain_24h"> </span></td>
-						<th>Month:</th><td> <span id="Rain_Month"> </span></td>
-						<th>Year:</th><td> <span id="Rain_Year"> </span></td>
+						<th>Rain 30mins:</th><td> <span id="Rain_1h"> </span> mm</td>
+						<th>Day:</th><td> <span id="Rain_Day"> </span> mm</td>
+						<th>24hrs:</th><td> <span id="Rain_24h"> </span> mm</td>
+						<th>Month:</th><td> <span id="Rain_Month"> </span> mm</td>
+						<th>Year:</th><td> <span id="Rain_Year"> </span> mm</td>
 					</tr>
 				</table>
 			</div>