X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=raspberry-kiosk%2Fkiosk.js;h=d506e1e27aa920fb92f50b78436914de45879f5e;hb=9148b190d80a15e5393f7ef8c5bd6997c4b40bb2;hp=827861f864f3624f4769016ad51793b25db58a54;hpb=1fd2e2eaf515f15a1a38a59d4259edf920b33c5d;p=svn42.git diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js index 827861f..d506e1e 100644 --- a/raspberry-kiosk/kiosk.js +++ b/raspberry-kiosk/kiosk.js @@ -44,7 +44,7 @@ function writeGooglePlusEvents(data, elem) ghtml += '

'+item.updated.substring(0,16).replace("T"," ")+'

'; ghtml += '

'+notetxt+'

'; if (noteimgs.length>0) - { + { var bigimglimit; ghtml += ''; if (noteimgs.length > 3) @@ -145,7 +145,7 @@ function loadCalendarKiosk() $.getJSON('/shmcache/grical_realraum.json', function(data){ var calhtml = ""; $.each(calendarItemEnhancer(data), function(index, itm) { - calhtml += '
  • '+itm.when+' - '+itm.title+'
  • '+"\n"; + calhtml += '
  • '+itm.when+' - '+itm.title+'
  • '+"\n"; }); calcontainer.innerHTML=''; }); @@ -164,19 +164,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
    '+data.status+'
    '; } - + if (data.sensors) { if (data.sensors.temperature) @@ -251,7 +289,7 @@ function writeAnwesenheitStatus(data) }); sensorstd+=''; - } + } if (sensorstd != "") { sensorshtml=''+sensorstd+'
    '; @@ -289,7 +327,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 +402,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 +418,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")) {