replace GlobalScope with CoroutineScope in CacheController

Reviewed-on: #24

.drone.yml

@@ -1,9 +0,0 @@
-kind: pipeline
-name: default
-
-steps:
-- name: test
-  image: gradle:jdk11
-  commands:
-  - gradle test
-

.woodpecker.yml

@@ -0,0 +1,21 @@
+pipeline:
+  test:
+    image: gradle:jdk11
+    commands:
+      - gradle test
+  build:
+    image: gradle:jdk11
+    commands:
+      - gradle bootJar
+    when:
+      event:
+        - tag
+  docker:
+    image: techknowlogick/drone-docker
+    privileged: true
+    repo: mosadxyz/tcor
+    secrets: [docker_username, docker_password]
+    tags: latest
+    when:
+      event:
+        - tag

Dockerfile

@@ -0,0 +1,8 @@
+FROM adoptopenjdk/openjdk11:alpine-jre
+RUN addgroup -S spring && adduser -S spring -G spring
+#RUN groupadd -r spring && useradd -r -g spring spring # for openjdk:xx builds
+USER spring:spring
+ARG JAR_FILE=build/libs/*.jar
+COPY ${JAR_FILE} thecitadelofricks.jar
+ENTRYPOINT ["java","-Djavax.net.ssl.trustStore=/tcor/cacerts", "-Djavax.net.ssl.trustStorePassword=changeit", "-jar","/thecitadelofricks.jar"]
+VOLUME /tcor

README.md

@@ -1,5 +1,5 @@
 ![Website](https://img.shields.io/website?down_color=red&down_message=offline&label=tcor.mosad.xyz&up_color=brightgreen&up_message=online&url=https%3A%2F%2Ftcor.mosad.xyz%2Fhealth)
-[![Build Status](https://drone.mosad.xyz/api/badges/Seil0/TheCitadelofRicks/status.svg)](https://drone.mosad.xyz/Seil0/TheCitadelofRicks)
+[![Build Status](https://ci.mosad.xyz/api/badges/Seil0/TheCitadelofRicks/status.svg)](https://ci.mosad.xyz/Seil0/TheCitadelofRicks)
 [![Release](https://img.shields.io/badge/dynamic/json.svg?label=release&url=https://git.mosad.xyz/api/v1/repos/Seil0/TheCitadelofRicks/releases&query=$[0].tag_name)](https://git.mosad.xyz/Seil0/TheCitadelofRicks/releases)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 # TheCitadelofRicks

build.gradle

@@ -1,26 +1,25 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.20'
-    id 'org.jetbrains.kotlin.plugin.spring' version '1.3.72'
+    id 'org.jetbrains.kotlin.plugin.spring' version '1.6.20'
-    id 'org.springframework.boot' version '2.3.0.RELEASE'
+    id 'org.springframework.boot' version '2.6.6'
-    id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 }
 
 group 'org.mosad'
-version '1.2.2'
+version '1.3.1'
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.jetbrains.kotlin:kotlin-reflect'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
-    implementation 'org.jsoup:jsoup:1.13.1'
+    implementation 'org.jsoup:jsoup:1.15.3'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
 }
 
 test {
@@ -31,9 +30,17 @@ test {
     }
 }
 
+def jvmTargetVersion = "11"
 compileKotlin {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = jvmTargetVersion
+    kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+}
+compileJava {
+    targetCompatibility = jvmTargetVersion
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = jvmTargetVersion
+}
+compileTestJava {
+    targetCompatibility = jvmTargetVersion
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,78 +17,113 @@
 #
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -105,79 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt

@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import java.time.LocalDateTime
 import java.util.*
+import kotlin.collections.ArrayList
 
 @RestController
 class APIController {
@@ -47,8 +48,8 @@ class APIController {
     private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
 
     companion object {
-        const val apiVersion = "1.2.0"
+        const val apiVersion = "1.3.0"
-        const val softwareVersion = "1.2.3"
+        const val softwareVersion = "1.3.1"
         val startTime = System.currentTimeMillis() / 1000
     }
 
@@ -58,10 +59,11 @@ class APIController {
     }
 
     @RequestMapping("/courseList")
-    fun courseList(): CoursesList {
+    fun courseList(): CoursesListRet {
         logger.info("courseList request at ${LocalDateTime.now()}!")
         updateCourseListRequests()
-        return courseList
+
+        return CoursesListRet(courseList.meta, ArrayList(courseList.courses.values))
     }
 
     @RequestMapping("/mensamenu")
@@ -121,7 +123,7 @@ class APIController {
     // TODO remove this with API version 2.0.0
     @Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()"))
     @RequestMapping("/courses")
-    fun courses(): CoursesList {
+    fun courses(): CoursesListRet {
         return courseList()
     }
 

src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt

@@ -29,9 +29,10 @@ import kotlin.collections.HashMap
 // data classes for the course part
 data class Course(val courseName: String, val courseLink: String)
 
-data class CoursesMeta(val updateTime: Long, val totalCourses: Int)
+data class CoursesMeta(val updateTime: Long = 0, val totalCourses: Int = 0)
 
-data class CoursesList(val meta: CoursesMeta, val courses: ArrayList<Course>)
+data class CoursesList(val meta: CoursesMeta = CoursesMeta(), val courses: SortedMap<String, Course>)
+data class CoursesListRet(val meta: CoursesMeta = CoursesMeta(), val courses: ArrayList<Course> = ArrayList())
 
 // data classes for the Mensa part
 data class Meal(val day: String, val heading: String, val parts: ArrayList<String>, val additives: String)
@@ -45,6 +46,9 @@ data class MensaMeta(val updateTime: Long, val mensaName: String)
 data class MensaMenu(val meta: MensaMeta, val currentWeek: MensaWeek, val nextWeek: MensaWeek)
 
 // data classes for the timetable part
+
+data class CalendarWeek(val week: Int, val year: Int)
+
 data class Lesson(
     val lessonID: String,
     val lessonSubject: String,
@@ -57,13 +61,12 @@ data class TimetableDay(val timeslots: Array<ArrayList<Lesson>> = Array(6) { Arr
 
 data class TimetableWeek(val days: Array<TimetableDay> = Array(6) { TimetableDay() })
 
-data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, val weekNumberYear: Int = 0, val link: String = "")
+data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, var weekNumberYear: Int = 0, val year: Int = 0, val link: String = "")
 
 data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek())
 
 
 // data classes for the status part
-data class TimetableCounter(var courseName: String, var requests: Int)
 
 data class Status(
     val time: LocalDateTime,

src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt

@@ -23,24 +23,24 @@
 package org.mosad.thecitadelofricks.controller
 
 import com.google.gson.Gson
-import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.*
-import kotlinx.coroutines.async
+import org.jsoup.Jsoup
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import org.mosad.thecitadelofricks.*
 import org.mosad.thecitadelofricks.hsoparser.CourseListParser
 import org.mosad.thecitadelofricks.hsoparser.MensaParser
 import org.mosad.thecitadelofricks.hsoparser.TimetableParser
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import java.io.BufferedWriter
+import java.io.*
-import java.io.File
-import java.io.FileWriter
 import java.util.*
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executors
 import kotlin.collections.ArrayList
 import kotlin.collections.HashSet
 import kotlin.concurrent.scheduleAtFixedRate
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.ExperimentalTime
 
 class CacheController {
 
@@ -49,12 +49,12 @@ class CacheController {
         scheduledUpdates()
     }
 
-    companion object{
+    companion object {
         private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
 
-        var courseList = CoursesList(CoursesMeta(0, 0), ArrayList())
+        var courseList = CoursesList(CoursesMeta(), sortedMapOf())
-        var mensaMenu = MensaMenu(MensaMeta(0,""), MensaWeek(), MensaWeek())
+        var mensaMenu = MensaMenu(MensaMeta(0, ""), MensaWeek(), MensaWeek())
-        var timetableList = ArrayList<TimetableCourseWeek>() // this list contains all timetables
+        var timetableList = ConcurrentHashMap<String, TimetableCourseWeek>() // this list contains all timetables
 
         /**
          * get a timetable, since they may not be cached, we need to make sure it's cached, otherwise download
@@ -62,31 +62,56 @@ class CacheController {
          * @param weekIndex request week number (current week = 0)
          * @return timetable of the course (Type: [TimetableCourseWeek])
          */
-        fun getTimetable(courseName: String, weekIndex: Int): TimetableCourseWeek = runBlocking {
+        fun getTimetable(courseName: String, weekIndex: Int): TimetableCourseWeek {
-            val currentTime = System.currentTimeMillis() / 1000
-            var timetable = TimetableWeek()
-            var weekNumberYear = 0
 
-            // check if the timetable already exists and is up to date
+            // TODO just for testing
-            when (timetableList.stream().filter { x -> x.meta.courseName == courseName && x.meta.weekIndex == weekIndex }.findAny().orElse(null)) {
+            if (courseName == "TEST_A" || courseName == "TEST_B") {
-                // there is no such course yet, create one
+                val currentTime = System.currentTimeMillis() / 1000
-                null -> {
+                val timetableLink = "https://mosad.xyz"
-                    val courseLink = courseList.courses.stream().filter { x -> x.courseName == courseName }.findFirst().orElse(null).courseLink
+                val weekNumberYear = 0
-                    val timetableLink = courseLink.replace("week=0","week=$weekIndex")
+                val year = 0
+                val instr = CacheController::class.java.getResourceAsStream("/html/Timetable_normal-week.html")
 
-                    val jobTimetable = async {
+                val timetableParser =
-                        timetable = TimetableParser().getTimeTable(timetableLink)
+                    TimetableParser(htmlDoc = Jsoup.parse(instr!!, "UTF-8", "https://www.hs-offenburg.de/"))
-                        weekNumberYear = TimetableParser().getWeekNumberYear(timetableLink)
+                val timetableTest = timetableParser.parseTimeTable()
-                    }
 
-                    jobTimetable.await()
+                return TimetableCourseWeek(
-                    timetableList.add(TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink), timetable))
+                    TimetableCourseMeta(
-
+                        currentTime,
-                    logger.info("added new timetable for $courseName, week $weekIndex")
+                        courseName,
-                }
+                        weekIndex,
+                        weekNumberYear,
+                        year,
+                        timetableLink
+                    ), timetableTest ?: TimetableWeek()
+                )
             }
 
-            return@runBlocking timetableList.stream().filter { x -> x.meta.courseName == courseName && x.meta.weekIndex == weekIndex }.findAny().orElse(null)
+            val key = "$courseName-$weekIndex"
+            return if (timetableList.containsKey(key)) {
+                timetableList[key]!!
+            } else {
+                val timetableLink = courseList.courses[courseName]
+                    ?.courseLink
+                    ?.replace("week=0", "week=$weekIndex") ?: ""
+                val currentTime = System.currentTimeMillis() / 1000
+
+                val timetableParser = TimetableParser(timetableLink)
+                val calendarWeek = timetableParser.parseCalendarWeek()
+                val timetable = timetableParser.parseTimeTable()
+
+                TimetableCourseWeek(
+                    TimetableCourseMeta(
+                        currentTime,
+                        courseName,
+                        weekIndex,
+                        calendarWeek?.week ?: 0,
+                        calendarWeek?.year ?: 0,
+                        timetableLink
+                    ), timetable ?: TimetableWeek()
+                ).also { if (timetable != null) timetableList[key] = it }
+            }
         }
 
         /**
@@ -130,21 +155,25 @@ class CacheController {
 
         /**
          * this function updates the courseList
-         * during the update process the old data will be returned for a API request
+         * during the update process the old data will be returned for an API request
          */
