X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=raspberry-kiosk%2Fkiosk.js;h=edbef059ff54cf6aa4d7149b4a39fe6422edafd1;hb=2acf320899ee18e6fb7e86bd7c5d6e959fec26bd;hp=d453cda77365277c6a4944c83878251098a9151f;hpb=d305767f69ed6aebf3cd1ccc8e2bf9746a63d822;p=svn42.git
diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js
index d453cda..edbef05 100644
--- a/raspberry-kiosk/kiosk.js
+++ b/raspberry-kiosk/kiosk.js
@@ -1,24 +1,38 @@
+function min(a,b)
+{
+ if (a > b)
+ return b;
+ else
+ return a;
+}
+
function writeGooglePlusEvents(data, elem)
{
var ghtml = "";
+ //var gplusimgwidth = parseInt($('
'
ghtml += ''+item.updated.substring(0,16).replace("T"," ")+'
';
ghtml += ''+notetxt+'
';
- if (noteimg)
- {
- ghtml += '';
+ if (noteimgs.length>0)
+ {
+ var bigimglimit;
+ ghtml += '';
+ if (noteimgs.length > 3)
+ {
+ var gplusimgmaxwidth = gplusimgwidth - (minimgwidth * ((noteimgs.length -1) / 3));
+ bigimglimit = "max-height:"+(minimgwidth*3)+"px; max-width:"+gplusimgmaxwidth+"px;"
+ ghtml += ' | ';
+ for (var ni=1; ni';
+ var niimax = min(noteimgs.length, ni+3);
+ for (var nii=ni; nii
';
+ }
+ ghtml += '';
+ }
+ }
+ else
+ {
+ var gplusimgmaxwidth = gplusimgwidth / noteimgs.length;
+ bigimglimit = "max-width:"+gplusimgmaxwidth+"px;"
+ for (var ni=0; ni';
+ }
+ }
+ ghtml += '
';
}
ghtml += '';
}
@@ -49,6 +90,22 @@ function loadGooglePlusEvents()
});
}
+function weekday2str(dow)
+{
+ var weekday=new Array(7);
+ weekday[0]="So";
+ weekday[1]="Mo";
+ weekday[2]="Di";
+ weekday[3]="Mi";
+ weekday[4]="Do";
+ weekday[5]="Fr";
+ weekday[6]="Sa";
+ weekday[7]="So";
+ if (dow >=0 && dow <=7)
+ return weekday[dow];
+ else
+ return "";
+}
function writeCalendar(data, elem)
{
@@ -63,13 +120,20 @@ function writeCalendar(data, elem)
}
else
{
+ var weekday = weekday2str((new Date(dt)).getDay());
var stime = data[s].starttime;
+ var month = data[s].start.substring(5,7);
+ if (month[0] == '0')
+ month = month[1];
+ var dayofmonth = data[s].start.substring(8,10);
+ if (dayofmonth[0] == '0')
+ dayofmonth = dayofmonth[1];
while (stime.substring(stime.length-3,stime.length) == ":00")
{
stime=stime.substring(0,stime.length-3);
}
if (stime.length <= 2) { stime+="h"; }
- when = data[s].start.substring(8,10)+"."+data[s].start.substring(5,7) +", "+stime;
+ when = weekday + " " + dayofmonth+"."+month +", "+stime;
}
calhtml += ''+when+' - '+data[s].title+''+"\n";
}
@@ -130,18 +194,6 @@ function updateAnwesenheitStatus()
//req.send(null);
var jqxhr = $.getJSON(url, writeAnwesenheitStatus);
}
-var anwesenheit_timer = window.setInterval("updateAnwesenheitStatus()", 10000);
-
-function updateSensors()
-{
- reloadImg(document.getElementById("tempsensor"));
- reloadImg(document.getElementById("movementsensor"));
- reloadImg(document.getElementById("lightsensor"));
-}
-
-var timer;
-var seconds = 0;
-var schedule = Array()
$(document).ready(function()
{
@@ -150,9 +202,9 @@ $(document).ready(function()
updateAnwesenheitStatus();
loadCalendar();
loadGooglePlusEvents();
- setInterval("updateAnwesenheitStatus()", 10000);
+ setInterval("updateAnwesenheitStatus()", 10*1000);
setInterval("loadCalendar()", 123*1000);
- setInterval("updateSensors()",125*1000);
+ setInterval("updateSensors()",145*1000);
setInterval("loadGooglePlusEvents()", 1207*1000);
});
@@ -181,7 +233,7 @@ function highlightEntry(idx, color, value)
}
}
-
+var seconds = 0;
function clock(now)
{
var now = new Date(new Date().valueOf() + 300);
@@ -192,39 +244,56 @@ function clock(now)
}
}
-//function updateSchedule()
-//{
-// $.ajax({type: "GET", url: "/export/schedules.php", data: "days=3&start=-1", dataType: "xml", error: showError, success: parseXml});
-//}
-
function showError(XMLHttpRequest, textStatus, errorThrown)
{
alert("Error: " + textStatus);
}
+function updateSensors()
+{
+ reloadImg(document.getElementById("tempsensor"));
+ reloadImg(document.getElementById("movementsensor"));
+ reloadImg(document.getElementById("lightsensor"));
+}
+
function IsImageOk(img) {
- if (!img.complete) {
+ if (!img.complete)
+ {
return false;
}
- if (typeof img.naturalWidth != "undefined" && img.naturalWidth == 0) {
+ if (typeof img.naturalWidth == "undefined" || (typeof img.naturalWidth == "number" && img.naturalWidth == 0))
+ {
return false;
}
return true;
}
+var img_orig_src = {};
+function reloadImgAlt(element)
+{
+ if(element.complete)
+ {
+ var new_image = new Image();
+ //set up the new image
+ new_image.id = element.id;
+ new_image.className = element.className;
+ if (! img_orig_src[element.id])
+ {
+ img_orig_src[element.id] = element.src;
+ }
+ new_image.src = img_orig_src[element.id] + "?dt="+Math.floor(new Date().getTime() / 1000).toString();
+ if (IsImageOk(new_image))
+ {
+ element.parentNode.insertBefore(new_image,element);
+ element.parentNode.removeChild(element);
+ }
+ }
+}
function reloadImg(element)
{
- //var image = document.getElementById("theText");
- if(element.complete) {
- var new_image = new Image();
- //set up the new image
- new_image.id = element.id;
- new_image.className = element.className;
- new_image.src = element.src;
- if (IsImageOk(new_image))
- {
- element.parentNode.insertBefore(new_image,element);
- element.parentNode.removeChild(element);
- }
+ if (! img_orig_src[element.id])
+ {
+ img_orig_src[element.id] = element.src;
}
+ element.src = img_orig_src[element.id] + "?dt="+Math.floor(new Date().getTime() / 1000).toString();
}