X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;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 + "
");
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 @@
Time: | - | Sunrise: | - | Sunset: | - | Console Volts: | - | TX Battery OK: | + | Time: | + | Sunrise: | + | Sunset: | + | Console Volts: | + | TX Battery OK: | |
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Pressure: | + | Pressure: | mb | Trend: | |||||||||||||||
Temperature in: | - | Humidity: | + | Temperature in: | °C | +Humidity: | % | ||||||||||||
Temperature out: | - | Min: | @ | -Max: | @ | -Humidity: | - | Dew Point: | + | ||||||||||
Temperature out: | °C | +Min: | °C @ | +Max: | °C @ | +Humidity: | % | +Dew Point: | °C | ||||||||||
Wind: | m/s @ deg | -Wind Dir Minute Avg: | - | Wind Speed Minute Avg: | + | ||||||||||||||
Wind: | ° @ mph | +Wind Minute Avg: | ° @ mph | +Day Max Speed: | mph @ | ||||||||||||||
Rain 30mins: | - | Day: | - | 24hrs: | - | Month: | - | Year: | + | Rain 30mins: | mm | +Day: | mm | +24hrs: | mm | +Month: | mm | +Year: | mm |