X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=raspberry-kiosk%2Fkiosk.js;h=52d84daad44f3e680be97e4543608e821265a485;hb=e2120a0b5c7264a9a741519b52f829d6ade95865;hp=827861f864f3624f4769016ad51793b25db58a54;hpb=1fd2e2eaf515f15a1a38a59d4259edf920b33c5d;p=svn42.git

diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js
index 827861f..52d84da 100644
--- a/raspberry-kiosk/kiosk.js
+++ b/raspberry-kiosk/kiosk.js
@@ -44,7 +44,7 @@ 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>';
       if (noteimgs.length > 3)
@@ -112,27 +112,36 @@ function calendarItemEnhancer(data)
     for (var s=0; s<data.length; s++)
     {
       var when = "";
-      var dt = Date.parse(data[s].start+'T'+data[s].starttime);
-      if (Date.now() > dt)
+      var stime = data[s].starttime;
+      var dt;
+      if (stime) {
+        dt = Date.parse(data[s].start+'T'+data[s].starttime);
+      } else {
+        dt = Date.parse(data[s].start);
+      }
+      if (stime && Date.now() > dt)
       {
         when = "JETZT";
       }
       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) {
+          while (stime.substring(stime.length-3,stime.length) == ":00")
+          {
+            stime=stime.substring(0,stime.length-3);
+          }
+          if (stime.length <= 2) { stime+="h"; }
+          when = weekday + " " + dayofmonth+"."+month +", "+stime;
+        } else {
+          when = weekday + " " + dayofmonth+"."+month;
         }
-        if (stime.length <= 2) { stime+="h"; }
-        when = weekday + " " + dayofmonth+"."+month +", "+stime;
       }
       data[s].when = when
     }
@@ -145,7 +154,7 @@ function loadCalendarKiosk()
   $.getJSON('/shmcache/grical_realraum.json', function(data){
     var calhtml = "";
     $.each(calendarItemEnhancer(data), function(index, itm) {
-      calhtml += '<li class="level1">'+itm.when+' - <span class="r3red">'+itm.title+'</span></li>'+"\n";        
+      calhtml += '<li class="level1">'+itm.when+' - <span class="r3red">'+itm.title+'</span></li>'+"\n";
     });
     calcontainer.innerHTML='<ul>'+calhtml+'</ul>';
   });
@@ -164,19 +173,57 @@ function loadCalendarMainPage()
   });
 }
 
-
+var gauges = {}
 function drawGauge(targetelem, label, temp, options) {
-    var data = google.visualization.arrayToDataTable([["Label", "Value"],[label,temp]]);
     // Create and draw the visualization.
     if (targetelem)
     {
-        options["width"] = targetelem.getAttribute("width");
-        options["height"] = targetelem.getAttribute("height");
-        var chart = new google.visualization.Gauge(targetelem);
-        chart.draw(data, options);
+        var data = google.visualization.arrayToDataTable([["Label", "Value"],[label,temp]]);
+        if (!gauges.hasOwnProperty(targetelem.id)) {
+            gauges[targetelem.id] = new google.visualization.Gauge(targetelem);
+        }
+        gauges[targetelem.id].draw(data, options);
     }
 }
 
+var linecharts = {}
+function drawLineGraph(targetelem, dataarray, options, x_is_epochdate) {
+  if (dataarray && targetelem) {
+    var data;
+    if (x_is_epochdate) {
+      data=new google.visualization.DataTable();
+      data.addColumn('datetime',dataarray[0][0]);
+      for (var c=1; c<dataarray[0].length; c++) {
+        data.addColumn('number',dataarray[0][c]);
+      }
+      for (var r=1; r<dataarray.length; r++) {
+        dataarray[r][0] = new Date(dataarray[r][0]*1000);
+        data.addRow(dataarray[r]);
+      }
+    } else {
+      data = google.visualization.arrayToDataTable(dataarray);
+    }
+    // Create and draw the visualization.
+    options["width"]= targetelem.getAttribute("width");
+    options["height"]=targetelem.getAttribute("height");
+    if (!linecharts.hasOwnProperty(targetelem.id)) {
+      linecharts[targetelem.id] = new google.visualization.LineChart(targetelem);
+    }
+    linecharts[targetelem.id].draw(data, options);
+  }
+}
+
+function loadAndDrawSensorData() {
+  $.getJSON("https://realraum.at/shmcache/r3sensors.json", function(data){
+    drawLineGraph(document.getElementById('tempgooglegraph'), data["TempSensorUpdate"],
+      {curveType: "function", title: 'Temperature Sensors', colors: ['#FF0000','#CC0033','#660000','#CC3333'], vAxis:{viewWindow:{min:15,max:26}, viewWindowMode:"explicit"}, chartArea:{left:32,top:20,width:"88%",height:"78%"}, legend: {position: "none"}} ,true);
+    drawLineGraph(document.getElementById('lightgooglegraph'), data["IlluminationSensorUpdate"],
+        {curveType: "none", title: 'Illumination Sensors', vAxis: {maxValue: 1024, minValue:5}, chartArea:{left:32,top:20,width:"88%",height:"78%"}, legend: {position: "none"}} ,true);
+    drawLineGraph(document.getElementById('movementgooglegraph'), data["MovementSensorUpdate"],
+        {curveType: "function", title: 'Movement Sensors', vAxis: {maxValue: 10, minValue:0,viewWindowMode:"maximized"}, chartArea:{left:32,top:20,width:"88%",height:"78%"}, legend: {position: "none"}} ,true);
+    });
+}
+
 function writeAnwesenheitStatus(data)
 {
   var html="";
@@ -202,7 +249,7 @@ function writeAnwesenheitStatus(data)
   {
     anwesenheit_status_frontpage.innerHTML='<table border="0" cellpadding="0" cellspacing="0" width="100%" height="42"><tr><td style="width:42px;"><img style="float:left;" src="'+iconuri+'" height="42" width="42"/></td><td style="width:4px;"></td><td style="background-color:'+statuscolor+'; height:42px; text-align:center; margin-left:48px; margin-right:auto; font-size:larger; font-weight:bold; vertical-align:middle; display:table-cell;">'+data.status+'</td></tr></table>';
   }
-  
+
   if (data.sensors)
   {
     if (data.sensors.temperature)
@@ -251,7 +298,7 @@ function writeAnwesenheitStatus(data)
       });
       sensorstd+='</td>';
 
-    }    
+    }
     if (sensorstd != "")
     {
       sensorshtml='<table border="0" cellpadding="0" cellspacing="0" width="100%"><tr>'+sensorstd+'</tr></table>';
@@ -289,7 +336,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);
@@ -364,7 +411,7 @@ function reloadImg(element)
 $(document).ready(function()
 {
   updateAnwesenheitStatus();
-  setInterval("updateAnwesenheitStatus()", 10*1000);    
+  setInterval("updateAnwesenheitStatus()", 10*1000);
   if (document.getElementById("dateclock"))
   {
     updateDateClock(new Date());
@@ -380,9 +427,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"))
   {