update libraries

* spring boot 2.5.5 -> 2.6.6 * kotlin 1.5.31 -> 1.6.20 * coroutines 1.5.2 -> 1.6.1 * gson 2.8.8 -> 2.9.0 * gradle wrapper 7.2 -> 7.4.2
Merge pull request 'Fix CacheController lookup' (#23 ) from fix/cache-controller into master
2022-04-08 14:54:06 +02:00 · 2022-01-14 18:46:24 +01:00 · 2022-01-14 15:42:25 +01:00 · 2021-10-31 22:09:12 +01:00 · 2021-10-24 15:00:13 +02:00 · 2021-10-24 14:39:22 +02:00
27 changed files with 2535 additions and 729 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,9 +0,0 @@
-kind: pipeline
-name: default
-
-steps:
- name: test
-  image: gradle:jdk11
-  commands:
-  - gradle test
-
--- a/.woodpecker.yml
+++ b/.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
--- a/8
+++ b/8
@ -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
--- a/README.md
+++ b/README.md
@ -1,4 +1,5 @@
-[![Build Status](https://drone.mosad.xyz/api/badges/Seil0/TheCitadelofRicks/status.svg)](https://drone.mosad.xyz/Seil0/TheCitadelofRicks)
+![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://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
--- a/build.gradle
+++ b/build.gradle
@ -1,52 +1,46 @@
-
-buildscript {
-    ext.kotlin_version = '1.3.61'
-    ext.spring_boot_version = '2.1.11.RELEASE'
-
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
-        classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_version"
-    }
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.6.20'
+    id 'org.jetbrains.kotlin.plugin.spring' version '1.6.20'
+    id 'org.springframework.boot' version '2.6.6'
+    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 }

-apply plugin: 'kotlin'
-apply plugin: 'kotlin-spring'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
+group 'org.mosad'
+version '1.3.1'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
+    implementation 'org.jsoup:jsoup:1.14.3'
+    implementation 'com.google.code.gson:gson:2.9.0'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
+}

 test {
    useJUnitPlatform()

    testLogging {
-        events "PASSED", "FAILED", "SKIPPED"
+        events 'PASSED', 'FAILED', 'SKIPPED'
    }
 }

-repositories {
-    jcenter()
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3"
-    implementation "org.jsoup:jsoup:1.12.1"
-    implementation "org.springframework.boot:spring-boot-starter-web"
-    implementation "com.google.code.gson:gson:2.8.6"
-
-    testImplementation("org.junit.jupiter:junit-jupiter:5.5.1")
-}
-
+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
 }
-
-group 'org.mosad'
-version '1.2.1'
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/270
+++ b/270
@ -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"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 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
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | 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,84 +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
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        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=$((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" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --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
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    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" "$@"
--- a/gradlew.bat
+++ b/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
--- a/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/APIController.kt
@ -30,9 +30,9 @@ import org.mosad.thecitadelofricks.controller.CacheController.Companion.getTimet
 import org.mosad.thecitadelofricks.controller.CacheController.Companion.mensaMenu
 import org.mosad.thecitadelofricks.controller.StartupController
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.getStatus
+import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateCourseListRequests
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateMensaMenuRequests
 import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateTimetableRequests
-import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateTotalRequests
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.RequestMapping
@ -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.1.4"
-        const val softwareVersion = "1.2.1"
+        const val apiVersion = "1.3.0"
+        const val softwareVersion = "1.3.1"
        val startTime = System.currentTimeMillis() / 1000
    }

@ -57,57 +58,49 @@ class APIController {
        CacheController()
    }

-    // TODO remove this with API version 2.0.0
-    @Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()"))
-    @RequestMapping("/courses")
-    fun courses(): CourseList {
-        return courseList()
-    }
-
    @RequestMapping("/courseList")
-    fun courseList(): CourseList {
+    fun courseList(): CoursesListRet {
        logger.info("courseList request at ${LocalDateTime.now()}!")
-        updateTotalRequests()
-        return courseList
+        updateCourseListRequests()
+
+        return CoursesListRet(courseList.meta, ArrayList(courseList.courses.values))
    }

    @RequestMapping("/mensamenu")
    fun mensamenu(): MensaMenu {
        logger.info("mensamenu request at ${LocalDateTime.now()}!")
-        updateTotalRequests()
        updateMensaMenuRequests()
        return mensaMenu
    }

    @RequestMapping("/timetable")
    fun timetable(
-        @RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
+        @RequestParam(value = "course", defaultValue = "AI4") courseName: String,
        @RequestParam(value = "week", defaultValue = "0") week: Int
    ): TimetableCourseWeek {
        logger.info("timetable request at ${LocalDateTime.now()}!")
-        updateTotalRequests()
        updateTimetableRequests(courseName)
        return getTimetable(courseName, week)
    }

-    @RequestMapping("/lessonSubjectList")
+    @RequestMapping("/subjectList")
    fun lessonSubjectList(
-        @RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
+        @RequestParam(value = "course", defaultValue = "AI4") courseName: String,
        @RequestParam(value = "week", defaultValue = "0") week: Int
    ): HashSet<String> {
-        logger.info("lessonSubjectList request at ${LocalDateTime.now()}!")
-        updateTotalRequests()
+        logger.info("subjectList request at ${LocalDateTime.now()}!")
+        updateTimetableRequests(courseName)
        return getLessonSubjectList(courseName, week)
    }

    @RequestMapping("/lessons")
    fun lesson(
-        @RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
-        @RequestParam(value = "lessonSubject", defaultValue = "Mathematik 4") lessonSubject: String,
+        @RequestParam(value = "course", defaultValue = "AI4") courseName: String,
+        @RequestParam(value = "subject", defaultValue = "Mathematik 4") lessonSubject: String,
        @RequestParam(value = "week", defaultValue = "0") week: Int
    ): ArrayList<Lesson> {
        logger.info("lesson request at ${LocalDateTime.now()}!")
-        updateTotalRequests()
+        updateTimetableRequests(courseName)
        return getLesson(courseName, lessonSubject, week)
    }

@ -123,4 +116,25 @@ class APIController {
        return 200
    }

+    /**
+     * Deprecated section
+     */
+
+    // TODO remove this with API version 2.0.0
+    @Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()"))
+    @RequestMapping("/courses")
+    fun courses(): CoursesListRet {
+        return courseList()
+    }
+
+    // TODO remove this with API version 2.0.0
+    @Deprecated("the parameter courseName is deprecated please use course", ReplaceWith("timetable(courseName, week)"))
+    @RequestMapping("/timetable", params= ["courseName", "week"])
+    fun timetableDep(
+        @RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
+        @RequestParam(value = "week", defaultValue = "0") week: Int
+    ): TimetableCourseWeek {
+       return timetable(courseName, week)
+    }
+
 }
--- a/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.kt
@ -24,13 +24,15 @@ package org.mosad.thecitadelofricks

 import java.time.LocalDateTime
 import java.util.*
+import kotlin.collections.HashMap

 // data classes for the course part
 data class Course(val courseName: String, val courseLink: String)

-data class CourseMeta(val updateTime: Long, val totalCourses: Int)
+data class CoursesMeta(val updateTime: Long = 0, val totalCourses: Int = 0)

-data class CourseList(val meta: CourseMeta, 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)
@ -44,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,
@ -56,22 +61,22 @@ 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,
    val uptime: String,
    val apiVersion: String,
    val softwareVersion: String,
-    val requestCount: Int,
+    val totalRequests: Int,
    val mensaMenuRequests: Int,
-    val timetableRequests: ArrayList<TimetableCounter>,
+    val courseListRequests: Int,
+    val timetableRequests: HashMap<String, Int>,
    val timetableListSize: Int,
    val coursesLastUpdate: Date,
    val mensaLastUpdate: Date,
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.kt
@ -23,82 +23,99 @@
 package org.mosad.thecitadelofricks.controller

 import com.google.gson.Gson
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.*
+import org.jsoup.Jsoup
 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.File
-import java.io.FileWriter
+import java.io.*
 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 {

-    private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
-
    init {
        initUpdates()
        scheduledUpdates()
    }

-    // cache objects
-    companion object{
+    companion object {
        private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)

-        lateinit var courseList: CourseList
-        lateinit var mensaMenu: MensaMenu
-        var timetableList = ArrayList<TimetableCourseWeek>() // this list contains all timetables
+        var courseList = CoursesList(CoursesMeta(), sortedMapOf())
+        var mensaMenu = MensaMenu(MensaMeta(0, ""), MensaWeek(), MensaWeek())
+        var timetableList = ConcurrentHashMap<String, TimetableCourseWeek>() // this list contains all timetables

        /**
-         * get a timetable, since they may not cached, we need to make sure it's cached, otherwise download
+         * get a timetable, since they may not be cached, we need to make sure it's cached, otherwise download
         * @param courseName the name of the course to be requested
         * @param weekIndex request week number (current week = 0)
         * @return timetable of the course (Type: [TimetableCourseWeek])
         */
-        fun getTimetable(courseName: String, weekIndex: Int): TimetableCourseWeek = runBlocking {
-            val currentTime = System.currentTimeMillis() / 1000
-            var timetable = TimetableWeek()
-            var weekNumberYear = 0
+        fun getTimetable(courseName: String, weekIndex: Int): TimetableCourseWeek {

-            // check if the timetable already exists and is up to date
-            when (timetableList.stream().filter { x -> x.meta.courseName == courseName && x.meta.weekIndex == weekIndex }.findAny().orElse(null)) {
-                // there is no such course yet, create one
-                null -> {
-                    val courseLink = courseList.courses.stream().filter { x -> x.courseName == courseName }.findFirst().orElse(null).courseLink
-                    val timetableLink = courseLink.replace("week=0","week=$weekIndex")
+            // TODO just for testing
+            if (courseName == "TEST_A" || courseName == "TEST_B") {
+                val currentTime = System.currentTimeMillis() / 1000
+                val timetableLink = "https://mosad.xyz"
+                val weekNumberYear = 0
+                val year = 0
+                val instr = CacheController::class.java.getResourceAsStream("/html/Timetable_normal-week.html")

-                    val jobTimetable = GlobalScope.async {
-                        timetable = TimetableParser().getTimeTable(timetableLink)
-                        weekNumberYear = TimetableParser().getWeekNumberYear(timetableLink)
-                    }
+                val timetableParser =
+                    TimetableParser(htmlDoc = Jsoup.parse(instr!!, "UTF-8", "https://www.hs-offenburg.de/"))
+                val timetableTest = timetableParser.parseTimeTable()

-                    jobTimetable.await()
-
-                    timetableList.add(
-                        TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink),
-                            timetable
-                        )
-                    )
-
-                    logger.info("added new timetable for $courseName, week $weekIndex")
-                }
+                return TimetableCourseWeek(
+                    TimetableCourseMeta(
+                        currentTime,
+                        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 }
+            }
        }

        /**
-         * get every explicit lesson in a week
+         * get every explicit lesson in a week for a selected course
         * @param courseName the name of the course to be requested
         * @param weekIndex request week number (current week = 0)
         * @return a HashSet of explicit lessons for one week
@ -133,146 +150,146 @@ class CacheController {

            return lessonList
        }
-    }

-    /**
-     * this function updates the courseList
-     * during the update process the old data will be returned for a API request
-     */
-    private fun asyncUpdateCourseList() = GlobalScope.launch {
-        CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
-            courseList = CourseList(
-                CourseMeta(System.currentTimeMillis() / 1000, it.size), it
-            )
-        }
+        // private cache functions

-        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
-     */
-    private fun asyncUpdateMensa() = GlobalScope.launch {
-        val mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
-        val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(StartupController.mensaMenuURL))
-
-        // only update if we get valid data
-        if (mensaCurrentWeek != null && mensaNextWeek != null) {
-            mensaMenu = MensaMenu(
-                MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek
-            )
-        }
-
-        logger.info("updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
-    }
-
-    /**
-     * this function updates all existing timetables
-     * during the update process the old data will be returned for a API request
-     * a FixedThreadPool is used to make parallel requests for faster updates
-     */
-    private fun asyncUpdateTimetables() = GlobalScope.launch {
-        logger.info("updating ${timetableList.size} timetables ...")
-
-        // create a new ThreadPool with 5 threads
-        val executor = Executors.newFixedThreadPool(5)
-
-        try {
-            timetableList.forEach { timetableCourse ->
-                executor.execute {
-                    timetableCourse.timetable = TimetableParser().getTimeTable(timetableCourse.meta.link)
-                    timetableCourse.meta.updateTime = System.currentTimeMillis() / 1000
-
-                    saveTimetableToCache(timetableCourse) // save the updated timetable to the cache directory
-                }
-
-            }
-        } catch (ex: Exception) {
-            logger.error("error while updating the timetables", ex)
-        } finally {
-            executor.shutdown()
-        }
-    }
-
-    /**
-     * save a timetable to the cache directory
-     * this is only call on async updates, it is NOT call when first getting the timetable
-     * @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()
-    }
-
-    /**
-     * before the APIController is up, get the data fist
-     * runBlocking: otherwise the api would return no data to requests for a few seconds after startup
-     */
-    private fun initUpdates() = runBlocking {
-        // get all courses on startup
-        val jobCourseUpdate = GlobalScope.async {
+        /**
+         * this function updates the courseList
+         * during the update process the old data will be returned for an API request
+         */
+        private fun asyncUpdateCourseList() = GlobalScope.launch {
            CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
-                courseList = CourseList(
-                    CourseMeta(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)}")
        }

-        // get the current and next weeks mensa menus
-        val jobMensa = GlobalScope.async{
+        /**
+         * this function updates the mensa menu list
+         * during the update process the old data will be returned for an API request
+         */
+        private fun asyncUpdateMensa() = GlobalScope.launch {
            val mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
            val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(StartupController.mensaMenuURL))

            // only update if we get valid data
            if (mensaCurrentWeek != null && mensaNextWeek != null) {
-                mensaMenu = MensaMenu(
-                    MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek
-                )
+                mensaMenu = MensaMenu(MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek)
+            }
+
+            logger.info("Updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
+        }
+
+        /**
+         * this function updates all existing timetables
+         * 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 {
+            logger.info("Updating ${timetableList.size} timetables ...")
+
+            // create a new ThreadPool with 5 threads
+            val executor = Executors.newFixedThreadPool(5)
+
+            try {
+                timetableList.forEach { timetableCourse ->
+                    executor.execute {
+                        val timetableParser = TimetableParser(timetableCourse.value.meta.link)
+                        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.value) // save the updated timetable to the cache directory
+                    }
+
+                }
+            } catch (ex: Exception) {
+                logger.error("Error while updating the timetables", ex)
+            } finally {
+                executor.shutdown()
            }
        }

-        jobCourseUpdate.await()
-        jobMensa.await()
+        /**
+         * save a timetable to the cache directory
+         * this is only call on async updates, it is NOT call when first getting the timetable
+         * @param timetable a timetable of the type [TimetableCourseWeek]
+         */
+        private fun saveTimetableToCache(timetable: TimetableCourseWeek) {
+            val file = File(StartupController.dirTcorCache, "timetable-${timetable.meta.courseName}-${timetable.meta.weekIndex}.json")
+            val writer = BufferedWriter(FileWriter(file))

-        logger.info("init updates successful")
-    }
-
-    /**
-     * 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!
-     */
-    private fun scheduledUpdates() {
-        val currentTime = System.currentTimeMillis()
-        val initDelay24h = (86400000 - ((currentTime + 3600000) % 86400000)) + 60000
-        val initDelay3h = (10800000 - ((currentTime + 3600000) % 10800000)) + 60000
-        val initDelay1h = (3600000 - ((currentTime + 3600000) % 3600000)) + 60000
-
-        // update courseList every 24 hours (time in ms)
-        Timer().scheduleAtFixedRate(initDelay24h, 86400000) {
-            asyncUpdateCourseList()
-        }
-
-        // update all already existing timetables every 3 hours (time in ms)
-        Timer().scheduleAtFixedRate(initDelay3h, 10800000) {
-            asyncUpdateTimetables()
-        }
-
-        // update courses every hour (time in ms)
-        Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
-            asyncUpdateMensa()
-        }
-
-        // post to status.mosad.xyz every hour, if an API key is present
-        if (StartupController.cachetAPIKey != "0") {
-            Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
-                CachetAPIController.postTotalRequests()
+            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()
            }
        }
-    }

+        /**
+         * before the APIController is up, get the data fist
+         * runBlocking: otherwise the api would return no data to requests for a few seconds after startup
+         */
+        private fun initUpdates() = runBlocking {
+            // get all course links on startup, make sure there are course links
+            val jobCourseUpdate = asyncUpdateCourseList()
+            val jobMensa = asyncUpdateMensa()
+
+            jobCourseUpdate.join()
+            jobMensa.join()
+
+            logger.info("Initial updates successful")
+        }
+
+        /**
+         * 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 duration24h = 24.hours.inWholeMilliseconds
+            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, duration24h) {
+                asyncUpdateCourseList()
+            }
+
+            // update all already existing timetables every 3 hours (time in ms)
+            Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
+                asyncUpdateTimetables()
+            }
+
+            // update courses every hour (time in ms)
+            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, duration1h) {
+                    CachetAPIController.postTotalRequests()
+                }
+            }
+        }
+
+    }
 }
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt
+++ b/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)}\"}"
-                 oldTotalRequests = getTotalRequests()
+                 val jsonInputString = "{\"value\": ${totalRequests -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
+                 oldTotalRequests = totalRequests

                 val con = url.openConnection() as HttpURLConnection
                 con.requestMethod = "POST"
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StartupController.kt
+++ b/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-trinken/speiseplaene/mensa-offenburg/"
        var mensaName = "Offenburg"
    }

@ -92,7 +92,7 @@ class StartupController {
        mensaMenuURL = try {
            properties.getProperty("mensaMenuURL")
        } catch (ex: Exception) {
-            "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/"
+            "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
        }

        mensaName = try {
@ -113,7 +113,7 @@ class StartupController {

        properties.setProperty("cachetAPIKey", "0")
        properties.setProperty("cachetBaseURL", "https://status.mosad.xyz")
-        properties.setProperty("mensaMenuURL", "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/")
+        properties.setProperty("mensaMenuURL", "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/")
        properties.setProperty("mensaName", "Offenburg")

        val outputStream = FileOutputStream(fileConfig)
@ -129,18 +129,21 @@ class StartupController {
    private fun readCachedTimetables() {
        dirTcorCache.walkTopDown().forEach {
            if (it.isFile && it.name.endsWith(".json")) {
-                try {
-                    val fileReader = FileReader(it)
-                    val bufferedReader = BufferedReader(fileReader)
-                    val timetableObject = JsonParser.parseString(bufferedReader.readLine()).asJsonObject
+                val fileReader = FileReader(it)
+                val bufferedReader = BufferedReader(fileReader)

-                    CacheController.timetableList.add(Gson().fromJson(timetableObject, TimetableCourseWeek().javaClass))
-                    bufferedReader.close()
-                    fileReader.close()
+                try {
+                    val timetableObject = JsonParser.parseString(bufferedReader.readLine()).asJsonObject
+                    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 {
+                    bufferedReader.close()
+                    fileReader.close()
                }
            }
        }
    }
-}
+}
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt
@ -26,53 +26,44 @@ import org.mosad.thecitadelofricks.APIController.Companion.apiVersion
 import org.mosad.thecitadelofricks.APIController.Companion.softwareVersion
 import org.mosad.thecitadelofricks.APIController.Companion.startTime
 import org.mosad.thecitadelofricks.Status
-import org.mosad.thecitadelofricks.TimetableCounter
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.net.HttpURLConnection
 import java.net.URL
 import java.time.LocalDateTime
 import java.util.*
-import kotlin.collections.ArrayList
+import kotlin.collections.HashMap

 class StatusController {

    companion object {
        private val logger: Logger = LoggerFactory.getLogger(StatusController::class.java)

-        private var totalRequests = 0
-        private var mensaMenuRequests = 0
-        private var timetableRequests = ArrayList<TimetableCounter>()
+        var totalRequests = 0
+            private set
+        var mensaMenuRequests = 0
+            private set
+        var courseListRequests = 0
+            private set
+        var timetableRequests = HashMap<String, Int>()
+            private set

-        fun updateTotalRequests() {
+        /**
+         * if a mensamenu/courseList/timetable is requested update the specific and total request count
+         */
+        fun updateMensaMenuRequests() {
+            mensaMenuRequests++
            totalRequests++
        }

-        fun updateMensaMenuRequests() {
-            mensaMenuRequests++
+        fun updateCourseListRequests() {
+            courseListRequests++
+            totalRequests++
        }

-        /**
-         * if a timetable is requested update the request counter
-         */
        fun updateTimetableRequests(courseName: String) {
-            timetableRequests.stream().filter { it.courseName == courseName }.findFirst().ifPresentOrElse({
-                it.requests++
-            }, {
-                timetableRequests.add(TimetableCounter(courseName, 1))
-            })
-        }
-
-        fun getTotalRequests(): Int {
-            return totalRequests
-        }
-
-        fun getMensaMenuRequests(): Int {
-            return mensaMenuRequests
-        }
-
-        fun getTimetableRequests(): ArrayList<TimetableCounter> {
-            return timetableRequests
+            timetableRequests[courseName] = (timetableRequests[courseName] ?: 0) + 1
+            totalRequests++
        }

        fun getStatus(): Status {
@ -106,9 +97,10 @@ class StatusController {
                "$days days, $hours:$minutes",
                apiVersion,
                softwareVersion,
-                getTotalRequests(),
-                getMensaMenuRequests(),
-                getTimetableRequests(),
+                totalRequests,
+                mensaMenuRequests,
+                courseListRequests,
+                timetableRequests,
                CacheController.timetableList.size,
                Date(CacheController.courseList.meta.updateTime * 1000),
                Date(CacheController.mensaMenu.meta.updateTime * 1000),
--- a/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/CourseListParser.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/CourseListParser.kt
@ -29,26 +29,25 @@ import java.net.SocketTimeoutException

 class CourseListParser {

-    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>? {
-        val courseLinkList = ArrayList<Course>()
+    fun getCourseLinks(courseListURL: String): HashMap<String, 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(
-                    Course(
-                        element.text(),
-                        element.attr("href").replace("http", "https")
-                    )
+                courseLinkList[element.text()] = Course(
+                    element.text(),
+                    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
--- a/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParser.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParser.kt
@ -63,9 +63,9 @@ class MensaParser {
                .forEachIndexed { dayIndex, day ->
                    val strDay = day.select("h3").text()

-                    day.select("div.menu-info").forEachIndexed { mealIndex, meal ->
-                        val heading = day.select("h4")[mealIndex].text()
-                        val parts = ArrayList(meal.html().substringBefore("<br>\n").replace("\n", "").split("<br>"))
+                    day.select("div.row").forEachIndexed { _, meal ->
+                        val heading = meal.select("h4.menu-header").text()
+                        val parts = ArrayList(meal.select("div.menu-info").html().substringBefore("<br><span").replace("\n", "").split("<br>"))
                        val additives = meal.select("span.show-with-allergenes").text()
                        parts.removeIf { x -> x.isEmpty() || x.isBlank() }

--- a/src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParser.kt
+++ b/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")

-    /**
-     * get the timetable from the 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
-     * @param timetableURL the URL of the timetable you want to get
-     */
-    fun getTimeTable(timetableURL: String): TimetableWeek {
-        return try {
-            parseTimeTable(Jsoup.connect(timetableURL).get())
-        } catch (gex: Exception) {
-            logger.error("general TimetableParser error", gex)
-            TimetableWeek()
+    companion object {
+        val semaphore = Semaphore(3, 0)
+    }
+
+    private val htmlDoc: Document? = htmlDoc ?: timetableURL?.let {
+        runBlocking {
+            try {
+                // Only allow sending a limited amount of requests at the same time
+                semaphore.acquire()
+                Jsoup.connect(timetableURL).get()
+            } catch (gex: Exception) {
+                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
-     * @param timetableURL the URL of the timetable you want to get
+     * parse the calendar week and the associated year for the timetable
     */
-    fun getWeekNumberYear(timetableURL: String): Int {
-        return try {
-            parseWeekNumberYear(Jsoup.connect(timetableURL).get())
-        } catch (gex: Exception) {
-            logger.error("general TimetableParser error", gex)
-            0
-        }
-    }
-
-    fun parseWeekNumberYear(htmlDoc: Document): Int {
-        return htmlDoc.select("h1.timetable-caption").text().substringAfter("- ")
-            .substringBefore(".").replace(" ", "").toInt()
+    fun parseCalendarWeek(): CalendarWeek? = htmlDoc?.let {
+        val dateStr = it.select("h1.timetable-caption").text().substringAfter("- ")
+        val week = dateStr.substringBefore(".").replace(" ", "").toInt()
+        val year = dateStr.substringAfter("Woche ").replace(" ", "").toInt()
+        CalendarWeek(week, year)
    }

    @Suppress("unused")
@ -181,4 +188,5 @@ class TimetableParser {

        println(" \n")
    }
+
 }
--- a/src/main/resources/application.properties
+++ b/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
--- a/src/main/resources/html/Timetable_normal-week.html
+++ b/src/main/resources/html/Timetable_normal-week.html
--- a/src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParserTest.kt
+++ b/src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParserTest.kt
@ -1,7 +1,7 @@
 /**
 * TheCitadelofRicks
 *
- * Copyright 2019  <seil0@mosad.xyz>
+ * Copyright 2019-2020  <seil0@mosad.xyz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -28,20 +28,16 @@ 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-trinken/speiseplaene/mensa-offenburg/"

    @Test
    fun parseMensaMenuNormalWeek() {
        val htmlFile = File(MensaParserTest::class.java.getResource("/html/Mensa_normal-week.html").path)
        val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.swfr.de/")
        val mensaWeek = MensaParser().parseMensaMenu(htmlDoc)
+        val expectedOutput = MensaParserTest::class.java.getResource("/expected/Mensa_normal-week.txt").readText()

-        // maybe we can find another way for the comparison
-        Assertions.assertEquals(
-            "MensaWeek(days=[Meals(meals=[Meal(day=Montag 03.07., heading=Essen 1, parts=[Gemüseauflauf , Frischkäse-Paprikasauce , Blattsalat <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9, enthält Allergene: Ei,ML,Lak</span>], additives=Kennzeichnungen/Zusatzstoffe: 9 enthält Allergene: Ei,ML,Lak), Meal(day=Montag 03.07., heading=Essen 2, parts=[Schweinesteak , Pfeffer-Rahmsauce , Country Potatoes , Blattsalat <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 1,5</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 1,5, enthält Allergene: Gl,GlW,GlG,ML,Lak</span>], additives=Kennzeichnungen/Zusatzstoffe: 1,5 enthält Allergene: Gl,GlW,GlG,ML,Lak), Meal(day=Montag 03.07., 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 04.07., heading=Essen 1, parts=[Riesenrösti , Rahmchampignons , Blattsalat <span class=\"zusatzsstoffe show-with-allergenes\">enthält Allergene: Gl,GlW,GlG,ML,Lak</span>], additives=enthält Allergene: Gl,GlW,GlG,ML,Lak), Meal(day=Dienstag 04.07., heading=Essen 2, parts=[Spaghetti , Sauce Bolognese , Geriebener Hartkäse , Blattsalat <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 15</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 15, enthält Allergene: Ei,Se,Gl,GlW,ML</span>], additives=Kennzeichnungen/Zusatzstoffe: 15 enthält Allergene: Ei,Se,Gl,GlW,ML), Meal(day=Dienstag 04.07., 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 05.07., heading=Essen 1, parts=[Frühlingsrollen , Feuriger Chilidip , Patnareis , Wokgemüsepfanne <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9, enthält Allergene: Ei,So,Sn,Se,Sf,Gl,GlW,ML,Lak</span>], additives=Kennzeichnungen/Zusatzstoffe: 9 enthält Allergene: Ei,So,Sn,Se,Sf,Gl,GlW,ML,Lak), Meal(day=Mittwoch 05.07., heading=Essen 2, parts=[Bratwurstschnecke , Bratenjus , Kartoffelbrei , Karottengemüse <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 1,8</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 1,8, enthält Allergene: Sn,Se,Gl,GlW,GlG,ML,Lak</span>], additives=Kennzeichnungen/Zusatzstoffe: 1,8 enthält Allergene: Sn,Se,Gl,GlW,GlG,ML,Lak), Meal(day=Mittwoch 05.07., 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 06.07., heading=Essen 1, parts=[Farfalle tricolore , Gorgonzola-Spinatsauce , Endiviensalat <span class=\"zusatzsstoffe show-with-allergenes\">enthält Allergene: Gl,GlW,ML</span>], additives=enthält Allergene: Gl,GlW,ML), Meal(day=Donnerstag 06.07., heading=Essen 2, parts=[Paniertes Seelachsfilet MSC , Remouladensauce , Salzkartoffeln , Brokkoligemüse <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9,MSC</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9,MSC, enthält Allergene: Ei,Sn,Fi,Gl,GlW,ML,Lak</span>], additives=Kennzeichnungen/Zusatzstoffe: 9,MSC enthält Allergene: Ei,Sn,Fi,Gl,GlW,ML,Lak), Meal(day=Donnerstag 06.07., 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 07.07., heading=Essen 1, parts=[Italienischer Nudelauflauf mit Gemüse , Tomatenragout , Blattsalat <span class=\"zusatzsstoffe show-with-allergenes\">enthält Allergene: Gl,GlW,ML,Lak</span>], additives=enthält Allergene: Gl,GlW,ML,Lak), Meal(day=Freitag 07.07., heading=Essen 2, parts=[Hähnchen-Saté-Spieß , Erdnusssauce , Langkornreis , Karotten-Erbsengemüse <span class=\"zusatzsstoffe show-with-allergenes\">enthält Allergene: Er,So,Kr,Fi,We,Gl,GlW,ML,Lak</span>], additives=enthält Allergene: Er,So,Kr,Fi,We,Gl,GlW,ML,Lak), Meal(day=Freitag 07.07., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse], additives=)]), Meals(meals=[]), Meals(meals=[])])",
-            mensaWeek.toString()
-        )
-
+        Assertions.assertEquals(expectedOutput, mensaWeek.toString())
    }

    @Test
@ -49,11 +45,9 @@ internal class MensaParserTest {
        val htmlFile = File(MensaParserTest::class.java.getResource("/html/Mensa_empty-week.html").path)
        val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.swfr.de/")
        val mensaWeek = MensaParser().parseMensaMenu(htmlDoc)
+        val expectedOutput = MensaParserTest::class.java.getResource("/expected/Mensa_empty-week.txt").readText()

-        Assertions.assertEquals(
-            "MensaWeek(days=[Meals(meals=[]), Meals(meals=[]), Meals(meals=[]), Meals(meals=[]), Meals(meals=[]), Meals(meals=[]), Meals(meals=[])])",
-            mensaWeek.toString()
-        )
+        Assertions.assertEquals(expectedOutput, mensaWeek.toString())
    }

    // TODO add test for special days ie. public holiday
@ -63,4 +57,4 @@ internal class MensaParserTest {
        val urlNextWeek = MensaParser().getMenuLinkNextWeek(mensaMenuURL) // this need a connection to the swfr server
        Assertions.assertNotNull(urlNextWeek)
    }
-}
+}
--- a/src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParserTest.kt
+++ b/src/test/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParserTest.kt
@ -1,7 +1,7 @@
 /**
 * TheCitadelofRicks
 *
- * Copyright 2019  <seil0@mosad.xyz>
+ * Copyright 2019-2020  <seil0@mosad.xyz>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -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,9 +33,9 @@ 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 actualTimetable = TimetableParser().parseTimeTable(htmlDoc).toString().trim()
-        val expectedTimetable = File(TimetableParserTest::class.java.getResource("/expected/Timetable_normal-week_expected.txt").toURI()).readText().trim()
+        val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
+        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 actualTimetable = TimetableParser().parseTimeTable(htmlDoc).toString().trim()
-        val expectedTimetable = File(TimetableParserTest::class.java.getResource("/expected/Timetable_empty-week_expected.txt").toURI()).readText().trim()
+        val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
+        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 actualWeekNumberYear = TimetableParser().parseWeekNumberYear(htmlDoc)
+        val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
+        val actualCalendarWeek = TimetableParser(htmlDoc = htmlDoc).parseCalendarWeek()

-        Assertions.assertEquals(42, actualWeekNumberYear)
+        Assertions.assertEquals(CalendarWeek(42, 2019), actualCalendarWeek)
    }
 }
--- a/src/test/resources/expected/Mensa_empty-week.txt
+++ b/src/test/resources/expected/Mensa_empty-week.txt
@ -0,0 +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=[])])
--- a/src/test/resources/expected/Mensa_normal-week.txt
+++ b/src/test/resources/expected/Mensa_normal-week.txt
@ -0,0 +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=[])])
--- a/src/test/resources/expected/Timetable_empty-week_expected.txt
+++ b/src/test/resources/expected/Timetable_empty-week_expected.txt
--- a/src/test/resources/expected/Timetable_normal-week_expected.txt
+++ b/src/test/resources/expected/Timetable_normal-week_expected.txt
--- a/src/test/resources/html/Mensa_normal-week.html
+++ b/src/test/resources/html/Mensa_normal-week.html
@ -1,28 +1,23 @@
 <div id="speiseplan-tabs">
    <div id="tab-menu-container" class="row">
-        <div class="col-md-1 col-xs-6"></div>
+        <div class="col-md-1 col-xs-6">
+            <a class="prev-week" title="eine Woche zurück" href="/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>
+        </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 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>
-                <li class="col-md-2"><a href="#tab-fri" class="nav-link active show" data-toggle="tab" role="tab">Fr
-                    16.08.</a></li>
-                <li class="col-md-2"><a href="#tab-sat" class="nav-link" data-toggle="tab" role="tab">Sa 17.08.</a></li>
+                <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>
+                <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-md-1 col-xs-6 pull-right">
-            <a class="next-week text-right" title="eine Woche weiter"
-               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 class="col-md-1 col-xs-6 pull-right"><a class="next-week text-right" title="eine Woche weiter" href="/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>
    <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>
@ -35,484 +30,484 @@
                    <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>
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/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>
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/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>
            <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>
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/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>
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/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>
        </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>
+            <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 r-tabs-panel r-tabs-state-active" style="display: block;">
-            <h3>Montag 03.07.</h3>
-            <div class="row row-narrow row-table">
+        <div id="tab-mon" class="menu-tagesplan tab-pane fade">
+            <h3>Montag 09.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 bg-beige-hell vegetarisch">
-                    Gemüseauflauf
-                    <br>Frischkäse-Paprikasauce
-                    <br>Blattsalat
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9</span>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9<br>enthält Allergene: Ei,ML,Lak</span>
-                </div>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Kartoffel-Frischkäsebratling
+                    <br>Gemüseragout Toskana
+                    <br>Beilagensalat
+                    <br><span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Se,Gl,GlW,ML</span></div>
                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
-            <div class="row row-narrow row-table">
+            <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 bg-beige-hell ">
-                    Schweinesteak
-                    <br>Pfeffer-Rahmsauce
-                    <br>Country Potatoes
-                    <br>Blattsalat
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,5</span>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,5<br>enthält Allergene: Gl,GlW,GlG,ML,Lak</span>
-                </div>
+                <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
+                    <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
-            <div class="row row-narrow row-table">
+            <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 bg-beige-hell ">
+                <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,85 €<span class="tara"> / 100g</span></td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,00 €<span class="tara"> / 100g</span></td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>1,20 €<span class="tara"> / 100g</span></td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
        </div>
-        <div id="tab-tue" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
-            <h3>Dienstag 04.07.</h3>
-            <div class="row row-narrow row-table">
+        <div id="tab-tue" class="menu-tagesplan tab-pane fade in show active">
+            <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 bg-beige-hell vegetarisch">
-                    Riesenrösti
-                    <br>Rahmchampignons
-                    <br>Blattsalat
-                    <span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Gl,GlW,GlG,ML,Lak</span>
-                </div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
-                        <tbody>
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="row row-narrow row-table">
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
-                    Spaghetti
-                    <br>Sauce Bolognese
+                <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
+                    <br>Tomatensauce
                    <br>Geriebener Hartkäse
-                    <br>Blattsalat
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 15</span>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 15<br>enthält Allergene: Ei,Se,Gl,GlW,ML</span>
-                </div>
+                    <br>Beilagensalat
+                    <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-4 col-sm-4 menu-price">
-                    <table class="table">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
-            <div class="row row-narrow row-table">
+            <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')} ">
+                    Frikadelle
+                    <br>Champignon-Rahmsauce
+                    <br>Bauernspätzle
+                    <br>Blattsalat
+                    <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-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 bg-beige-hell ">
+                <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,85 €<span class="tara"> / 100g</span></td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,00 €<span class="tara"> / 100g</span></td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>1,20 €<span class="tara"> / 100g</span></td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
        </div>
-        <div id="tab-wed" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
-            <h3>Mittwoch 05.07.</h3>
-            <div class="row row-narrow row-table">
+        <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 bg-beige-hell vegetarisch">
-                    Frühlingsrollen
-                    <br>Feuriger Chilidip
-                    <br>Patnareis
-                    <br>Wokgemüsepfanne
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9</span>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9<br>enthält Allergene: Ei,So,Sn,Se,Sf,Gl,GlW,ML,Lak</span>
-                </div>
+                <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
-            <div class="row row-narrow row-table">
+            <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 bg-beige-hell ">
-                    Bratwurstschnecke
-                    <br>Bratenjus
+                <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>Karottengemüse
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,8</span>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,8<br>enthält Allergene: Sn,Se,Gl,GlW,GlG,ML,Lak</span>
-                </div>
+                    <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
-            <div class="row row-narrow row-table">
+            <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 bg-beige-hell ">
+                <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,85 €<span class="tara"> / 100g</span></td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,00 €<span class="tara"> / 100g</span></td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>1,20 €<span class="tara"> / 100g</span></td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
        </div>
-        <div id="tab-thu" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
-            <h3>Donnerstag 06.07.</h3>
-            <div class="row row-narrow row-table">
+        <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 bg-beige-hell vegetarisch">
-                    Farfalle tricolore
-                    <br>Gorgonzola-Spinatsauce
-                    <br>Endiviensalat
-                    <span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Gl,GlW,ML</span>
-                </div>
+                <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
-            <div class="row row-narrow row-table">
+            <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 bg-beige-hell ">
-                    Paniertes Seelachsfilet MSC
-                    <br>Remouladensauce
+                <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>Brokkoligemüse
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9,MSC</span>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9,MSC<br>enthält Allergene: Ei,Sn,Fi,Gl,GlW,ML,Lak</span>
-                </div>
+                    <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
-            <div class="row row-narrow row-table">
+            <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 bg-beige-hell ">
+                <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,85 €<span class="tara"> / 100g</span></td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,00 €<span class="tara"> / 100g</span></td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>1,20 €<span class="tara"> / 100g</span></td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
        </div>
-        <div id="tab-fri" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
-            <h3>Freitag 07.07.</h3>
-            <div class="row row-narrow row-table">
+        <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 bg-beige-hell vegetarisch">
-                    Italienischer Nudelauflauf mit Gemüse
-                    <br>Tomatenragout
-                    <br>Blattsalat
-                    <span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Gl,GlW,ML,Lak</span>
-                </div>
+                <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
-            <div class="row row-narrow row-table">
+            <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 bg-beige-hell ">
-                    Hähnchen-Saté-Spieß
-                    <br>Erdnusssauce
-                    <br>Langkornreis
-                    <br>Karotten-Erbsengemüse
-                    <span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Er,So,Kr,Fi,We,Gl,GlW,ML,Lak</span>
-                </div>
+                <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
-            <div class="row row-narrow row-table">
+            <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 bg-beige-hell ">
+                <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">
-                        <tbody>
+                    <table class="table-sm">
                        <tr>
                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,85 €<span class="tara"> / 100g</span></td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
                        </tr>
                        <tr>
                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,00 €<span class="tara"> / 100g</span></td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
                        </tr>
                        <tr>
                            <td class="price-gaeste">Gäste</td>
-                            <td>1,20 €<span class="tara"> / 100g</span></td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
                        </tr>
-                        </tbody>
                    </table>
                </div>
            </div>
        </div>
-        <div id="tab-sat" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
-            <h3>Samstag 08.07.</h3>
+        <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-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>
+                    <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>
-</div>
-
Author	SHA1	Message	Date
Jannik	e6f09c11ba	update libraries * spring boot 2.5.5 -> 2.6.6 * kotlin 1.5.31 -> 1.6.20 * coroutines 1.5.2 -> 1.6.1 * gson 2.8.8 -> 2.9.0 * gradle wrapper 7.2 -> 7.4.2	2022-04-08 14:54:06 +02:00
Jannik	f7c8958d20	Merge pull request 'Fix CacheController lookup' (#23 ) from fix/cache-controller into master All checks were successful continuous-integration/woodpecker the build was successful Details Reviewed-on: #23	2022-01-14 18:46:24 +01:00
Hannes Braun	006e962bf1	Fix CacheController lookup All checks were successful continuous-integration/woodpecker the build was successful Details	2022-01-14 15:42:25 +01:00
Jannik	f49e600613	version 1.3.0 All checks were successful continuous-integration/woodpecker the build was successful Details	2021-10-31 22:09:12 +01:00
Jannik	940a30e9aa	Merge pull request 'Parse the year of a timetable' (#21 ) from hannesbraun/TheCitadelofRicks:feature/parse-year into master All checks were successful continuous-integration/woodpecker the build was successful Details Reviewed-on: #21	2021-10-24 15:00:13 +02:00
Hannes Braun	d863f4fb1e	TimetableParser: parse year All checks were successful continuous-integration/woodpecker the build was successful Details This also adds the parsed year to the meta object included in the timetable response	2021-10-24 14:39:22 +02:00
Jannik	dc57a0d0c1	Merge pull request 'Various improvements' (#17 ) from hannesbraun/TheCitadelofRicks:fix/timeout-resilience into master All checks were successful continuous-integration/woodpecker the build was successful Details Reviewed-on: #17	2021-10-24 14:38:12 +02:00
Hannes Braun	5ba9dfc263	Better null checks	2021-10-24 14:34:00 +02:00
Hannes Braun	ca8efdaa85	Only add timetable to cache on success	2021-10-24 14:34:00 +02:00
Hannes Braun	8e3af696e0	Limit sending timetable requests in parallel to 3 Otherwise, the requests may fail (from my experience). Also we don't want to look suspicious (flooding their server with tons of requests at the same time).	2021-10-24 14:34:00 +02:00
Hannes Braun	fb6291792d	Use ConcurrentHashMap for timetableList Multiple requests may be processed at the same time and could otherwise cause problems (concurrent write operations)	2021-10-24 14:34:00 +02:00
Hannes Braun	993b8f6a71	Small improvements - Improve formatting - Fix some typos - Mini code improvements	2021-10-24 14:34:00 +02:00
Hannes Braun	f9cc9b5e14	Make the update scheduling more readable (hopefully)	2021-10-24 14:34:00 +02:00
Hannes Braun	460d1ee131	StatusController: use properties instead of getters	2021-10-24 14:33:59 +02:00
Hannes Braun	90847a2730	Also set JVM target to 11 for Java	2021-10-24 14:33:59 +02:00
Hannes Braun	a292b45fcb	Dependency updates This also replaces JCenter with Maven Central since JCenter is now read-only	2021-10-24 14:33:59 +02:00
Hannes Braun	22f17d10e0	Timetable fixes - Only one request is made to get the timetable HTML document for parsing the timetable and the weekNumberYear - On timeouts or other errors, the cached data won't be overwritten with emptiness anymore - The scheduled updates will now also update the weekNumberYear	2021-10-24 14:33:59 +02:00
Hannes Braun	ae9bf2a562	Update Kotlin to 1.5.31	2021-10-24 14:33:58 +02:00
Jannik	6394a7c880	fix secrets (1st try) All checks were successful continuous-integration/drone the build was successful Details	2021-10-16 15:48:34 +02:00
Jannik	5ab5e850bd	execute the docker build/deploy image with privileged: true Some checks failed continuous-integration/drone the build failed Details	2021-10-16 15:21:01 +02:00
Jannik	a97a464a83	Merge pull request 'use techknowlogick's drone-docker image' (#20 ) from fix/docker-build into master Some checks failed continuous-integration/drone the build failed Details Reviewed-on: #20	2021-10-16 14:39:38 +02:00
Jannik	2b06efeece	use techknowlogick's drone-docker image All checks were successful continuous-integration/drone the build was successful Details this should fix the docker build issues	2021-10-16 14:35:37 +02:00
Jannik	024f2b04ce	„README.md“ ändern All checks were successful continuous-integration/drone the build was successful Details	2021-10-13 20:09:46 +02:00
Jannik	bf71d62dc5	version 1.2.8 Some checks failed continuous-integration/drone the build failed Details	2021-10-13 20:03:14 +02:00
Jannik	7dce2c6cfd	Merge pull request 'updated mensa URL' (#16 ) from fix/mensa_url into master All checks were successful continuous-integration/drone the build was successful Details Reviewed-on: #16	2021-10-13 19:49:53 +02:00
localhorst	a1dc5656b8	updated mensa URL, thanks to Hannes B. All checks were successful continuous-integration/drone the build was successful Details	2021-10-13 19:47:38 +02:00
Jannik	dd4c5259d2	Merge pull request 'move ci config from drone to woodpecker' (#18 ) from fix/ci into master Some checks failed continuous-integration/drone the build failed Details Reviewed-on: #18	2021-10-13 19:45:32 +02:00
Jannik	884aab08ed	move ci config from drone to woodpecker Some checks failed continuous-integration/drone the build failed Details	2021-10-13 19:39:37 +02:00
Jannik	c64c8779e3	update kotlin to 1.4 All checks were successful continuous-integration/drone/push Build is passing Details * update spring boot 2.3.2 -> 2.3.3 * update gradle wrapper to version 6.6.1	2020-09-16 18:56:24 +02:00
Jannik Seiler	1d614a06c4	version 1.2.7 All checks were successful continuous-integration/drone/tag Build is passing Details continuous-integration/drone/push Build is passing Details * update coroutines 1.3.7 -> 1.3.8	2020-08-16 20:03:37 +02:00
Jannik Seiler	3f10c8afaa	fix courseList sorting All checks were successful continuous-integration/drone/push Build is passing Details closes #15	2020-08-16 19:56:13 +02:00
Jannik Seiler	9de1e295dd	fix reading file from resources All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2020-08-06 17:27:49 +02:00
Jannik Seiler	6287d4582d	update spring-boot All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details * add TEST_A and TEST_B courses for testing during summer break	2020-08-06 16:31:05 +02:00
Jannik Seiler	7dfa0fc6c4	fix .drone.yml (again) All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2020-06-26 10:34:56 +02:00
Jannik Seiler	a53b2b8fc1	only publish to docker hub if a release is tagged	2020-06-26 10:32:20 +02:00
Jannik Seiler	36972c9322	fix .drone.yml All checks were successful continuous-integration/drone/push Build is passing Details	2020-06-26 10:26:07 +02:00
Jannik Seiler	7bf2920d17	add docker hub publish to .drone.yml Some checks failed continuous-integration/drone/push Build is failing Details	2020-06-26 10:14:57 +02:00
Seil0	c30306c163	fix courseList All checks were successful continuous-integration/drone/push Build is passing Details	2020-06-11 17:22:31 +02:00
Seil0	46c9a61124	remove the workaround introduced in `36acf1a00a` and update the Dockerfile All checks were successful continuous-integration/drone/push Build is passing Details	2020-06-08 17:49:38 +02:00
Seil0	36acf1a00a	add workaround for ssl errors All checks were successful continuous-integration/drone/push Build is passing Details	2020-06-08 11:57:20 +02:00
Seil0	f9029bf1c3	use HashMap insted of ArrayList to store the timetables All checks were successful continuous-integration/drone/push Build is passing Details	2020-06-06 23:07:23 +02:00
Seil0	fe72c02562	remove unneeded dependency, use try catch when writing files All checks were successful continuous-integration/drone/push Build is passing Details	2020-06-06 20:53:23 +02:00
Seil0	8d9fcd3d7c	update gradle to version 6.5 All checks were successful continuous-integration/drone/push Build is passing Details	2020-06-05 19:16:39 +02:00
Seil0	ec7a0a7a64	change some parameters All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details * fixes #13 * use a HashMap for timetableRequests count * api version 1.2.0 * software version 1.2.3	2020-06-05 18:23:15 +02:00
Seil0	efd8f9f9f5	update spring All checks were successful continuous-integration/drone/push Build is passing Details * spring-boot 2.2.7 -> 2.3.0	2020-05-25 11:21:24 +02:00
Seil0	e2dce9fab3	update gradle, kotlin & coroutines All checks were successful continuous-integration/drone/push Build is passing Details * gradle 6.1.1 -> 6.4 * kotlin 1.3.71 -> 1.3.72 * coroutines 1.3.5 -> 1.3.6	2020-05-14 17:16:31 +02:00
Jannik Seiler	bbac0d3688	„README.md“ ändern All checks were successful continuous-integration/drone/push Build is passing Details	2020-05-07 20:31:26 +02:00
Seil0	6114077591	update spring boot, jsoup and kotlin coroutines All checks were successful continuous-integration/drone/push Build is passing Details * kotlin coroutines 1.3.3 -> 1.3.5 * jsoup 1.12.2 -> 1.13.1 * spring boot 2.2.5 -> 2.2.6 * various performance improvements	2020-04-13 21:08:01 +02:00
Seil0	678a97f140	fix MensaParser & update spring boot, kotlin All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details * fixed the MensaParser(), it should now work more reliable * updated spring boot 2.2.4 -> 2.2.5 * updated kotlin 1.3.61 -> 1.3.70 * clean up MensaParserTest	2020-03-03 19:31:12 +01:00
Seil0	c22f752788	ci test 2 All checks were successful continuous-integration/drone/push Build is passing Details	2020-03-02 22:34:10 +01:00
Seil0	1798054580	ci test All checks were successful continuous-integration/drone/push Build is passing Details	2020-03-02 18:28:02 +01:00
Seil0	9a48b1a859	minor fixes All checks were successful continuous-integration/drone/push Build is passing Details	2020-03-02 18:21:36 +01:00
Seil0	2f1f65eba0	count courseList requests seperat	2020-02-27 17:42:19 +01:00
Seil0	be95af43c2	made CacheCOntroller() static All checks were successful continuous-integration/drone/push Build is passing Details	2020-02-16 17:17:39 +01:00
Seil0	f20279a4b4	updated jsoup 1.12.1 -> 1.12.2 All checks were successful continuous-integration/drone/push Build is passing Details	2020-02-16 15:18:52 +01:00
Seil0	3aa27dff4a	don't use lateinit in CacheController() All checks were successful continuous-integration/drone/push Build is passing Details	2020-02-10 17:42:44 +01:00
Seil0	f01916b363	updated gradle and spring boot All checks were successful continuous-integration/drone/push Build is passing Details * gradle 5.6.2 -> 6.1.1 * spring boot 2.1.11 -> 2.2.4 * junit-jupiter 5.5.1 -> 5.6.0	2020-01-26 17:46:16 +01:00
				`@ -0,0 +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=[])])`
				`@ -0,0 +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=[])])