From 5f726aeaf6470de2c682fe2ccaa7c19f9286173c Mon Sep 17 00:00:00 2001
From: Rico van Endern <Rico.Hotte@gmail.com>
Date: Fri, 18 Sep 2015 11:03:29 +0200
Subject: [PATCH] tages anzeige am wochenende noch herber bullshit
---
panels/mensaPlan/script.js | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/panels/mensaPlan/script.js b/panels/mensaPlan/script.js
index fc1595f..65f2aa8 100755
--- a/panels/mensaPlan/script.js
+++ b/panels/mensaPlan/script.js
@@ -2,7 +2,7 @@ this.loaded = function(panel, config) {
setInterval(function() {
getMensaPlan();
}, 1800000);
-
+
setInterval(function() {
var currentTab = $("#tabs").tabs('option', 'active');
if (currentTab == 0) {
@@ -27,10 +27,10 @@ this.loaded = function(panel, config) {
function fillTable(json) {
var date = new Date();
var next = 0;
- if(date.getHours() > 14 || (date.getHours() == 14 && date.getMinutes() >15)){
+ if (date.getHours() >= 15) {
next = 1;
}
- switch (date.getDay()+next) {
+ switch (date.getDay() + next) {
case 0:
var day = json.montag;
break;
@@ -52,9 +52,18 @@ this.loaded = function(panel, config) {
case 6:
var day = json.montag;
break;
+ case 7:
+ var day = json.montag;
+ break;
}
var gerichte = day.gerichte;
- document.getElementById("head").innerHTML = "Mensaplan vom "+day.date;
+ if (next) {
+ document.getElementById("head").innerHTML = "Mensaplan von MORGEN dem "
+ + day.date;
+ } else {
+ document.getElementById("head").innerHTML = "Mensaplan von HEUTE dem "
+ + day.date;
+ }
var tableBody1 = document.getElementById("mensaPlanTable1Body");
var tableBody2 = document.getElementById("mensaPlanTable2Body");
tableBody1.innerHTML = "";
@@ -63,7 +72,10 @@ this.loaded = function(panel, config) {
var b = 0;
for (var i = 0; i < gerichte.length; i++) {
var gericht = gerichte[i];
- if(gericht.kategorie == "icon-menue-1.png" || gericht.kategorie == "icon-menue-2.png" || gericht.kategorie == "icon-tagesgericht.png" || gericht.kategorie == "icon-aktionsteller.png"){
+ if (gericht.kategorie == "icon-menue-1.png"
+ || gericht.kategorie == "icon-menue-2.png"
+ || gericht.kategorie == "icon-tagesgericht.png"
+ || gericht.kategorie == "icon-aktionsteller.png") {
var row = tableBody1.insertRow(a);
a++;
} else {
--
GitLab