= sisize[i][0]) { siid=sisize[i][1]; num=num/sisize[i][0]; break;}
+
+ }
+ return (Math.round(num*10)/10)+siid+unit;
+}
function writeAnwesenheitStatus(data)
{
@@ -182,15 +253,23 @@ function writeAnwesenheitStatus(data)
}
var anwesenheit_status_kiosk = document.getElementById('anwesenheit_status_kiosk');
var anwesenheit_status_frontpage = document.getElementById('anwesenheit_status');
+ var statusage = parseInt((new Date()).getTime()/1000) - data.lastchange;
+ var statusagestatus = "";
+ if (statusage > 600)
+ {
+ //var statusagestatus = ' | Status older than ' + siNumberString(statusage,"s") + ' |
';
+ var statusagestatus = '
Status older than ' + siNumberString(statusage,"s") + '
';
+ }
if (anwesenheit_status_kiosk)
{
anwesenheit_status_kiosk.innerHTML=' | | '+data.status+' |
';
}
if (anwesenheit_status_frontpage)
{
- anwesenheit_status_frontpage.innerHTML=' | | '+data.status+' |
';
+ //anwesenheit_status_frontpage.innerHTML=' | | '+data.status+' |
'+statusagestatus+'
';
+ anwesenheit_status_frontpage.innerHTML=' | | '+data.status+statusagestatus+' |
';
}
-
+
if (data.sensors)
{
if (data.sensors.temperature)
@@ -198,6 +277,7 @@ function writeAnwesenheitStatus(data)
sensorstd+='Temperatur';
$.each( data.sensors.temperature, function(s, sensorobj) {
sensorstd+=' '+sensorobj.location+': '+sensorobj.value.toFixed(2)+sensorobj.unit;
+ drawGauge(document.getElementById('tempgauge'), "Temp "+sensorobj.location, sensorobj.value, {redFrom: 33, redTo: 40, yellowFrom:29, yellowTo: 33, minorTicks: 4, min:0, max:40});
});
sensorstd+=' | ';
}
@@ -206,6 +286,7 @@ function writeAnwesenheitStatus(data)
sensorstd+='Licht';
$.each( data.sensors.ext_illumination, function(s, sensorobj) {
sensorstd+=' '+sensorobj.location+': '+sensorobj.value;
+ drawGauge(document.getElementById('lightgauge'), "Licht "+sensorobj.location, sensorobj.value, {redFrom: 950, redTo: 1024,yellowFrom:0, yellowTo: 200,minorTicks: 4, min:0, max:1024});
});
sensorstd+=' | ';
}
@@ -237,7 +318,7 @@ function writeAnwesenheitStatus(data)
});
sensorstd+='';
- }
+ }
if (sensorstd != "")
{
sensorshtml='';
@@ -275,7 +356,7 @@ function highlightEntry(idx, color, value)
if(value == 0) {
if(idx%2 == 0)
$('#upnext' + idx).css('background-color', 'white');
- else
+ else
$('#upnext' + idx).css('background-color', '#E0E0E0');
} else {
$('#upnext' + idx).css('background-color', color);
@@ -350,7 +431,7 @@ function reloadImg(element)
$(document).ready(function()
{
updateAnwesenheitStatus();
- setInterval("updateAnwesenheitStatus()", 10*1000);
+ setInterval("updateAnwesenheitStatus()", 10*1000);
if (document.getElementById("dateclock"))
{
updateDateClock(new Date());
@@ -366,9 +447,14 @@ $(document).ready(function()
loadCalendarMainPage();
setInterval("loadCalendarMainPage()", 123*1000);
}
- if (document.getElementById("sensorgraphs"))
+// if (document.getElementById("sensorgraphs"))
+// {
+// setInterval("updateSensors()",145*1000);
+// }
+ if (document.getElementById("tempgooglegraph") || document.getElementById("lightgooglegraph") || document.getElementById("movementgooglegraph"))
{
- setInterval("updateSensors()",145*1000);
+ loadAndDrawSensorData();
+ setInterval("loadAndDrawSensorData()",145*1000);
}
if (document.getElementById("gplusevents"))
{