-        private fun asyncUpdateCourseList() = GlobalScope.launch {
+        private fun asyncUpdateCourseList() = CoroutineScope(Dispatchers.IO).launch {
             CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
-                courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it)
+                courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
             }
 
+            // TODO just for testing
+            courseList.courses["TEST_A"] = Course("TEST_A", "https://mosad.xyz")
+            courseList.courses["TEST_B"] = Course("TEST_B", "https://mosad.xyz")
+
             logger.info("Updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
         }
 
         /**
          * this function updates the mensa menu list
-         * during the update process the old data will be returned for a API request
+         * during the update process the old data will be returned for an API request
          */
-        private fun asyncUpdateMensa() = GlobalScope.launch {
+        private fun asyncUpdateMensa() = CoroutineScope(Dispatchers.IO).launch {
             val mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
             val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(StartupController.mensaMenuURL))
 
@@ -158,10 +187,10 @@ class CacheController {
 
         /**
          * this function updates all existing timetables
-         * during the update process the old data will be returned for a API request
+         * during the update process the old data will be returned for an API request
          * a FixedThreadPool is used to make parallel requests for faster updates
          */
-        private fun asyncUpdateTimetables() = GlobalScope.launch {
+        private fun asyncUpdateTimetables() = CoroutineScope(Dispatchers.IO).launch {
             logger.info("Updating ${timetableList.size} timetables ...")
 
             // create a new ThreadPool with 5 threads
@@ -170,10 +199,13 @@ class CacheController {
             try {
                 timetableList.forEach { timetableCourse ->
                     executor.execute {
-                        timetableCourse.timetable = TimetableParser().getTimeTable(timetableCourse.meta.link)
+                        val timetableParser = TimetableParser(timetableCourse.value.meta.link)
-                        timetableCourse.meta.updateTime = System.currentTimeMillis() / 1000
+                        timetableCourse.value.timetable = timetableParser.parseTimeTable() ?: return@execute
+                        timetableCourse.value.meta.weekNumberYear =
+                            timetableParser.parseCalendarWeek()?.week ?: return@execute
+                        timetableCourse.value.meta.updateTime = System.currentTimeMillis() / 1000
 
-                        saveTimetableToCache(timetableCourse) // save the updated timetable to the cache directory
+                        saveTimetableToCache(timetableCourse.value) // save the updated timetable to the cache directory
                     }
 
                 }
@@ -190,12 +222,16 @@ class CacheController {
          * @param timetable a timetable of the type [TimetableCourseWeek]
          */
         private fun saveTimetableToCache(timetable: TimetableCourseWeek) {
-            println(timetable.timetable.toString())
-
             val file = File(StartupController.dirTcorCache, "timetable-${timetable.meta.courseName}-${timetable.meta.weekIndex}.json")
             val writer = BufferedWriter(FileWriter(file))
-            writer.write(Gson().toJson(timetable))
+
-            writer.close()
+            try {
+                writer.write(Gson().toJson(timetable))
+            } catch (e: Exception) {
+                logger.error("something went wrong while trying to write a cache file", e)
+            } finally {
+                writer.close()
+            }
         }
 
         /**
@@ -217,30 +253,39 @@ class CacheController {
          * update the CourseList every 24h, the Timetables every 3h and the Mensa Menu every hour
          * doesn't account the change between winter and summer time!
          */
+        @OptIn(ExperimentalTime::class)
         private fun scheduledUpdates() {
             val currentTime = System.currentTimeMillis()
-            val initDelay24h = (86400000 - ((currentTime + 3600000) % 86400000)) + 60000
+
-            val initDelay3h = (10800000 - ((currentTime + 3600000) % 10800000)) + 60000
+            val duration24h = 24.hours.inWholeMilliseconds
-            val initDelay1h = (3600000 - ((currentTime + 3600000) % 3600000)) + 60000
+            val duration3h = 3.hours.inWholeMilliseconds
+            val duration1h = 1.hours.inWholeMilliseconds
+            val duration1m = 1.minutes.inWholeMilliseconds
+
+            // Calculate the initial delay to make the update time independent of the start time
+            fun calcInitDelay(period: Long) = (period - ((currentTime + duration1h) % period)) + duration1m
+            val initDelay24h = calcInitDelay(duration24h)
+            val initDelay3h = calcInitDelay(duration3h)
+            val initDelay1h = calcInitDelay(duration1h)
 
             // update courseList every 24 hours (time in ms)
-            Timer().scheduleAtFixedRate(initDelay24h, 86400000) {
+            Timer().scheduleAtFixedRate(initDelay24h, duration24h) {
                 asyncUpdateCourseList()
             }
 
             // update all already existing timetables every 3 hours (time in ms)
-            Timer().scheduleAtFixedRate(initDelay3h, 10800000) {
+            Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
                 asyncUpdateTimetables()
             }
 
             // update courses every hour (time in ms)
-            Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
+            Timer().scheduleAtFixedRate(initDelay1h, duration1h) {
                 asyncUpdateMensa()
             }
 
             // post to status.mosad.xyz every hour, if an API key is present
             if (StartupController.cachetAPIKey != "0") {
-                Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
+                Timer().scheduleAtFixedRate(initDelay1h, duration1h) {
                     CachetAPIController.postTotalRequests()
                 }
             }

src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt

@@ -22,7 +22,7 @@
 
 package org.mosad.thecitadelofricks.controller
 
-import org.mosad.thecitadelofricks.controller.StatusController.Companion.getTotalRequests
+import org.mosad.thecitadelofricks.controller.StatusController.Companion.totalRequests
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.BufferedReader
@@ -42,8 +42,8 @@ class CachetAPIController {
          fun postTotalRequests() {
              try {
                  val url = URL("${StartupController.cachetBaseURL}/api/v1/metrics/1/points")
-                 val jsonInputString = "{\"value\": ${getTotalRequests() -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
+                 val jsonInputString = "{\"value\": ${totalRequests -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
-                 oldTotalRequests = getTotalRequests()
+                 oldTotalRequests = totalRequests
 
                  val con = url.openConnection() as HttpURLConnection
                  con.requestMethod = "POST"

src/main/kotlin/org/mosad/thecitadelofricks/controller/StartupController.kt

@@ -44,7 +44,7 @@ class StartupController {
         var cachetAPIKey = "0"
         var cachetBaseURL = "https://status.mosad.xyz"
         var courseListURL = "https://www.hs-offenburg.de/studium/vorlesungsplaene/"
-        var mensaMenuURL = "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/"
+        var mensaMenuURL = "https://www.swfr.de/essen/mensen-cafes-speiseplaene/mensa-offenburg"
         var mensaName = "Offenburg"
     }
 
@@ -77,29 +77,21 @@ class StartupController {
         val properties = Properties()
         properties.loadFromXML(FileInputStream(fileConfig))
 
-        cachetAPIKey = try {
+        try {
-            properties.getProperty("cachetAPIKey")
+            cachetAPIKey = properties.getProperty("cachetAPIKey")
-        } catch (ex: Exception) {
+        } catch (_: Exception) {}
-            "0"
-        }
 
-        cachetBaseURL = try {
+        try {
-            properties.getProperty("cachetBaseURL")
+            cachetBaseURL = properties.getProperty("cachetBaseURL")
-        } catch (ex: Exception) {
+        } catch (_: Exception) {}
-            "https://status.mosad.xyz"
-        }
 
-        mensaMenuURL = try {
+        try {
-            properties.getProperty("mensaMenuURL")
+            mensaMenuURL = properties.getProperty("mensaMenuURL")
-        } catch (ex: Exception) {
+        } catch (_: Exception) {}
-            "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/"
-        }
 
-        mensaName = try {
+        try {
-            properties.getProperty("mensaName")
+            mensaName = properties.getProperty("mensaName")
-        } catch (ex: Exception) {
+        } catch (_: Exception) {}
-            "Offenburg"
-        }
 
     } catch (ex: Exception) {
         logger.error("error while loading config", ex)
@@ -111,10 +103,10 @@ class StartupController {
     private fun createConfig() = try {
         val properties = Properties()
 
-        properties.setProperty("cachetAPIKey", "0")
+        properties.setProperty("cachetAPIKey", cachetAPIKey)
-        properties.setProperty("cachetBaseURL", "https://status.mosad.xyz")
+        properties.setProperty("cachetBaseURL", cachetBaseURL)
-        properties.setProperty("mensaMenuURL", "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/")
+        properties.setProperty("mensaMenuURL", mensaMenuURL)
-        properties.setProperty("mensaName", "Offenburg")
+        properties.setProperty("mensaName", mensaName)
 
         val outputStream = FileOutputStream(fileConfig)
         properties.storeToXML(outputStream, "tcor configuration")
@@ -134,7 +126,9 @@ class StartupController {
 
                 try {
                     val timetableObject = JsonParser.parseString(bufferedReader.readLine()).asJsonObject
-                    CacheController.timetableList.add(Gson().fromJson(timetableObject, TimetableCourseWeek().javaClass))
+                    val timetable = Gson().fromJson(timetableObject, TimetableCourseWeek().javaClass)
+                    CacheController.timetableList["${timetable.meta.courseName}-${timetable.meta.weekIndex}"] =
+                        timetable
                 } catch (ex: Exception) {
                     logger.error("error while reading cache", ex)
                 } finally {
@@ -144,4 +138,4 @@ class StartupController {
             }
         }
     }
-}
+}

src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt

@@ -39,10 +39,14 @@ class StatusController {
     companion object {
         private val logger: Logger = LoggerFactory.getLogger(StatusController::class.java)
 
-        private var totalRequests = 0
+        var totalRequests = 0
-        private var mensaMenuRequests = 0
+            private set
-        private var courseListRequests = 0
+        var mensaMenuRequests = 0
-        private var timetableRequests = HashMap<String, Int>()
+            private set
+        var courseListRequests = 0
+            private set
+        var timetableRequests = HashMap<String, Int>()
+            private set
 
         /**
          * if a mensamenu/courseList/timetable is requested update the specific and total request count
@@ -58,29 +62,10 @@ class StatusController {
         }
 
         fun updateTimetableRequests(courseName: String) {
-            timetableRequests[courseName] = timetableRequests.getOrPut(courseName) {0} + 1
+            timetableRequests[courseName] = (timetableRequests[courseName] ?: 0) + 1
             totalRequests++
         }
 
-        /**
-         * getters and setters
-         */
-        fun getTotalRequests(): Int {
-            return totalRequests
-        }
-
-        fun getMensaMenuRequests(): Int {
-            return mensaMenuRequests
-        }
-
-        fun getCourseListRequests(): Int {
-            return courseListRequests
-        }
-
-        fun getTimetableRequests(): HashMap<String, Int> {
-            return timetableRequests
-        }
-
         fun getStatus(): Status {
             val currentTime = System.currentTimeMillis() / 1000
             val minutes = (currentTime - startTime) % 3600 / 60
@@ -112,10 +97,10 @@ class StatusController {
                 "$days days, $hours:$minutes",
                 apiVersion,
                 softwareVersion,
-                getTotalRequests(),
+                totalRequests,
-                getMensaMenuRequests(),
+                mensaMenuRequests,
-                getCourseListRequests(),
+                courseListRequests,
-                getTimetableRequests(),
+                timetableRequests,
                 CacheController.timetableList.size,
                 Date(CacheController.courseList.meta.updateTime * 1000),
                 Date(CacheController.mensaMenu.meta.updateTime * 1000),

src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/CourseListParser.kt

@@ -29,26 +29,25 @@ import java.net.SocketTimeoutException
 
 class CourseListParser {
 
-    private var logger: org.slf4j.Logger = LoggerFactory.getLogger(MensaParser::class.java)
+    private var logger: org.slf4j.Logger = LoggerFactory.getLogger(CourseListParser::class.java)
 
     /**
      * return a list of all courses at courseListURL
      * @param courseListURL the url to the course list page
      * @return a ArrayList<Course> with all courses or null if the request was not successful
      */
-    fun getCourseLinks(courseListURL: String): ArrayList<Course>? {
+    fun getCourseLinks(courseListURL: String): HashMap<String, Course>? {
-        val courseLinkList = ArrayList<Course>()
+        val courseLinkList = HashMap<String, Course>()
         try {
             val courseHTML = Jsoup.connect(courseListURL).get()
 
             courseHTML.select("ul.index-group").select("li.Class").select("a[href]").forEachIndexed { _, element ->
-                courseLinkList.add(
+                courseLinkList[element.text()] = Course(
-                    Course(
+                    element.text(),
-                        element.text(),
+                    element.attr("href").replace("http", "https")
-                        element.attr("href").replace("http", "https")
-                    )
                 )
             }
+            logger.info("successfully retrieved course List")
         } catch (ex: SocketTimeoutException) {
             logger.warn("timeout from hs-offenburg.de, updating on next attempt!")
             return null

src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParser.kt

@@ -59,19 +59,24 @@ class MensaParser {
         val mealWeekList = MensaWeek()
 
         try {
-            htmlDoc.select("#speiseplan-tabs").select("div.tab-content").select("div.menu-tagesplan")
+            htmlDoc.select("#tabsWeekdaysMenu").select("div.menu-tagesplan")
                 .forEachIndexed { dayIndex, day ->
+                    val meals = mealWeekList.days[dayIndex].meals
                     val strDay = day.select("h3").text()
 
-                    day.select("div.row").forEachIndexed { mealIndex, meal ->
+                    day.select("div.menu-tagesplan > div.grid").first()?.select("div.flex-col")?.forEachIndexed { _, meal ->
-                        val heading = meal.select("h4.menu-header").text()
+                        val heading = meal.select("h5").text()
-                        val parts = ArrayList(meal.select("div.menu-info").html().substringBefore("<br><span").replace("\n", "").split("<br>"))
+                        val parts = ArrayList(meal.select("small.extra-text").html().split("<br>").map { it.trim() })
-                        val additives = meal.select("span.show-with-allergenes").text()
+                        val additives = meal.select("small.zusatzsstoffe[x-show=showAllergenes]").text()
                         parts.removeIf { x -> x.isEmpty() || x.isBlank() }
 
-                        mealWeekList.days[dayIndex].meals.add(Meal(strDay, heading, parts, additives))
+                        meals.add(Meal(strDay, heading, parts, additives))
                     }
 
+                    if (meals.isEmpty()) {
+                        // Add an empty Meal entry to preserve the day information
+                        meals.add(Meal(strDay, "", ArrayList(), ""))
+                    }
                 }
         } catch (pex: Exception) {
             logger.error("error while parsing the html file", pex)
@@ -87,8 +92,7 @@ class MensaParser {
      */
     fun getMenuLinkNextWeek(mensaMenuURL: String): String {
         val menuHTML = Jsoup.connect(mensaMenuURL).get()
-
+        return "https://www.swfr.de" + menuHTML.select("div.section-mensa").select("a.next-week").attr("href")
-        return "https://www.swfr.de" + menuHTML.select("#speiseplan-tabs").select("a.next-week").attr("href")
     }
 
 }

src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParser.kt

@@ -22,34 +22,50 @@
 
 package org.mosad.thecitadelofricks.hsoparser
 
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.sync.Semaphore
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
+import org.mosad.thecitadelofricks.CalendarWeek
 import org.mosad.thecitadelofricks.Lesson
 import org.mosad.thecitadelofricks.TimetableWeek
 import org.slf4j.LoggerFactory
 
-class TimetableParser {
+/**
+ * @param timetableURL the URL of the timetable you want to get
+ * @param htmlDoc the html document to use (the timetableURL will be ignored if this value is present)
+ */
+class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
     private var logger: org.slf4j.Logger = LoggerFactory.getLogger(TimetableParser::class.java)
     private val days = arrayOf("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday")
 
-    /**
+    companion object {
-     * get the timetable from the given url
+        val semaphore = Semaphore(3, 0)
-     * the timetable is organised per row not per column;
+    }
-     * Mon 1, Tue 1, Wed 1, Thur 1, Fri 1, Sat 1, Mon 2 and so on
+
-     * @param timetableURL the URL of the timetable you want to get
+    private val htmlDoc: Document? = htmlDoc ?: timetableURL?.let {
-     */
+        runBlocking {
-    fun getTimeTable(timetableURL: String): TimetableWeek {
+            try {
-        return try {
+                // Only allow sending a limited amount of requests at the same time
-            parseTimeTable(Jsoup.connect(timetableURL).get())
+                semaphore.acquire()
-        } catch (gex: Exception) {
+                Jsoup.connect(timetableURL).get()
-            logger.error("general TimetableParser error", gex)
+            } catch (gex: Exception) {
-            TimetableWeek()
+                logger.error("general TimetableParser error", gex)
+                null
+            } finally {
+                semaphore.release()
+            }
         }
     }
 
-    fun parseTimeTable(htmlDoc: Document): TimetableWeek {
+    /**
+     * parse the timetable from the previously given url
+     * the timetable is organised per row not per column;
+     * Mon 1, Tue 1, Wed 1, Thur 1, Fri 1, Sat 1, Mon 2 and so on
+     */
+    fun parseTimeTable(): TimetableWeek? = htmlDoc?.let {
         val timetableWeek = TimetableWeek()
-        val rows = htmlDoc.select("table.timetable").select("tr[scope=\"row\"]")
+        val rows = it.select("table.timetable").select("tr[scope=\"row\"]")
 
         var sDay = -1
         var sRow = -1
@@ -61,7 +77,7 @@ class TimetableParser {
             var lessonIndexDay = 0 // the index of the lesson per timeslot
 
             // elements are now all lessons, including empty ones
-            row.select("td.lastcol, td[style]").forEach {element ->
+            row.select("td.lastcol, td[style]").forEach { element ->
 
                 // if there is a lecture with rowspan="2", we need to shift everything by one to the left. This is stupid and ugly there needs to bee an API
                 if ((sDay > -1 && sRow > -1) && (sDay == day && ((sRow + 1) == rowIndex))) {
@@ -104,8 +120,7 @@ class TimetableParser {
 
                 lessonIndexDay++
 
-                if (element.hasClass("lastcol"))
+                if (element.hasClass("lastcol")) {
-                {
                     day++
                     lessonIndexDay = 0
                 }
@@ -117,21 +132,13 @@ class TimetableParser {
     }
 
     /**
-     * get the week number of the year for the timetable
+     * parse the calendar week and the associated year for the timetable
-     * @param timetableURL the URL of the timetable you want to get
      */
-    fun getWeekNumberYear(timetableURL: String): Int {
+    fun parseCalendarWeek(): CalendarWeek? = htmlDoc?.let {
-        return try {
+        val dateStr = it.select("h1.timetable-caption").text().substringAfter("- ")
-            parseWeekNumberYear(Jsoup.connect(timetableURL).get())
+        val week = dateStr.substringBefore(".").replace(" ", "").toInt()
-        } catch (gex: Exception) {
+        val year = dateStr.substringAfter("Woche ").replace(" ", "").toInt()
-            logger.error("general TimetableParser error", gex)
+        CalendarWeek(week, year)
-            0
-        }
-    }
-
-    fun parseWeekNumberYear(htmlDoc: Document): Int {
-        return htmlDoc.select("h1.timetable-caption").text().substringAfter("- ")
-            .substringBefore(".").replace(" ", "").toInt()
     }
 
     @Suppress("unused")
@@ -181,4 +188,5 @@ class TimetableParser {
 
         println(" \n")
     }
+
 }

src/main/resources/application.properties

@@ -11,5 +11,5 @@ logging.level.org.springframework.web=INFO
 # ----------------------------------------
 
 # EMBEDDED SERVER CONFIGURATION (ServerProperties)
-server.address=127.0.0.1
+server.address=0.0.0.0
 server.port=8080

src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParserTest.kt

@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test
 import java.io.File
 
 internal class MensaParserTest {
-    private val mensaMenuURL = "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/"
+    private val mensaMenuURL = "https://www.swfr.de/essen/mensen-cafes-speiseplaene/mensa-offenburg"
 
     @Test
     fun parseMensaMenuNormalWeek() {
@@ -57,4 +57,4 @@ internal class MensaParserTest {
         val urlNextWeek = MensaParser().getMenuLinkNextWeek(mensaMenuURL) // this need a connection to the swfr server
         Assertions.assertNotNull(urlNextWeek)
     }
-}
+}

src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParserTest.kt

@@ -25,6 +25,7 @@ package org.mosad.thecitadelofricks.hsoparser
 import org.jsoup.Jsoup
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
+import org.mosad.thecitadelofricks.CalendarWeek
 import java.io.File
 
 class TimetableParserTest {
@@ -32,8 +33,8 @@ class TimetableParserTest {
     @Test
     fun parseTimetableNormalWeek() {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_normal-week.html").path)
-        val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.hs-offenburg.de/")
+        val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
-        val actualTimetable = TimetableParser().parseTimeTable(htmlDoc).toString().trim()
+        val actualTimetable = TimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
         val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_normal-week.txt").readText().trim()
 
         Assertions.assertEquals(expectedTimetable, actualTimetable)
@@ -42,19 +43,19 @@ class TimetableParserTest {
     @Test
     fun parseTimetableEmptyWeek() {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_empty-week.html").path)
-        val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.hs-offenburg.de/")
+        val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
-        val actualTimetable = TimetableParser().parseTimeTable(htmlDoc).toString().trim()
+        val actualTimetable = TimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
         val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_empty-week.txt").readText().trim()
 
         Assertions.assertEquals(expectedTimetable, actualTimetable)
     }
 
     @Test
-    fun parseWeekNumberYear() {
+    fun parseCalendarWeek() {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_normal-week.html").path)
-        val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.hs-offenburg.de/")
+        val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
-        val actualWeekNumberYear = TimetableParser().parseWeekNumberYear(htmlDoc)
+        val actualCalendarWeek = TimetableParser(htmlDoc = htmlDoc).parseCalendarWeek()
 
-        Assertions.assertEquals(42, actualWeekNumberYear)
+        Assertions.assertEquals(CalendarWeek(42, 2019), actualCalendarWeek)
     }
 }

src/test/resources/expected/Mensa_empty-week.txt

@@ -1 +1 @@
-MensaWeek(days=[Meals(meals=[Meal(day=Montag 12.08., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Dienstag 13.08., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Mittwoch 14.08., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Donnerstag 15.08., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Freitag 16.08., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Samstag 17.08., heading=, parts=[], additives=)]), Meals(meals=[])])
+MensaWeek(days=[Meals(meals=[Meal(day=Montag 26.12., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Dienstag 27.12., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Mittwoch 28.12., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Donnerstag 29.12., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Freitag 30.12., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Samstag 31.12., heading=, parts=[], additives=)]), Meals(meals=[])])

src/test/resources/expected/Mensa_normal-week.txt

@@ -1 +1 @@
-MensaWeek(days=[Meals(meals=[Meal(day=Montag 09.03., heading=Essen 1, parts=[Kartoffel-Frischkäsebratling , Gemüseragout Toskana , Beilagensalat ], additives=enthält Allergene: Se,Gl,GlW,ML), Meal(day=Montag 09.03., heading=Essen 2, parts=[Schweineschnitzel Wiener Art , Bratensauce , Pommes frites , Mixsalat ], additives=Kennzeichnungen/Zusatzstoffe: sch enthält Allergene: Gl,GlW,GlG), Meal(day=Montag 09.03., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse ], additives=)]), Meals(meals=[Meal(day=Dienstag 10.03., heading=Essen 1, parts=[Tortellini mit Gemüsefüllung , Tomatensauce , Geriebener Hartkäse , Beilagensalat ], additives=Kennzeichnungen/Zusatzstoffe: 6 enthält Allergene: Ei,Se,Gl,GlW,ML), Meal(day=Dienstag 10.03., heading=Essen 2, parts=[Frikadelle , Champignon-Rahmsauce , Bauernspätzle , Blattsalat ], additives=Kennzeichnungen/Zusatzstoffe: sch,ri enthält Allergene: Ei,Gl,GlW,GlG,ML), Meal(day=Dienstag 10.03., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse ], additives=)]), Meals(meals=[Meal(day=Mittwoch 11.03., heading=Essen 1, parts=[Gebratener Gemüsereis Nasi Goreng , Raita , Mixsalat ], additives=Kennzeichnungen/Zusatzstoffe: 5 enthält Allergene: So,Sn,Se,Gl,GlW,ML), Meal(day=Mittwoch 11.03., heading=Essen 2, parts=[Kalbsbratwurst , Bratensauce , Kartoffelbrei , Apfelrotkraut ], additives=Kennzeichnungen/Zusatzstoffe: sch,5,6,8,ri enthält Allergene: Sn,Se,Sf,Gl,GlW,GlG,ML), Meal(day=Mittwoch 11.03., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse ], additives=)]), Meals(meals=[Meal(day=Donnerstag 12.03., heading=Essen 1, parts=[Spaghetti , Chinagemüse , Sauce süß-sauer , Geriebener Hartkäse , Mixsalat ], additives=Kennzeichnungen/Zusatzstoffe: 5,6 enthält Allergene: Ei,Sn,Se,Sf,Gl,GlW,GlG,ML), Meal(day=Donnerstag 12.03., heading=Essen 2, parts=[Paniertes Seelachsfilet , Sesam-Mayonnaise , Salzkartoffeln , Karottenmix mit Brokkoli und Bohnen ], additives=Kennzeichnungen/Zusatzstoffe: nF enthält Allergene: Ei,Sn,Fi,Sa,Gl,GlW), Meal(day=Donnerstag 12.03., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse ], additives=)]), Meals(meals=[Meal(day=Freitag 13.03., heading=Essen 1, parts=[Kartoffel-Gorgonzolagratin , Brokkoligemüse , Beilagensalat ], additives=enthält Allergene: ML), Meal(day=Freitag 13.03., heading=Essen 2, parts=[Hähnchenbrustfilet , Apfel-Rahmsauce , Mandelreis , Karottengemüse ], additives=Kennzeichnungen/Zusatzstoffe: 5 enthält Allergene: Gl,GlW,GlG,Nu,NM,ML), Meal(day=Freitag 13.03., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse ], additives=)]), Meals(meals=[Meal(day=Samstag 14.03., heading=, parts=[], additives=)]), Meals(meals=[])])
+MensaWeek(days=[Meals(meals=[Meal(day=Montag 19.12., heading=Essen 1, parts=[auf Wunsch vegan, Gemüselasagne oder, Cannelloni mit Gemüse und Käsekruste, Tomatensauce, Beilagensalat oder Regio-Apfel], additives=Kennzeichnungen/Zusatzstoffe: 5 enthält Allergene: ML,GlW,Gl,Ei,Se), Meal(day=Montag 19.12., heading=Essen 2, parts=[Grönsaksbullar -Gemüsebällchen oder, Köttbullar, Pfeffer-Rahmsauce, Blumenkohl-Kartoffelpüree, Beilagensalat oder Regio-Apfel], additives=Kennzeichnungen/Zusatzstoffe: 5,sch,ri,4 enthält Allergene: ML,GlW,Gl,Ei)]), Meals(meals=[Meal(day=Dienstag 20.12., heading=Essen 1, parts=[Brokkoli-Nussecken, Rotweinsauce, Kartoffel-Kürbispüree, Apfelrotkraut, Feldsalat], additives=Kennzeichnungen/Zusatzstoffe: 5 enthält Allergene: GlW,GlH,ML,NM,Gl,Sf,Se,Nu,NH), Meal(day=Dienstag 20.12., heading=Essen 2, parts=[Weihnachtsessen, Hirschgulasch, Rotweinsauce, Bauernspätzle, Apfelrotkraut, Feldsalat], additives=Kennzeichnungen/Zusatzstoffe: 5 enthält Allergene: Ei,Gl,GlW,ML,Sf)]), Meals(meals=[Meal(day=Mittwoch 21.12., heading=Essen 1, parts=[Gemüsenuggets, Mojo Dip, Gitterkartoffeln, Beilagensalat oder Regio-Apfel], additives=Kennzeichnungen/Zusatzstoffe: 5 enthält Allergene: GlW,GlG,Gl,ML), Meal(day=Mittwoch 21.12., heading=Essen 2, parts=[Gebratener Gemüsereis Nasi Goreng, Bio Tofu-Erdnusswürfel, Beilagensalat oder Regio-Apfel], additives=Kennzeichnungen/Zusatzstoffe: o enthält Allergene: Gl,GlW,Se,Sf,So,Sn)]), Meals(meals=[Meal(day=Donnerstag 22.12., heading=Essen 1, parts=[Schupfnudel-Gemüsepfanne, Weiße Sauce, Beilagensalat oder Regio-Apfel], additives=enthält Allergene: Gl,GlW,Se,So), Meal(day=Donnerstag 22.12., heading=Essen 2, parts=[Fischragout, Bandnudeln, Buntes Marktgemüse], additives=Kennzeichnungen/Zusatzstoffe: nF enthält Allergene: Se,ML,GlW,Gl,Ei,Fi)]), Meals(meals=[Meal(day=Freitag 23.12., heading=, parts=[], additives=)]), Meals(meals=[Meal(day=Samstag 24.12., heading=, parts=[], additives=)]), Meals(meals=[])])

src/test/resources/html/Mensa_empty-week.html

@@ -1,134 +1,105 @@
-<div id="speiseplan-tabs">
+<div id="tabsWeekdaysMenu">
-    <div id="tab-menu-container" class="row">
+            
-        <div class="col-md-1 col-xs-6"></div>
+                <div id="tab-mon" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-mon" x-show="currentDay == 1">
-        <div class="col-md-10">
+                    <h3>Montag 26.12.</h3>
-            <ul class="nav classic-tabs tabs-primary" role="tablist">
+
-                <li class="col-md-2"><a href="#tab-mon" class="nav-link" data-toggle="tab" role="tab">Mo 12.08.</a></li>
+                    
-                <li class="col-md-2"><a href="#tab-tue" class="nav-link" data-toggle="tab" role="tab">Di 13.08.</a></li>
+
-                <li class="col-md-2"><a href="#tab-wed" class="nav-link" data-toggle="tab" role="tab">Mi 14.08.</a></li>
+                    
-                <li class="col-md-2"><a href="#tab-thu" class="nav-link" data-toggle="tab" role="tab">Do 15.08.</a></li>
+                            <div class="row row-narrow row-buffer row-table">
-                <li class="col-md-2"><a href="#tab-fri" class="nav-link active show" data-toggle="tab" role="tab">Fr
+                                <div class="col-md-1 bg-beige-hell zusatzangaben">
-                    16.08.</a></li>
+                                    <i class="glyphicons glyphicons-circle-info"></i>
-                <li class="col-md-2"><a href="#tab-sat" class="nav-link" data-toggle="tab" role="tab">Sa 17.08.</a></li>
+                                </div>
-            </ul>
+                                <div class="col-md-11 border-beige-hell">
-        </div>
+                                    <h4>heute keine Essensausgabe</h4>
-        <div class="col-md-1 col-xs-6 pull-right">
+                                </div>
-            <a class="next-week text-right" title="eine Woche weiter"
+                            </div>
-               href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=fab2e8b1bae3cdd249ace0e5d67c1c7e"><span
+                        
-                    class="d-inline d-sm-none">nächste Woche</span><img
-                    src="Mensa_empty-week-Dateien/keil-grau-rechts.png" alt="" width="16" height="16"></a>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-4">
-            <table class="table legende">
-                <tbody>
-                <tr>
-                    <td class="vegetarisch legend"></td>
-                    <td class="legend-info">vegetarisch</td>
-                </tr>
-                <tr>
-                    <td class="vegan legend"></td>
-                    <td class="legend-info">vegan</td>
-                </tr>
-                <tr>
-                    <td class="wunsch-vegan legend"></td>
-                    <td class="legend-info">auf Wunsch vegan</td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-        <div class="col-sm-4 pt-3">
-            <div class="hide-with-allergenes">
-                <p><a download="_KW_33-2019.pdf" title="Wochenplan in Farbe herunterladen" target="_blank"
-                      href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=9c8a69897ba4f187d21b350d48473425"><i
-                        class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
-                <p><a download="_KW_33-2019.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank"
-                      href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=3e887f29d8cf2a15bd54620c56f43e02"><i
-                        class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
-            </div>
-            <div class="show-with-allergenes">
-                <p><a download="_KW_33-2019.pdf" title="Wochenplan in Farbe herunterladen" target="_blank"
-                      href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=e5c36a88733c75c5eded775acad35bc6"><i
-                        class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
-                <p><a download="_KW_33-2019.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank"
-                      href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=b0d4e30323a2010310bbb6cad8b55fe9"><i
-                        class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
-            </div>
-        </div>
-        <div class="col-sm-4 pt-3">
-            <p class="hide-with-allergenes"><a href="#" data-toggle="modal" data-target="#allergenesModal"><i
-                    class="fas fa-redo-alt"></i> Allergiehinweise anzeigen</a></p>
-            <p class="show-with-allergenes"><a href="#" class="btn-hide-allergenes"><i class="fas fa-undo-alt"></i>
-                Allergiehinweise verbergen</a></p>
-        </div>
-    </div>
-    <div class="tab-content">
-        <div id="tab-mon" class="menu-tagesplan tab-pane fade">
-            <h3>Montag 12.08.</h3>
-            <div class="row row-narrow row-buffer row-table">
-                <div class="col-md-1 bg-beige-hell zusatzangaben">
-                    <i class="glyphicons glyphicons-circle-info"></i>
                 </div>
-                <div class="col-md-11 border-beige-hell">
+            
-                    <h4>heute keine Essensausgabe</h4>
+                <div id="tab-tue" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-tue" x-show="currentDay == 2">
+                    <h3>Dienstag 27.12.</h3>
+
+                    
+
+                    
+                            <div class="row row-narrow row-buffer row-table">
+                                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                                    <i class="glyphicons glyphicons-circle-info"></i>
+                                </div>
+                                <div class="col-md-11 border-beige-hell">
+                                    <h4>heute keine Essensausgabe</h4>
+                                </div>
+                            </div>
+                        
                 </div>
-            </div>
+            
-        </div>
+                <div id="tab-wed" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-wed" x-show="currentDay == 3">
-        <div id="tab-tue" class="menu-tagesplan tab-pane fade">
+                    <h3>Mittwoch 28.12.</h3>
-            <h3>Dienstag 13.08.</h3>
+
-            <div class="row row-narrow row-buffer row-table">
+                    
-                <div class="col-md-1 bg-beige-hell zusatzangaben">
+
-                    <i class="glyphicons glyphicons-circle-info"></i>
+                    
+                            <div class="row row-narrow row-buffer row-table">
+                                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                                    <i class="glyphicons glyphicons-circle-info"></i>
+                                </div>
+                                <div class="col-md-11 border-beige-hell">
+                                    <h4>heute keine Essensausgabe</h4>
+                                </div>
+                            </div>
+                        
                 </div>
-                <div class="col-md-11 border-beige-hell">
+            
-                    <h4>heute keine Essensausgabe</h4>
+                <div id="tab-thu" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-thu" x-show="currentDay == 4">
+                    <h3>Donnerstag 29.12.</h3>
+
+                    
+
+                    
+                            <div class="row row-narrow row-buffer row-table">
+                                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                                    <i class="glyphicons glyphicons-circle-info"></i>
+                                </div>
+                                <div class="col-md-11 border-beige-hell">
+                                    <h4>heute keine Essensausgabe</h4>
+                                </div>
+                            </div>
+                        
                 </div>
-            </div>
+            
-        </div>
+                <div id="tab-fri" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-fri" x-show="currentDay == 5">
-        <div id="tab-wed" class="menu-tagesplan tab-pane fade">
+                    <h3>Freitag 30.12.</h3>
-            <h3>Mittwoch 14.08.</h3>
+
-            <div class="row row-narrow row-buffer row-table">
+                    
-                <div class="col-md-1 bg-beige-hell zusatzangaben">
+
-                    <i class="glyphicons glyphicons-circle-info"></i>
+                    
+                            <div class="row row-narrow row-buffer row-table">
+                                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                                    <i class="glyphicons glyphicons-circle-info"></i>
+                                </div>
+                                <div class="col-md-11 border-beige-hell">
+                                    <h4>heute keine Essensausgabe</h4>
+                                </div>
+                            </div>
+                        
                 </div>
-                <div class="col-md-11 border-beige-hell">
+            
-                    <h4>heute keine Essensausgabe</h4>
+                <div id="tab-sat" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-sat" x-show="currentDay == 6">
+                    <h3>Samstag 31.12.</h3>
+
+                    
+
+                    
+                            <div class="row row-narrow row-buffer row-table">
+                                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                                    <i class="glyphicons glyphicons-circle-info"></i>
+                                </div>
+                                <div class="col-md-11 border-beige-hell">
+                                    <h4>heute keine Essensausgabe</h4>
+                                </div>
+                            </div>
+                        
                 </div>
-            </div>
+            
-        </div>
+        </div>
-        <div id="tab-thu" class="menu-tagesplan tab-pane fade">
-            <h3>Donnerstag 15.08.</h3>
-            <div class="row row-narrow row-buffer row-table">
-                <div class="col-md-1 bg-beige-hell zusatzangaben">
-                    <i class="glyphicons glyphicons-circle-info"></i>
-                </div>
-                <div class="col-md-11 border-beige-hell">
-                    <h4>heute keine Essensausgabe</h4>
-                </div>
-            </div>
-        </div>
-        <div id="tab-fri" class="menu-tagesplan tab-pane fade in show active">
-            <h3>Freitag 16.08.</h3>
-            <div class="row row-narrow row-buffer row-table">
-                <div class="col-md-1 bg-beige-hell zusatzangaben">
-                    <i class="glyphicons glyphicons-circle-info"></i>
-                </div>
-                <div class="col-md-11 border-beige-hell">
-                    <h4>heute keine Essensausgabe</h4>
-                </div>
-            </div>
-        </div>
-        <div id="tab-sat" class="menu-tagesplan tab-pane fade">
-            <h3>Samstag 17.08.</h3>
-            <div class="row row-narrow row-buffer row-table">
-                <div class="col-md-1 bg-beige-hell zusatzangaben">
-                    <i class="glyphicons glyphicons-circle-info"></i>
-                </div>
-                <div class="col-md-11 border-beige-hell">
-                    <h4>heute keine Essensausgabe</h4>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>

src/test/resources/html/Mensa_normal-week.html

@@ -1,513 +1,467 @@
-<div id="speiseplan-tabs">
+<div id="tabsWeekdaysMenu">
-    <div id="tab-menu-container" class="row">
+            
-        <div class="col-md-1 col-xs-6">
+                <div id="tab-mon" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-mon" x-show="currentDay == 1">
-            <a class="prev-week" title="eine Woche zurück" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=ad074b11cc01a680e4c0d0675dd1f91c"><img src="/fileadmin/templates/images/keil-grau-links.png" width="16" height="16" alt="" /><span class="d-inline d-sm-none">vorherige Woche</span></a>
+                    <h3>Montag 19.12.</h3>
-        </div>
+
-        <div class="col-md-10">
+                    
-            <ul class="nav classic-tabs tabs-primary" role="tablist">
+
-                <li class="col-md-2"><a href="#tab-mon" class="nav-link" data-toggle="tab" role="tab">Mo 09.03.</a></li>
+                    
-                <li class="col-md-2"><a href="#tab-tue" class="nav-link active show" data-toggle="tab" role="tab">Di 10.03.</a></li>
+                            <div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 gap-y-30px md:gap-30px mb-30px">
-                <li class="col-md-2"><a href="#tab-wed" class="nav-link" data-toggle="tab" role="tab">Mi 11.03.</a></li>
+
-                <li class="col-md-2"><a href="#tab-thu" class="nav-link" data-toggle="tab" role="tab">Do 12.03.</a></li>
+                                
-                <li class="col-md-2"><a href="#tab-fri" class="nav-link" data-toggle="tab" role="tab">Fr 13.03.</a></li>
+
-                <li class="col-md-2"><a href="#tab-sat" class="nav-link" data-toggle="tab" role="tab">Sa 14.03.</a></li>
+
-            </ul>
+                                
-        </div>
+                                    <div class="col-span-1 bg-lighter-cyan py-20px px-15px flex flex-col">
-        <div class="col-md-1 col-xs-6 pull-right"><a class="next-week text-right" title="eine Woche weiter" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=2&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=3c3048ebdd7f42a104bd780a0a6a0fd1"><span class="d-inline d-sm-none">nächste Woche</span><img src="/fileadmin/templates/images/keil-grau-rechts.png" width="16" height="16" alt="" /></a></div>
+                                        <div class="flex justify-between">
-    </div>
+                                            <h5>Essen 1</h5>
-    <div class="row">
+                                            
-        <div class="col-sm-4">
+                                                    <img class="w-30px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/vegetarisch.svg" width="27" height="27" alt="" />
-            <table class="table legende">
+                                                
-                <tr>
+                                        </div>
-                    <td class="vegetarisch legend"></td>
+                                        <small class="extra-text mb-15px">auf Wunsch vegan<br>Gemüselasagne  oder<br>Cannelloni mit Gemüse und Käsekruste<br>Tomatensauce<br>Beilagensalat oder Regio-Apfel</small>
-                    <td class="legend-info">vegetarisch</td>
+                                        <div class="border-t-1px border-light-cyan w-full pt-15px mt-15px flex justify-between">
-                </tr>
+                                            <div id="accordion-collapse-1-1" class="w-full" data-accordion="collapse" data-active-classes="bg-primary-cyan text-white" data-inactive-classes="text-primary-cyan">
-                <tr>
+                                                <h4 id="accordion-collapse-heading-1-1">
-                    <td class="vegan legend"></td>
+                                                    <button type="button" class="text-14px text-left extra-text text-primary-cyan flex items-center justify-between w-full" data-accordion-target="#accordion-collapse-body-1-1" aria-expanded="false" aria-controls="accordion-collapse-body--1">
-                    <td class="legend-info">vegan</td>
+                                                        <span>Preise + Kennzeichnungen</span>
-                </tr>
+                                                        <img class="w-12px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/plus-cyan.svg" width="12" height="12" alt="" />
-                <tr>
+                                                    </button>
-                    <td class="wunsch-vegan legend"></td>
+                                                </h4>
-                    <td class="legend-info">auf Wunsch vegan</td>
+
-                </tr>
+                                                <div id="accordion-collapse-body-1-1" class="hidden" aria-labelledby="accordion-collapse-heading-1-1">
-            </table>
+                                                    <dl class="text-14px mb-20px">
-        </div>
+                                                        <div class="flex items-end justify-between">
-        <div class="col-sm-4 pt-3">
+                                                            <dt class="price-studierende">Studierende, Schüler</dt>
-            <div class="hide-with-allergenes">
+                                                            <dd>3,45 €</dd>
-                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=4de091579c564e42f79473da2701f179"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
+                                                        </div>
-                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=84edf4562bdc95f103b70ef99e4d7af6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
+                                                        <div class="flex items-end justify-between">
-            </div>
+                                                            <dt class="price-mitarbeiter">Beschäftigte</dt>
-            <div class="show-with-allergenes">
+                                                            <dd>4,75 €</dd>
-                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=51f0f1e0083f9ef48038920dfb676eb6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
+                                                        </div>
-                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=c3a9d1eafce78d8f8d281c6060be989c"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
+                                                        <div class="flex items-end justify-between">
-            </div>
+                                                            <dt class="price-gaeste">Gäste</dt>
-        </div>
+                                                            <dd>6,90 €</dd>
-        <div class="col-sm-4 pt-3">
+                                                        </div>
-            <p class="hide-with-allergenes"><a href="#" data-toggle="modal" data-target="#allergenesModal"><i class="fas fa-redo-alt"></i> Allergiehinweise anzeigen</a></p>
+                                                    </dl>
-            <p class="show-with-allergenes"><a href="#" class="btn-hide-allergenes"><i class="fas fa-undo-alt"></i> Allergiehinweise verbergen</a></p>
+                                                    <small class="zusatzsstoffe" x-show="!showAllergenes">Kennzeichnungen/Zusatzstoffe:<br>5</small>
-        </div>
+                                                    
-    </div>
+                                                            <small class="zusatzsstoffe" x-show="showAllergenes">Kennzeichnungen/Zusatzstoffe:<br> 5<br>enthält Allergene: ML,GlW,Gl,Ei,Se</small>
-    <div class="tab-content">
+                                                        
-        <div id="tab-mon" class="menu-tagesplan tab-pane fade">
+                                                </div>
-            <h3>Montag 09.03.</h3>
+                                            </div>
-            <div class="row vegetarisch mb-2">
+
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
+                                        </div>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                                    </div>
-                    Kartoffel-Frischkäsebratling
+                                
-                    <br>Gemüseragout Toskana
+                                    <div class="col-span-1 bg-lighter-cyan py-20px px-15px flex flex-col">
-                    <br>Beilagensalat
+                                        <div class="flex justify-between">
-                    <br><span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Se,Gl,GlW,ML</span></div>
+                                            <h5>Essen 2</h5>
-                <div class="col-md-4 col-sm-4 menu-price">
+                                            
-                    <table class="table-sm">
+                                        </div>
-                        <tr>
+                                        <small class="extra-text mb-15px">Grönsaksbullar -Gemüsebällchen oder<br>Köttbullar<br>Pfeffer-Rahmsauce<br>Blumenkohl-Kartoffelpüree<br>Beilagensalat oder Regio-Apfel</small>
-                            <td class="price-studierende">Studierende, Schüler</td>
+                                        <div class="border-t-1px border-light-cyan w-full pt-15px mt-15px flex justify-between">
-                            <td>3,05 €</td>
+                                            <div id="accordion-collapse-1-2" class="w-full" data-accordion="collapse" data-active-classes="bg-primary-cyan text-white" data-inactive-classes="text-primary-cyan">
-                        </tr>
+                                                <h4 id="accordion-collapse-heading-1-2">
-                        <tr>
+                                                    <button type="button" class="text-14px text-left extra-text text-primary-cyan flex items-center justify-between w-full" data-accordion-target="#accordion-collapse-body-1-2" aria-expanded="false" aria-controls="accordion-collapse-body--1">
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                                                        <span>Preise + Kennzeichnungen</span>
-                            <td>4,00 €</td>
+                                                        <img class="w-12px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/plus-cyan.svg" width="12" height="12" alt="" />
-                        </tr>
+                                                    </button>
-                        <tr>
+                                                </h4>
-                            <td class="price-gaeste">Gäste</td>
+
-                            <td>5,40 €</td>
+                                                <div id="accordion-collapse-body-1-2" class="hidden" aria-labelledby="accordion-collapse-heading-1-2">
-                        </tr>
+                                                    <dl class="text-14px mb-20px">
-                    </table>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-studierende">Studierende, Schüler</dt>
+                                                            <dd>3,45 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-mitarbeiter">Beschäftigte</dt>
+                                                            <dd>4,75 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-gaeste">Gäste</dt>
+                                                            <dd>6,90 €</dd>
+                                                        </div>
+                                                    </dl>
+                                                    <small class="zusatzsstoffe" x-show="!showAllergenes">Kennzeichnungen/Zusatzstoffe:<br>5,sch,ri,4</small>
+                                                    
+                                                            <small class="zusatzsstoffe" x-show="showAllergenes">Kennzeichnungen/Zusatzstoffe:<br> 5,sch,ri,4<br>enthält Allergene: ML,GlW,Gl,Ei</small>
+                                                        
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                            </div>
+                        
                 </div>
-            </div>
+            
-            <div class="row grey lighten-4 mb-2">
+                <div id="tab-tue" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-tue" x-show="currentDay == 2">
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
+                    <h3>Dienstag 20.12.</h3>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+
-                    Schweineschnitzel Wiener Art
+                    
-                    <br>Bratensauce
+
-                    <br>Pommes frites
+                    
-                    <br>Mixsalat
+                            <div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 gap-y-30px md:gap-30px mb-30px">
-                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch<br>enthält Allergene: Gl,GlW,GlG</span></div>
+
-                <div class="col-md-4 col-sm-4 menu-price">
+                                
-                    <table class="table-sm">
+
-                        <tr>
+
-                            <td class="price-studierende">Studierende, Schüler</td>
+                                
-                            <td>3,05 €</td>
+                                    <div class="col-span-1 bg-lighter-cyan py-20px px-15px flex flex-col">
-                        </tr>
+                                        <div class="flex justify-between">
-                        <tr>
+                                            <h5>Essen 1</h5>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                                            
-                            <td>4,00 €</td>
+                                                    <img class="w-30px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/vegetarisch.svg" width="27" height="27" alt="" />
-                        </tr>
+                                                
-                        <tr>
+                                        </div>
-                            <td class="price-gaeste">Gäste</td>
+                                        <small class="extra-text mb-15px">Brokkoli-Nussecken<br>Rotweinsauce<br>Kartoffel-Kürbispüree<br>Apfelrotkraut<br>Feldsalat</small>
-                            <td>5,40 €</td>
+                                        <div class="border-t-1px border-light-cyan w-full pt-15px mt-15px flex justify-between">
-                        </tr>
+                                            <div id="accordion-collapse-2-1" class="w-full" data-accordion="collapse" data-active-classes="bg-primary-cyan text-white" data-inactive-classes="text-primary-cyan">
-                    </table>
+                                                <h4 id="accordion-collapse-heading-2-1">
+                                                    <button type="button" class="text-14px text-left extra-text text-primary-cyan flex items-center justify-between w-full" data-accordion-target="#accordion-collapse-body-2-1" aria-expanded="false" aria-controls="accordion-collapse-body--2">
+                                                        <span>Preise + Kennzeichnungen</span>
+                                                        <img class="w-12px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/plus-cyan.svg" width="12" height="12" alt="" />
+                                                    </button>
+                                                </h4>
+
+                                                <div id="accordion-collapse-body-2-1" class="hidden" aria-labelledby="accordion-collapse-heading-2-1">
+                                                    <dl class="text-14px mb-20px">
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-studierende">Studierende, Schüler</dt>
+                                                            <dd>3,45 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-mitarbeiter">Beschäftigte</dt>
+                                                            <dd>4,75 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-gaeste">Gäste</dt>
+                                                            <dd>6,90 €</dd>
+                                                        </div>
+                                                    </dl>
+                                                    <small class="zusatzsstoffe" x-show="!showAllergenes">Kennzeichnungen/Zusatzstoffe:<br>5</small>
+                                                    
+                                                            <small class="zusatzsstoffe" x-show="showAllergenes">Kennzeichnungen/Zusatzstoffe:<br> 5<br>enthält Allergene: GlW,GlH,ML,NM,Gl,Sf,Se,Nu,NH</small>
+                                                        
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                
+                                    <div class="col-span-1 bg-lighter-cyan py-20px px-15px flex flex-col">
+                                        <div class="flex justify-between">
+                                            <h5>Essen 2</h5>
+                                            
+                                        </div>
+                                        <small class="extra-text mb-15px">Weihnachtsessen<br>Hirschgulasch<br>Rotweinsauce<br>Bauernspätzle<br>Apfelrotkraut<br>Feldsalat</small>
+                                        <div class="border-t-1px border-light-cyan w-full pt-15px mt-15px flex justify-between">
+                                            <div id="accordion-collapse-2-2" class="w-full" data-accordion="collapse" data-active-classes="bg-primary-cyan text-white" data-inactive-classes="text-primary-cyan">
+                                                <h4 id="accordion-collapse-heading-2-2">
+                                                    <button type="button" class="text-14px text-left extra-text text-primary-cyan flex items-center justify-between w-full" data-accordion-target="#accordion-collapse-body-2-2" aria-expanded="false" aria-controls="accordion-collapse-body--2">
+                                                        <span>Preise + Kennzeichnungen</span>
+                                                        <img class="w-12px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/plus-cyan.svg" width="12" height="12" alt="" />
+                                                    </button>
+                                                </h4>
+
+                                                <div id="accordion-collapse-body-2-2" class="hidden" aria-labelledby="accordion-collapse-heading-2-2">
+                                                    <dl class="text-14px mb-20px">
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-studierende">Studierende, Schüler</dt>
+                                                            <dd>3,45 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-mitarbeiter">Beschäftigte</dt>
+                                                            <dd>4,75 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-gaeste">Gäste</dt>
+                                                            <dd>6,90 €</dd>
+                                                        </div>
+                                                    </dl>
+                                                    <small class="zusatzsstoffe" x-show="!showAllergenes">Kennzeichnungen/Zusatzstoffe:<br>5</small>
+                                                    
+                                                            <small class="zusatzsstoffe" x-show="showAllergenes">Kennzeichnungen/Zusatzstoffe:<br> 5<br>enthält Allergene: Ei,Gl,GlW,ML,Sf</small>
+                                                        
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                            </div>
+                        
                 </div>
-            </div>
+            
-            <div class="row grey lighten-4 mb-2">
+                <div id="tab-wed" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-wed" x-show="currentDay == 3">
-                <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
+                    <h3>Mittwoch 21.12.</h3>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+
-                    Grill und Salatbar
+                    
-                    <br>Asiatisches aus dem Wok
+
-                    <br>Fleisch- und Fischspezialitäten
+                    
-                    <br>Pasta-, Reis und Kartoffelvariationen
+                            <div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 gap-y-30px md:gap-30px mb-30px">
-                    <br>Gemüse
+
-                    <br>
+                                
+
+
+                                
+                                    <div class="col-span-1 bg-lighter-cyan py-20px px-15px flex flex-col">
+                                        <div class="flex justify-between">
+                                            <h5>Essen 1</h5>
+                                            
+                                                    <img class="w-30px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/vegetarisch.svg" width="27" height="27" alt="" />
+                                                
+                                        </div>
+                                        <small class="extra-text mb-15px">Gemüsenuggets<br>Mojo Dip<br>Gitterkartoffeln<br>Beilagensalat oder Regio-Apfel</small>
+                                        <div class="border-t-1px border-light-cyan w-full pt-15px mt-15px flex justify-between">
+                                            <div id="accordion-collapse-3-1" class="w-full" data-accordion="collapse" data-active-classes="bg-primary-cyan text-white" data-inactive-classes="text-primary-cyan">
+                                                <h4 id="accordion-collapse-heading-3-1">
+                                                    <button type="button" class="text-14px text-left extra-text text-primary-cyan flex items-center justify-between w-full" data-accordion-target="#accordion-collapse-body-3-1" aria-expanded="false" aria-controls="accordion-collapse-body--3">
+                                                        <span>Preise + Kennzeichnungen</span>
+                                                        <img class="w-12px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/plus-cyan.svg" width="12" height="12" alt="" />
+                                                    </button>
+                                                </h4>
+
+                                                <div id="accordion-collapse-body-3-1" class="hidden" aria-labelledby="accordion-collapse-heading-3-1">
+                                                    <dl class="text-14px mb-20px">
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-studierende">Studierende, Schüler</dt>
+                                                            <dd>3,45 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-mitarbeiter">Beschäftigte</dt>
+                                                            <dd>4,75 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-gaeste">Gäste</dt>
+                                                            <dd>6,90 €</dd>
+                                                        </div>
+                                                    </dl>
+                                                    <small class="zusatzsstoffe" x-show="!showAllergenes">Kennzeichnungen/Zusatzstoffe:<br>5</small>
+                                                    
+                                                            <small class="zusatzsstoffe" x-show="showAllergenes">Kennzeichnungen/Zusatzstoffe:<br> 5<br>enthält Allergene: GlW,GlG,Gl,ML</small>
+                                                        
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                
+                                    <div class="col-span-1 bg-lighter-cyan py-20px px-15px flex flex-col">
+                                        <div class="flex justify-between">
+                                            <h5>Essen 2</h5>
+                                            
+                                                    <img class="w-30px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/vegan.svg" width="27" height="27" alt="" />
+                                                
+                                        </div>
+                                        <small class="extra-text mb-15px">Gebratener Gemüsereis Nasi Goreng<br>Bio Tofu-Erdnusswürfel<br>Beilagensalat oder Regio-Apfel</small>
+                                        <div class="border-t-1px border-light-cyan w-full pt-15px mt-15px flex justify-between">
+                                            <div id="accordion-collapse-3-2" class="w-full" data-accordion="collapse" data-active-classes="bg-primary-cyan text-white" data-inactive-classes="text-primary-cyan">
+                                                <h4 id="accordion-collapse-heading-3-2">
+                                                    <button type="button" class="text-14px text-left extra-text text-primary-cyan flex items-center justify-between w-full" data-accordion-target="#accordion-collapse-body-3-2" aria-expanded="false" aria-controls="accordion-collapse-body--3">
+                                                        <span>Preise + Kennzeichnungen</span>
+                                                        <img class="w-12px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/plus-cyan.svg" width="12" height="12" alt="" />
+                                                    </button>
+                                                </h4>
+
+                                                <div id="accordion-collapse-body-3-2" class="hidden" aria-labelledby="accordion-collapse-heading-3-2">
+                                                    <dl class="text-14px mb-20px">
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-studierende">Studierende, Schüler</dt>
+                                                            <dd>3,45 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-mitarbeiter">Beschäftigte</dt>
+                                                            <dd>4,75 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-gaeste">Gäste</dt>
+                                                            <dd>6,90 €</dd>
+                                                        </div>
+                                                    </dl>
+                                                    <small class="zusatzsstoffe" x-show="!showAllergenes">Kennzeichnungen/Zusatzstoffe:<br>o</small>
+                                                    
+                                                            <small class="zusatzsstoffe" x-show="showAllergenes">Kennzeichnungen/Zusatzstoffe:<br> o<br>enthält Allergene: Gl,GlW,Se,Sf,So,Sn</small>
+                                                        
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                            </div>
+                        
                 </div>
-                <div class="col-md-4 col-sm-4 menu-price">
+            
-                    <table class="table-sm">
+                <div id="tab-thu" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-thu" x-show="currentDay == 4">
-                        <tr>
+                    <h3>Donnerstag 22.12.</h3>
-                            <td class="price-studierende">Studierende, Schüler</td>
+
-                            <td>0,90 €<span class="tara"> / 100g</span></td>
+                    
-                        </tr>
+
-                        <tr>
+                    
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 gap-y-30px md:gap-30px mb-30px">
-                            <td>1,10 €<span class="tara"> / 100g</span></td>
+
-                        </tr>
+                                
-                        <tr>
+
-                            <td class="price-gaeste">Gäste</td>
+
-                            <td>1,30 €<span class="tara"> / 100g</span></td>
+                                
-                        </tr>
+                                    <div class="col-span-1 bg-lighter-cyan py-20px px-15px flex flex-col">
-                    </table>
+                                        <div class="flex justify-between">
+                                            <h5>Essen 1</h5>
+                                            
+                                                    <img class="w-30px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/vegan.svg" width="27" height="27" alt="" />
+                                                
+                                        </div>
+                                        <small class="extra-text mb-15px">Schupfnudel-Gemüsepfanne<br>Weiße Sauce<br>Beilagensalat oder Regio-Apfel</small>
+                                        <div class="border-t-1px border-light-cyan w-full pt-15px mt-15px flex justify-between">
+                                            <div id="accordion-collapse-4-1" class="w-full" data-accordion="collapse" data-active-classes="bg-primary-cyan text-white" data-inactive-classes="text-primary-cyan">
+                                                <h4 id="accordion-collapse-heading-4-1">
+                                                    <button type="button" class="text-14px text-left extra-text text-primary-cyan flex items-center justify-between w-full" data-accordion-target="#accordion-collapse-body-4-1" aria-expanded="false" aria-controls="accordion-collapse-body--4">
+                                                        <span>Preise + Kennzeichnungen</span>
+                                                        <img class="w-12px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/plus-cyan.svg" width="12" height="12" alt="" />
+                                                    </button>
+                                                </h4>
+
+                                                <div id="accordion-collapse-body-4-1" class="hidden" aria-labelledby="accordion-collapse-heading-4-1">
+                                                    <dl class="text-14px mb-20px">
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-studierende">Studierende, Schüler</dt>
+                                                            <dd>3,45 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-mitarbeiter">Beschäftigte</dt>
+                                                            <dd>4,75 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-gaeste">Gäste</dt>
+                                                            <dd>6,90 €</dd>
+                                                        </div>
+                                                    </dl>
+                                                    
+                                                    
+                                                            <small class="zusatzsstoffe" x-show="showAllergenes">enthält Allergene:<br> Gl,GlW,Se,So</small>
+                                                        
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                
+                                    <div class="col-span-1 bg-lighter-cyan py-20px px-15px flex flex-col">
+                                        <div class="flex justify-between">
+                                            <h5>Essen 2</h5>
+                                            
+                                        </div>
+                                        <small class="extra-text mb-15px">Fischragout<br>Bandnudeln<br>Buntes Marktgemüse</small>
+                                        <div class="border-t-1px border-light-cyan w-full pt-15px mt-15px flex justify-between">
+                                            <div id="accordion-collapse-4-2" class="w-full" data-accordion="collapse" data-active-classes="bg-primary-cyan text-white" data-inactive-classes="text-primary-cyan">
+                                                <h4 id="accordion-collapse-heading-4-2">
+                                                    <button type="button" class="text-14px text-left extra-text text-primary-cyan flex items-center justify-between w-full" data-accordion-target="#accordion-collapse-body-4-2" aria-expanded="false" aria-controls="accordion-collapse-body--4">
+                                                        <span>Preise + Kennzeichnungen</span>
+                                                        <img class="w-12px" src="/typo3conf/ext/speiseplan/Resources/Public/Images/plus-cyan.svg" width="12" height="12" alt="" />
+                                                    </button>
+                                                </h4>
+
+                                                <div id="accordion-collapse-body-4-2" class="hidden" aria-labelledby="accordion-collapse-heading-4-2">
+                                                    <dl class="text-14px mb-20px">
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-studierende">Studierende, Schüler</dt>
+                                                            <dd>3,45 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-mitarbeiter">Beschäftigte</dt>
+                                                            <dd>4,75 €</dd>
+                                                        </div>
+                                                        <div class="flex items-end justify-between">
+                                                            <dt class="price-gaeste">Gäste</dt>
+                                                            <dd>6,90 €</dd>
+                                                        </div>
+                                                    </dl>
+                                                    <small class="zusatzsstoffe" x-show="!showAllergenes">Kennzeichnungen/Zusatzstoffe:<br>nF</small>
+                                                    
+                                                            <small class="zusatzsstoffe" x-show="showAllergenes">Kennzeichnungen/Zusatzstoffe:<br> nF<br>enthält Allergene: Se,ML,GlW,Gl,Ei,Fi</small>
+                                                        
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                                    <div class="hidden xl:block xl:col-span-1 bg-lighter-green"></div>
+                                
+                            </div>
+                        
                 </div>
-            </div>
+            
-        </div>
+                <div id="tab-fri" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-fri" x-show="currentDay == 5">
-        <div id="tab-tue" class="menu-tagesplan tab-pane fade in show active">
+                    <h3>Freitag 23.12.</h3>
-            <h3>Dienstag 10.03.</h3>
+
-            <div class="row wunsch-vegan mb-2">
+                    
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
+
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    
-                    Tortellini mit Gemüsefüllung
+                            <div class="row row-narrow row-buffer row-table">
-                    <br>Tomatensauce
+                                <div class="col-md-1 bg-beige-hell zusatzangaben">
-                    <br>Geriebener Hartkäse
+                                    <i class="glyphicons glyphicons-circle-info"></i>
-                    <br>Beilagensalat
+                                </div>
-                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 6</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 6<br>enthält Allergene: Ei,Se,Gl,GlW,ML</span></div>
+                                <div class="col-md-11 border-beige-hell">
-                <div class="col-md-4 col-sm-4 menu-price">
+                                    <h4>heute keine Essensausgabe</h4>
-                    <table class="table-sm">
+                                </div>
-                        <tr>
+                            </div>
-                            <td class="price-studierende">Studierende, Schüler</td>
+                        
-                            <td>3,05 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>4,00 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>5,40 €</td>
-                        </tr>
-                    </table>
                 </div>
-            </div>
+            
-            <div class="row grey lighten-4 mb-2">
+                <div id="tab-sat" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-sat" x-show="currentDay == 6">
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
+                    <h3>Samstag 24.12.</h3>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+
-                    Frikadelle
+                    
-                    <br>Champignon-Rahmsauce
+
-                    <br>Bauernspätzle
+                    
-                    <br>Blattsalat
+                            <div class="row row-narrow row-buffer row-table">
-                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,ri</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,ri<br>enthält Allergene: Ei,Gl,GlW,GlG,ML</span></div>
+                                <div class="col-md-1 bg-beige-hell zusatzangaben">
-                <div class="col-md-4 col-sm-4 menu-price">
+                                    <i class="glyphicons glyphicons-circle-info"></i>
-                    <table class="table-sm">
+                                </div>
-                        <tr>
+                                <div class="col-md-11 border-beige-hell">
-                            <td class="price-studierende">Studierende, Schüler</td>
+                                    <h4>heute keine Essensausgabe</h4>
-                            <td>3,05 €</td>
+                                </div>
-                        </tr>
+                            </div>
-                        <tr>
+                        
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>4,00 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>5,40 €</td>
-                        </tr>
-                    </table>
                 </div>
-            </div>
+            
-            <div class="row grey lighten-4 mb-2">
+        </div>
-                <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Grill und Salatbar
-                    <br>Asiatisches aus dem Wok
-                    <br>Fleisch- und Fischspezialitäten
-                    <br>Pasta-, Reis und Kartoffelvariationen
-                    <br>Gemüse
-                    <br>
-                </div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table-sm">
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,90 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,10 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>1,30 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </div>
-        <div id="tab-wed" class="menu-tagesplan tab-pane fade">
-            <h3>Mittwoch 11.03.</h3>
-            <div class="row wunsch-vegan mb-2">
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Gebratener Gemüsereis Nasi Goreng
-                    <br>Raita
-                    <br>Mixsalat
-                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5<br>enthält Allergene: So,Sn,Se,Gl,GlW,ML</span></div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table-sm">
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>3,05 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>4,00 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>5,40 €</td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-            <div class="row grey lighten-4 mb-2">
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Kalbsbratwurst
-                    <br>Bratensauce
-                    <br>Kartoffelbrei
-                    <br>Apfelrotkraut
-                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,5,6,8,ri</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,5,6,8,ri<br>enthält Allergene: Sn,Se,Sf,Gl,GlW,GlG,ML</span></div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table-sm">
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>3,05 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>4,00 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>5,40 €</td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-            <div class="row grey lighten-4 mb-2">
-                <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Grill und Salatbar
-                    <br>Asiatisches aus dem Wok
-                    <br>Fleisch- und Fischspezialitäten
-                    <br>Pasta-, Reis und Kartoffelvariationen
-                    <br>Gemüse
-                    <br>
-                </div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table-sm">
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,90 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,10 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>1,30 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </div>
-        <div id="tab-thu" class="menu-tagesplan tab-pane fade">
-            <h3>Donnerstag 12.03.</h3>
-            <div class="row vegetarisch mb-2">
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Spaghetti
-                    <br>Chinagemüse
-                    <br>Sauce süß-sauer
-                    <br>Geriebener Hartkäse
-                    <br>Mixsalat
-                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5,6</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5,6<br>enthält Allergene: Ei,Sn,Se,Sf,Gl,GlW,GlG,ML</span></div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table-sm">
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>3,05 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>4,00 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>5,40 €</td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-            <div class="row grey lighten-4 mb-2">
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Paniertes Seelachsfilet
-                    <br>Sesam-Mayonnaise
-                    <br>Salzkartoffeln
-                    <br>Karottenmix mit Brokkoli und Bohnen
-                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: nF</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: nF<br>enthält Allergene: Ei,Sn,Fi,Sa,Gl,GlW</span></div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table-sm">
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>3,05 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>4,00 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>5,40 €</td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-            <div class="row grey lighten-4 mb-2">
-                <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Grill und Salatbar
-                    <br>Asiatisches aus dem Wok
-                    <br>Fleisch- und Fischspezialitäten
-                    <br>Pasta-, Reis und Kartoffelvariationen
-                    <br>Gemüse
-                    <br>
-                </div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table-sm">
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,90 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,10 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>1,30 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </div>
-        <div id="tab-fri" class="menu-tagesplan tab-pane fade">
-            <h3>Freitag 13.03.</h3>
-            <div class="row vegetarisch mb-2">
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Kartoffel-Gorgonzolagratin
-                    <br>Brokkoligemüse
-                    <br>Beilagensalat
-                    <br><span class="zusatzsstoffe show-with-allergenes">enthält Allergene: ML</span></div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table-sm">
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>3,05 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>4,00 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>5,40 €</td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-            <div class="row grey lighten-4 mb-2">
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Hähnchenbrustfilet
-                    <br>Apfel-Rahmsauce
-                    <br>Mandelreis
-                    <br>Karottengemüse
-                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5<br>enthält Allergene: Gl,GlW,GlG,Nu,NM,ML</span></div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table-sm">
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>3,05 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>4,00 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>5,40 €</td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-            <div class="row grey lighten-4 mb-2">
-                <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
-                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Grill und Salatbar
-                    <br>Asiatisches aus dem Wok
-                    <br>Fleisch- und Fischspezialitäten
-                    <br>Pasta-, Reis und Kartoffelvariationen
-                    <br>Gemüse
-                    <br>
-                </div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table-sm">
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,90 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,10 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>1,30 €<span class="tara"> / 100g</span></td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </div>
-        <div id="tab-sat" class="menu-tagesplan tab-pane fade">
-            <h3>Samstag 14.03.</h3>
-            <div class="row row-narrow row-buffer row-table">
-                <div class="col-md-1 bg-beige-hell zusatzangaben"><i class="glyphicons glyphicons-circle-info"></i></div>
-                <div class="col-md-11 border-beige-hell">
-                    <h4>heute keine Essensausgabe</h4></div>
-            </div>
-        </div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-sm-6">
-        <h4 class="grau">Kennzeichnungen/Zusatzstoffe</h4>
-        <dl class="dl-horizontal menu-zusatzstoffe grau"><dt>nF</dt>
-            <dd>aus nachhaltigem Fischfang</dd><dt>ri</dt>
-            <dd>mit Rindfleisch</dd><dt>sch</dt>
-            <dd>mit Schwein</dd><dt>4</dt>
-            <dd>mit Farbstoff</dd><dt>5</dt>
-            <dd>mit Antioxidationsmittel</dd><dt>6</dt>
-            <dd>mit Konservierungsstoff</dd><dt>8</dt>
-            <dd>mit Phosphat</dd>
-        </dl>
-    </div>
-    <div class="col-sm-6 show-with-allergenes"><div id="c5219" class="csc-default ortsfilter-show ">
-        <h4 class="grau">Allergene</h4>
-        <dl class="dl-horizontal menu-zusatzstoffe grau"><dt>Ei</dt>
-            <dd>Eier</dd><dt>Fi</dt>
-            <dd>Fisch</dd><dt>Gl</dt>
-            <dd>GLUTENHALTIGES Getreide</dd><dt>GlG</dt>
-            <dd>Gerste</dd><dt>GlH</dt>
-            <dd>Hafer</dd><dt>GlW</dt>
-            <dd>Weizen</dd><dt>ML</dt>
-            <dd>Milch /-erzeugnisse</dd><dt>NM</dt>
-            <dd>Mandel</dd><dt>Nu</dt>
-            <dd>SCHALENFRÜCHTE/Nüsse</dd><dt>Sa</dt>
-            <dd>Sesam</dd><dt>Se</dt>
-            <dd>Sellerie</dd><dt>Sf</dt>
-            <dd>Schwefeldioxid/Sulfite</dd><dt>Sn</dt>
-            <dd>Senf</dd><dt>So</dt>
-            <dd>Soja</dd>
-        </dl>
-    </div>
-    </div>
-    <!-- Modal -->
-    <div class="modal fade" id="allergenesModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 class="modal-title" id="myModalLabel">Allergikerspeiseplan</h4>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                </div>
-                <div class="modal-body">
-                    <p>Die Angaben über die Inhaltsstoffe der Speisen beruhen auf Rezepturen, einzelnen Zutaten und den Informationen, die wir von den Herstellern und Lieferanten der einzelnen Speisezutaten erhalten. Da die Hersteller selten nur ein Produkt herstellen und vertreiben, kann nie ganz ausgeschlossen werden, dass auch Anteile von nicht aufgeführten Inhaltsstoffen in den Produkten enthalten sind.</p>
-                    <p>Des Weiteren bringt es die handwerkliche Verarbeitung und Behandlung von Lebensmitteln in Großküchen mit sich, dass bei der Zusammenführung der verschiedenen Speisekomponenten eine ungewollte Vermischung auftreten kann und damit verbunden, der Übergang geringer Mengen von weiteren Stoffen, die Allergien und Unverträglichkeiten auslösen können. Diese Spuren sind in der Kennzeichnung nicht berücksichtigt.</p>
-                    <p>Aus diesem Grund müssen Allergiker/innen beachten, dass in den angebotenen Speisen neben den gekennzeichneten noch weitere allergieauslösende Inhaltsstoffe enthalten sein können. Das Studierendenwerk Freiburg schließt daher jegliche Haftung aufgrund von nicht rezeptürlichen Bestandteilen der Speisen aus. </p>
-                    <p>Bitte beachten Sie beim Wochenplan: Die Allergenkennzeichnung kann sich bis zum Ausgabetag ändern, Richtigkeit wird nur im aktuellen Tagesplan gewährleistet.</p>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
-                    <button type="button" class="btn btn-primary btn-show-allergenes">Ich habe die Nutzungsbedingungen verstanden und möchte den Allergikerspeiseplan sehen.</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>