X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=raspberry-kiosk%2Fkiosk.js;h=0c90e4ed720ce0981dd838402519896e7c87f32b;hb=7867988775a7b6ec1604a863b665e46ac91e70ac;hp=db879b5ea058460248c6da3be60b6c406db2db5d;hpb=4ad8d086222b54bf878f851583ffd4d877c7b79e;p=svn42.git

diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js
index db879b5..0c90e4e 100644
--- a/raspberry-kiosk/kiosk.js
+++ b/raspberry-kiosk/kiosk.js
@@ -1,6 +1,17 @@
+function min(a,b)
+{
+	if (a > b)
+		return b;
+	else
+		return a;
+}
+
 function writeGooglePlusEvents(data, elem)
 {
   var ghtml = "";
+  //var gplusimgwidth = parseInt($('<table class="gplusimg" />').css("width"));
+  var gplusimgwidth = 495;
+  var minimgwidth=78;
   for (var i=0; i< data.items.length; i++)
   {
     var item = data.items[i];
@@ -33,11 +44,33 @@ function writeGooglePlusEvents(data, elem)
     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 (noteimgs.length>0)
-    {
+    { 
+      var bigimglimit;
       ghtml += '<table class="gplusimg" cellspacing="0"><tr>';
-      for (var ni=0; ni<noteimgs.length; ni++)
+      if (noteimgs.length > 3)
       {
-        ghtml += '<td><img class="gplusimg" src="'+noteimgs[ni]+'"/></td>';
+              var gplusimgmaxwidth = gplusimgwidth - (minimgwidth * ((noteimgs.length -1) / 3));
+	      bigimglimit = "max-height:"+(minimgwidth*3)+"px; max-width:"+gplusimgmaxwidth+"px;"
+	      ghtml += '<td><img class="gplusimg" style="'+bigimglimit+'" src="'+noteimgs[0]+'"/></td>';
+	      for (var ni=1; ni<noteimgs.length; ni+=3)
+	      {
+		  ghtml += '<td>';
+		  var niimax = min(noteimgs.length, ni+3);
+		  for (var nii=ni; nii<niimax; nii++)
+		  {
+			ghtml += '<img class="gplusimg" style="max-width:'+minimgwidth+'px; max-height:'+minimgwidth+'px;" src="'+noteimgs[nii]+'"/><br/>';
+		  }
+	          ghtml += '</td>';
+             }
+      }
+      else
+      {
+             var gplusimgmaxwidth = gplusimgwidth / noteimgs.length;
+	     bigimglimit = "max-width:"+gplusimgmaxwidth+"px;"
+             for (var ni=0; ni<noteimgs.length; ni++)
+	     {
+		ghtml += '<td><img class="gplusimg" style="'+bigimglimit+'" src="'+noteimgs[ni]+'"/></td>';
+	     }
       }
       ghtml += '</tr></table>';
     }
@@ -135,20 +168,47 @@ function writeAnwesenheitStatus(data)
 
   if (data.sensors)
   {
-    for (var s=0; s<data.sensors.length;s++)
+    if (data.sensors.temperature)
     {
-      $.each( data.sensors[s], function(stype, std){
-        $.each( std, function(swhere, svalue){
-           sensorstd+='<td class="sensorstatus"><b>'+stype+'</b><br/>'+swhere+': '+svalue+'</td>';
-        });
+      $.each( data.sensors.temperature, function(s, sensorobj) {
+        sensorstd+='<td style="background-color:white; height:42px; text-align:center; vertical-align:middle; display:table-cell;"><b>Temperatur</b><br/>'+sensorobj.location+': '+sensorobj.value.toFixed(2)+sensorobj.unit+'</td>';
       });
     }
-  }
-  if (sensorstd != "")
-  {
-    sensorshtml='<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr>'+sensorstd+'</tr></table>';
-    document.getElementById('sensor_status').innerHTML=sensorshtml;
-  }
+    if (data.sensors.ext_illumination)
+    {
+      $.each( data.sensors.ext_illumination, function(s, sensorobj) {
+        sensorstd+='<td style="background-color:white; height:42px; text-align:center; vertical-align:middle; display:table-cell;"><b>Licht</b><br/>'+sensorobj.location+': '+sensorobj.value+'</td>';
+      });
+    }
+    if (data.sensors.door_locked)
+    {
+      $.each( data.sensors.door_locked, function(s, sensorobj)  {
+        var lockstatus="Unlocked";
+        if (sensorobj.value) { lockstatus = "Locked"; }
+        sensorstd+='<td style="background-color:white; height:42px; text-align:center; vertical-align:middle; display:table-cell;"><b>Türschloß</b><br/>'+sensorobj.location+': '+lockstatus+'</td>';
+      });
+    }
+    if (data.sensors.ext_door_ajar)
+    {
+      $.each( data.sensors.ext_door_ajar, function(s, sensorobj)  {
+        var lockstatus="Shut";
+        if (sensorobj.value) { lockstatus = "Ajar"; }
+        sensorstd+='<td style="background-color:white; height:42px; text-align:center; vertical-align:middle; display:table-cell;"><b>Türkontakt</b><br/>'+sensorobj.location+': '+lockstatus+'</td>';
+      });
+    }
+    if (data.sensors.ext_dust)
+    {
+      $.each( data.sensors.ext_dust, function(s, sensorobj) {
+        sensorstd+='<td style="background-color:white; height:42px; text-align:center; vertical-align:middle; display:table-cell;"><b>Staub</b><br/>'+sensorobj.location+': '+sensorobj.value+sensorobj.unit+'</td>';
+      });
+
+    }    
+    if (sensorstd != "")
+    {
+      sensorshtml='<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr>'+sensorstd+'</tr></table>';
+      document.getElementById('sensor_status').innerHTML=sensorshtml;
+    }
+  }  
 }
 
 function updateAnwesenheitStatus()
@@ -236,7 +296,7 @@ function IsImageOk(img) {
 }
 
 var img_orig_src = {};
-function reloadImg(element)
+function reloadImgAlt(element)
 {
     if(element.complete)
     {
@@ -256,3 +316,11 @@ function reloadImg(element)
       }
     }
 }
+function reloadImg(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();
+}