diff --git a/panels/lsfView/helper.php b/panels/lsfView/helper.php index 2daec933ad9ff8f25be7c8c47e6e483781642508..ead34497e0445abb66a758ee0b18b25df006ed21 100755 --- a/panels/lsfView/helper.php +++ b/panels/lsfView/helper.php @@ -56,25 +56,25 @@ function fixDay($day){ $day = str_replace(' ',"",$day); switch($day){ case "Mo.": - $day = 0; + $day = 1; break; case "Di.": - $day = 1; + $day = 2; break; case "Mi.": - $day = 2; + $day = 3; break; case "Do.": - $day = 3; + $day = 4; break; case "Fr.": - $day = 4; + $day = 5; break; case "Sa.": - $day = 5; + $day = 6; break; case "So.": - $day = 6; + $day = 0; break; default: $day = -1; @@ -101,4 +101,4 @@ function removeSpace($text){ $text = str_replace(' ',"",$text); return $text; } -?> \ No newline at end of file +?> diff --git a/panels/lsfView/script.js b/panels/lsfView/script.js index 9eb9ca336743169fdcfe2c073f1c15549ccfd125..a037f8251d733634b7a2f810ed64674305ab6eae 100755 --- a/panels/lsfView/script.js +++ b/panels/lsfView/script.js @@ -5,7 +5,7 @@ this.checkShowCondition = function() { var roundH = date.getHours()%2 == 1? date.getHours()+1 : date.getHours(); 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) { + if(lsfViewJson.events[i].StartTime.substring(0, 2) == roundH && lsfViewJson.events[i].Day == new Date().getDay()) { console.log("LSF-View: Event Found"); return 60; } @@ -50,7 +50,7 @@ this.loaded = function(panel, config) { lsfTableBody.innerHTML = ""; for (i = 0; i < lsfViewJson.events.length; i++) { - if(lsfViewJson.events[i].StartTime.substring(0, 2) == roundH) { + if(lsfViewJson.events[i].StartTime.substring(0, 2) == roundH && lsfViewJson.events[i].Day == new Date().getDay()) { var row = lsfTableBody.insertRow(-1); var cell1 = row.insertCell(-1); cell1.innerHTML = lsfViewJson.events[i].StartTime+"-"+lsfViewJson.events[i].EndTime; diff --git a/panels/werbung/script.js b/panels/werbung/script.js index 78cc7fcbeace7c044910b4614732345366d98703..74a86086c9cfeca98c9a837c33e6e9427563bde9 100755 --- a/panels/werbung/script.js +++ b/panels/werbung/script.js @@ -33,7 +33,7 @@ function isOverDate(day, month, year){ console.log("DEBUG: input"+day +" "+ month+" "+year); var d = new Date(); - if((d.getFullYear() > year) || (d.getFullYear() == year && d.getMonth() > month) || (d.getFullYear() == year && d.getMonth()+1 == month && d.getDate() > day)){ + if((d.getFullYear() > year) || (d.getFullYear() == year && d.getMonth()+1 > month) || (d.getFullYear() == year && d.getMonth()+1 == month && d.getDate() > day)){ return true; } else { return false;