X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=raspberry-kiosk%2Fkiosk.js;h=e9d4b6c65b8397434bb1f1b74c8bbd08daac92dd;hb=9b57ad36fa772a94f8f38321a88f2b1df1818a51;hp=da4df7704576bf948524ca9594a13df7b83aa265;hpb=a5a4ac7a8733c31c14065230127c7836ac0de4f6;p=svn42.git diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js index da4df77..e9d4b6c 100644 --- a/raspberry-kiosk/kiosk.js +++ b/raspberry-kiosk/kiosk.js @@ -30,7 +30,7 @@ function writeGooglePlusEvents(data, elem) noteimgs.push(attach[a].thumbnails[t].image.url); } } - else if ( attach[a].objectType == "photo") + else if ( attach[a].objectType == "photo" || attach[a].objectType == "video") { noteimgs.push(attach[a].image.url); } @@ -107,9 +107,8 @@ function weekday2str(dow) return ""; } -function writeCalendar(data, elem) +function calendarItemEnhancer(data) { - var calhtml = ""; for (var s=0; s'+data[s].title+''+"\n"; + data[s].when = when } - elem.innerHTML=''; + return data } -function loadCalendar() + +function loadCalendarKiosk() +{ + var calcontainer=document.getElementById("grical_upcoming_kiosk"); + $.getJSON('/shmcache/grical_realraum.json', function(data){ + var calhtml = ""; + $.each(calendarItemEnhancer(data), function(index, itm) { + calhtml += '
  • '+itm.when+' - '+itm.title+'
  • '+"\n"; + }); + calcontainer.innerHTML=''; + }); +} + +function loadCalendarMainPage() { //old URI: //grical.realraum.at/s/?query=!realraum&limit=9&view=json var calcontainer=document.getElementById("grical_upcoming"); $.getJSON('/shmcache/grical_realraum.json', function(data){ - writeCalendar(data, calcontainer); + var calhtml = ""; + $.each(calendarItemEnhancer(data), function(index, itm) { + calhtml += '
  • '+itm.when+' - '+itm.title+'
  • '+"\n"; + }); + calcontainer.innerHTML=''; }); } + function writeAnwesenheitStatus(data) { var html=""; @@ -163,10 +180,18 @@ function writeAnwesenheitStatus(data) iconuri=data.icon.closed; statuscolor="red"; } - html='
    '+data.status+'
    '; - document.getElementById('anwesenheit_status').innerHTML=html; - -if (data.sensors) + var anwesenheit_status_kiosk = document.getElementById('anwesenheit_status_kiosk'); + var anwesenheit_status_frontpage = document.getElementById('anwesenheit_status'); + if (anwesenheit_status_kiosk) + { + anwesenheit_status_kiosk.innerHTML='
    '+data.status+'
    '; + } + if (anwesenheit_status_frontpage) + { + anwesenheit_status_frontpage.innerHTML='
    '+data.status+'
    '; + } + + if (data.sensors) { if (data.sensors.temperature) { @@ -232,19 +257,6 @@ function updateAnwesenheitStatus() var jqxhr = $.getJSON(url, writeAnwesenheitStatus); } -$(document).ready(function() -{ - updateDateClock(new Date()); - setInterval("clock()", 500); - updateAnwesenheitStatus(); - loadCalendar(); - loadGooglePlusEvents(); - setInterval("updateAnwesenheitStatus()", 10*1000); - setInterval("loadCalendar()", 123*1000); - setInterval("updateSensors()",145*1000); - setInterval("loadGooglePlusEvents()", 1207*1000); -}); - function updateDateClock(now) { var daynames = new Array('So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'); @@ -334,3 +346,33 @@ function reloadImg(element) } element.src = img_orig_src[element.id] + "?dt="+Math.floor(new Date().getTime() / 1000).toString(); } + +$(document).ready(function() +{ + updateAnwesenheitStatus(); + setInterval("updateAnwesenheitStatus()", 10*1000); + if (document.getElementById("dateclock")) + { + updateDateClock(new Date()); + setInterval("clock()", 500); + } + if (document.getElementById("grical_upcoming_kiosk")) + { + loadCalendarKiosk(); + setInterval("loadCalendarKiosk()", 123*1000); + } + if (document.getElementById("grical_upcoming")) + { + loadCalendarMainPage(); + setInterval("loadCalendarMainPage()", 123*1000); + } + if (document.getElementById("sensorgraphs")) + { + setInterval("updateSensors()",145*1000); + } + if (document.getElementById("gplusevents")) + { + loadGooglePlusEvents(); + setInterval("loadGooglePlusEvents()", 1207*1000); + } +});