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

Merged in dev (pull request #13)

Dev
parents 02612137 bad7e483
No related branches found
No related tags found
No related merge requests found
......@@ -12,6 +12,7 @@ def parseDay( dom, dayName ):
for tr in range(day.length()):
tds = day[tr].find("td");
gericht = tds[0].text()
if gericht != "Pommes":
#-zusatzstoffe
gericht = re.sub(r'\([\d+,]+\)', '', gericht)
#+verkuerzung
......
......@@ -27,7 +27,7 @@ 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) {
......@@ -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 {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment