diff --git a/config/layouts/default.json b/config/layouts/default.json index dacb79cafd2137392373e8be06e10b8143b58adc..871e0e1f8100ae50591e1b5bad56b84a5fab5447 100755 --- a/config/layouts/default.json +++ b/config/layouts/default.json @@ -29,6 +29,10 @@ { "filename": "DAT_2016_Flyer_DINA6.png", "enddate": "18.11.2016" + }, + { + "filename": "Ankndigung_FVV.png", + "enddate": "30.11.2016" } ] } diff --git a/panels/lsfView/script.js b/panels/lsfView/script.js index 2393fb2a48a94ffa0939d4d18c72f47b4c65de85..9eb9ca336743169fdcfe2c073f1c15549ccfd125 100755 --- a/panels/lsfView/script.js +++ b/panels/lsfView/script.js @@ -3,7 +3,7 @@ var lsfViewJson = null; this.checkShowCondition = function() { var date = new Date(); var roundH = date.getHours()%2 == 1? date.getHours()+1 : date.getHours(); - if(date.getHours() >= 8 && date.getHours() <= 18 && ((date.getHours()%2 == 1 && date.getMinutes() > 44) || (date.getHours()%2 == 0 && date.getMinutes() <= 15))){ + if(date.getHours() >= 8 && date.getHours() <= 18 && ((date.getHours()%2 == 1 && date.getMinutes() >= 30) || (date.getHours()%2 == 0 && date.getMinutes() <= 15))){ for (i = 0; i < lsfViewJson.events.length; i++) { if(lsfViewJson.events[i].StartTime.substring(0, 2) == roundH) { console.log("LSF-View: Event Found"); @@ -11,7 +11,7 @@ this.checkShowCondition = function() { } } console.log("LSF-View: No Events"); - return 0; + return 0; //Skip Panel } else { console.log("LSF-View: Out Of Time"); return 0; //Skip Panel diff --git a/panels/werbung/img/Ankndigung_FVV.png b/panels/werbung/img/Ankndigung_FVV.png new file mode 100644 index 0000000000000000000000000000000000000000..281842f14252aaa4df4a299849d915fff530ae45 Binary files /dev/null and b/panels/werbung/img/Ankndigung_FVV.png differ