X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=raspberry-kiosk%2Fkiosk.js;h=cb3c3c4e5c05664aec28bb54ec5083b97532b726;hb=51c1575c1ed3eeee6099bc1b4760a4ebc75ac876;hp=d453cda77365277c6a4944c83878251098a9151f;hpb=d305767f69ed6aebf3cd1ccc8e2bf9746a63d822;p=svn42.git

diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js
index d453cda..cb3c3c4 100644
--- a/raspberry-kiosk/kiosk.js
+++ b/raspberry-kiosk/kiosk.js
@@ -7,18 +7,21 @@ function writeGooglePlusEvents(data, elem)
     var noteobj = item.object;
     var attach = noteobj.attachments;
     var notetxt = noteobj.content;
-    var noteimg = false;
+    var noteimgs = new Array();
     if (attach)
     {
       for (var a=0; a<attach.length; a++)
       {
         if ( attach[a].objectType == "album")
         {
-          noteimg = attach[a].thumbnails[0].image.url;
+          for (var t=0; t<attach[a].thumbnails.length; t++)
+          {
+            noteimgs.push(attach[a].thumbnails[t].image.url);
+          }
         }
         else if ( attach[a].objectType == "photo")
         {
-          noteimg = attach[a].image.url;
+          noteimgs.push(attach[a].image.url);
         }
         else if (attach[a].objectType == "event")
         {
@@ -29,9 +32,14 @@ function writeGooglePlusEvents(data, elem)
     ghtml += '<div class="gpluspost">'
     ghtml += '<img class="gplusactor" src="'+item.actor.image.url+'"/><p class="gplustimestamp">'+item.updated.substring(0,16).replace("T"," ")+'</p>';
     ghtml += '<p class="gplustxt">'+notetxt+'</p>';
-    if (noteimg)
+    if (noteimgs.length>0)
     {
-      ghtml += '<p class="gplusimg"><img class="gplusimg" src="'+noteimg+'"/></p>';
+      ghtml += '<table class="gplusimg" cellspacing="0"><tr>';
+      for (var ni=0; ni<noteimgs.length; ni++)
+      {
+        ghtml += '<td><img class="gplusimg" src="'+noteimgs[ni]+'"/></td>';
+      }
+      ghtml += '</tr></table>';
     }
     ghtml += '</div>';
   }
@@ -49,6 +57,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 +87,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 += '<li class="level1">'+when+' - <span class="r3red">'+data[s].title+'</span></li>'+"\n";
     }
@@ -130,18 +161,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 +169,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 +200,7 @@ function highlightEntry(idx, color, value)
   }
 }
 
-
+var seconds = 0;
 function clock(now)
 {
   var now = new Date(new Date().valueOf() + 300);
@@ -192,39 +211,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();
 }