From 75f351a67e739657f77c887be3efe1d433a20a9f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 3 May 2017 13:22:24 +0200
Subject: [PATCH] *adapted Day
---
panels/lsfView/helper.php | 16 ++++++++--------
panels/lsfView/script.js | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/panels/lsfView/helper.php b/panels/lsfView/helper.php
index 2daec93..ead3449 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 9eb9ca3..a037f82 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;
--
GitLab