diff --git a/config/layouts/default.json b/config/layouts/default.json.skel similarity index 91% rename from config/layouts/default.json rename to config/layouts/default.json.skel index 34b5e2c5dd4505e2b8e4805c608d1673aeb3fbe2..cf3e9343b5355e807181570572179d523c780f26 100755 --- a/config/layouts/default.json +++ b/config/layouts/default.json.skel @@ -38,6 +38,10 @@ { "type": "panel", "name": "mensaPlan" + }, + { + "type": "panel", + "name": "lsfView" } ] } diff --git a/panels/lsfView/script.js b/panels/lsfView/script.js index 022458a59cfb86ae9ccc7a39136b343fe5f1c367..27ef8fb788e79b987814e7ea364b81d83fdf011b 100755 --- a/panels/lsfView/script.js +++ b/panels/lsfView/script.js @@ -1,5 +1,12 @@ +var lsfViewJson = null; + this.checkShowCondition = function() { - return 20; + var date = new Date(); + if(date.getHours()%2 == 1 && date.getMinutes() > 44){ + return 120; + } else { + return 0; //Skip Panel + } } this.show = function() { @@ -11,24 +18,27 @@ this.hide = function() { } this.loaded = function(panel, config) { - // reload data - setInterval(function() { - getMensaPlan(); - }, 30*60*1000); - - function getMensaPlan() { + function lsfDataUpdate() { $.getJSON("tmp/lsfView.json?"+( new Date().getTime()) ).done(function(json) { - fillTable(json); + lsfViewJson = json; + fillTable(lsfViewJson); }).fail(function(jqxhr, textStatus, error) { var err = textStatus + ", " + error; console.log("Request Failed: " + err); }); } + function toNextRound(i){ + if(i%2 == 1){ + return i+1; + } + return i; + } + function fillTable(json) { var date = new Date(); - document.getElementById("lsfViewTitleBar").innerHTML = "Vorlesungen zwischen 123 und 123"; + document.getElementById("lsfViewTitleBar").innerHTML = "Vorlesungen zwischen " + toNextRound(date.getHours()) + " und " + (toNextRound(date.getHours())+2); } - - getMensaPlan(); + + lsfDataUpdate(); } diff --git a/panels/lsfView/style.less b/panels/lsfView/style.less index 329030adc9f7730d4bee3fdce1bfdbfd8814b132..102ba6ccf25b5a9b14e81ec86dcda500b5307c67 100755 --- a/panels/lsfView/style.less +++ b/panels/lsfView/style.less @@ -1,18 +1,13 @@ /* Table */ -#mensaPlanTable { +#lsfViewTable { font-weight: bold; } -#mensaPlanTableHead { - background-color: #0000f0; - color: #000000; -} - -#mensaPlanTableBody { +#lsfViewTableBody { background-color: #ffffff; color: #000000; } -#mensaPlanTitleBar { +#lsfViewTitleBar { text-align: center; } \ No newline at end of file