Skip to content
Snippets Groups Projects
Commit 4c981e76 authored by Rico van Endern's avatar Rico van Endern
Browse files

Merged in dev (pull request #43)

parents 5d874697 72854c9c
No related branches found
No related tags found
No related merge requests found
...@@ -56,25 +56,25 @@ function fixDay($day){ ...@@ -56,25 +56,25 @@ function fixDay($day){
$day = str_replace(' ',"",$day); $day = str_replace(' ',"",$day);
switch($day){ switch($day){
case "Mo.": case "Mo.":
$day = 0; $day = 1;
break; break;
case "Di.": case "Di.":
$day = 1; $day = 2;
break; break;
case "Mi.": case "Mi.":
$day = 2; $day = 3;
break; break;
case "Do.": case "Do.":
$day = 3; $day = 4;
break; break;
case "Fr.": case "Fr.":
$day = 4; $day = 5;
break; break;
case "Sa.": case "Sa.":
$day = 5; $day = 6;
break; break;
case "So.": case "So.":
$day = 6; $day = 0;
break; break;
default: default:
$day = -1; $day = -1;
......
...@@ -5,7 +5,7 @@ this.checkShowCondition = function() { ...@@ -5,7 +5,7 @@ this.checkShowCondition = function() {
var roundH = date.getHours()%2 == 1? date.getHours()+1 : date.getHours(); 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))){ 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++) { 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"); console.log("LSF-View: Event Found");
return 60; return 60;
} }
...@@ -50,7 +50,7 @@ this.loaded = function(panel, config) { ...@@ -50,7 +50,7 @@ this.loaded = function(panel, config) {
lsfTableBody.innerHTML = ""; lsfTableBody.innerHTML = "";
for (i = 0; i < lsfViewJson.events.length; i++) { 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 row = lsfTableBody.insertRow(-1);
var cell1 = row.insertCell(-1); var cell1 = row.insertCell(-1);
cell1.innerHTML = lsfViewJson.events[i].StartTime+"-"+lsfViewJson.events[i].EndTime; cell1.innerHTML = lsfViewJson.events[i].StartTime+"-"+lsfViewJson.events[i].EndTime;
......
...@@ -33,7 +33,7 @@ function isOverDate(day, month, year){ ...@@ -33,7 +33,7 @@ function isOverDate(day, month, year){
console.log("DEBUG: input"+day +" "+ month+" "+year); console.log("DEBUG: input"+day +" "+ month+" "+year);
var d = new Date(); 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; return true;
} else { } else {
return false; return false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment