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

.gitignore

@@ -35,6 +35,7 @@ captures/
 
 # Intellij
 *.iml
+.idea/
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
@@ -55,6 +56,9 @@ freeline.py
 freeline/
 freeline_project_description.json
 
+# KDE
 .directory
-.idea/
+
+# tcor
+tcor/
 

.woodpecker.yml

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

Dockerfile

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

README.md

@@ -1,3 +1,7 @@
+![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
 
 The API backend for [ProjectLaogai](https://git.mosad.xyz/Seil0/ProjectLaogai).

build.gradle

@@ -1,41 +1,46 @@
-
-buildscript {
-    ext.kotlin_version = '1.3.31'
-    ext.spring_boot_version = '2.1.5.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"
-    }
-}
-
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-spring'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-
-repositories {
-    jcenter()
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1"
-    implementation 'org.jsoup:jsoup:1.12.1'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+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'
 }
 
 group 'org.mosad'
-version '1.1.3'
+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'
+    }
+}
+
+def jvmTargetVersion = "11"
+compileKotlin {
+    kotlinOptions.jvmTarget = jvmTargetVersion
+    kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+}
+compileJava {
+    targetCompatibility = jvmTargetVersion
+}
+compileTestKotlin {
+    kotlinOptions.jvmTarget = jvmTargetVersion
+}
+compileTestJava {
+    targetCompatibility = jvmTargetVersion
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Mar 11 19:03:50 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# 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.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  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=""
+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
@@ -81,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
@@ -89,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, switch paths to Windows format before running java
-if $cygwin ; 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" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ 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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 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.
@@ -35,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%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

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

@@ -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
@@ -22,157 +22,119 @@
 
 package org.mosad.thecitadelofricks
 
-import org.mosad.thecitadelofricks.CacheController.Companion.courseList
-import org.mosad.thecitadelofricks.CacheController.Companion.mensaMenu
+import org.mosad.thecitadelofricks.controller.CacheController
+import org.mosad.thecitadelofricks.controller.CacheController.Companion.courseList
+import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLesson
+import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLessonSubjectList
+import org.mosad.thecitadelofricks.controller.CacheController.Companion.getTimetable
+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.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
-import java.net.HttpURLConnection
-import java.net.URL
 import java.time.LocalDateTime
 import java.util.*
 import kotlin.collections.ArrayList
-import kotlin.collections.HashSet
 
 @RestController
 class APIController {
 
     private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
-    private val cache = CacheController()
 
-    private val softwareVersion = "1.1.3"
-    private val apiVersion = "1.1.1"
-    private val startTime = System.currentTimeMillis() / 1000
+    companion object {
+        const val apiVersion = "1.3.0"
+        const val softwareVersion = "1.3.1"
+        val startTime = System.currentTimeMillis() / 1000
+    }
 
-    private var requestCount = 0
-
-    @Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()"))
-    @RequestMapping("/courses")
-    fun courses(): CourseList {
-        return courseList()
+    init {
+        StartupController()
+        CacheController()
     }
 
     @RequestMapping("/courseList")
-    fun courseList(): CourseList {
+    fun courseList(): CoursesListRet {
         logger.info("courseList request at ${LocalDateTime.now()}!")
-        requestCount++
-        return  courseList
+        updateCourseListRequests()
+
+        return CoursesListRet(courseList.meta, ArrayList(courseList.courses.values))
     }
 
     @RequestMapping("/mensamenu")
     fun mensamenu(): MensaMenu {
         logger.info("mensamenu request at ${LocalDateTime.now()}!")
-        requestCount++
-        return  mensaMenu
+        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()}!")
-        requestCount++
-        return cache.getTimetable(courseName, week)
+        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()}!")
-        requestCount++
+        logger.info("subjectList request at ${LocalDateTime.now()}!")
+        updateTimetableRequests(courseName)
         return getLessonSubjectList(courseName, week)
     }
 
-    @RequestMapping("/lesson")
+    @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()}!")
-        requestCount++
+        updateTimetableRequests(courseName)
         return getLesson(courseName, lessonSubject, week)
     }
 
     @RequestMapping("/status")
     fun status(): Status {
+        logger.info("status request at ${LocalDateTime.now()}!")
         return getStatus()
     }
 
-    // non direct api functions
-
-    private fun getLessonSubjectList(courseName: String, week: Int): HashSet<String> {
-        val lessonSubjectList = ArrayList<String>()
-
-        // get every lesson subject for the given week
-        val flatMap = cache.getTimetable(courseName, week).timetable.days.flatMap { it.timeslots.asIterable() }
-        flatMap.forEach {
-            it.stream().filter { x -> x.lessonSubject.isNotEmpty() }.findAny().ifPresent { x -> lessonSubjectList.add(x.lessonSubject) }
-        }
-
-        return HashSet(lessonSubjectList)
+    @RequestMapping("/health")
+    fun health(): Int {
+        logger.info("health request at ${LocalDateTime.now()}!")
+        return 200
     }
 
-    private fun getLesson(courseName: String, lessonSubject: String, week: Int): ArrayList<Lesson> {
-        val lessonList = ArrayList<Lesson>()
+    /**
+     * Deprecated section
+     */
 
-        // get all lessons from the weeks timetable
-        val flatMap = cache.getTimetable(courseName, week).timetable.days.flatMap { it.timeslots.asIterable() }
-        flatMap.forEach {
-            it.forEach { lesson ->
-                if(lesson.lessonSubject.contains(lessonSubject)) {
-                    lessonList.add(lesson)
-                }
-            }
-
-            //it.stream().filter { x -> x.lessonSubject.contains(lessonSubject) }.findAny().ifPresent { x -> println("${x.lessonSubject}, ${x.lessonTeacher}") }
-        }
-
-        return lessonList
+    // 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()
     }
 
-    private fun getStatus(): Status {
-        val currentTime = System.currentTimeMillis() / 1000
-        val minutes = (currentTime - startTime) % 3600 / 60
-        val hours = (currentTime - startTime) % 86400 / 3600
-        val days = (currentTime - startTime) / 86400
-        var hsoCode = 999
-        var swfrCode = 999
-        logger.info("status request at ${LocalDateTime.now()}!")
-
-        try {
-            val hsoURL = URL("https://www.hs-offenburg.de/")
-            val swfrURL = URL("https://www.swfr.de/")
-
-            var connection = hsoURL.openConnection() as HttpURLConnection
-            connection.requestMethod = "HEAD"
-
-            connection.connectTimeout = 15000
-            hsoCode = connection.responseCode
-
-            connection = swfrURL.openConnection() as HttpURLConnection
-            connection.connectTimeout = 15000
-            swfrCode = connection.responseCode
-        } catch (e: Exception) {
-            logger.error("Error while fetching url response codes!", e)
-        }
-
-        return Status(
-            LocalDateTime.now(),
-            "$days days, $hours:$minutes",
-            apiVersion,
-            softwareVersion,
-            requestCount,
-            Date(courseList.meta.updateTime * 1000),
-            Date(mensaMenu.meta.updateTime * 1000),
-            hsoCode,
-            swfrCode
-        )
+    // 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)
     }
 
 }

src/main/kotlin/org/mosad/thecitadelofricks/Application.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

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

@@ -1,186 +0,0 @@
-/**
- * TheCitadelofRicks
- *
- * Copyright 2019  <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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
-package org.mosad.thecitadelofricks
-
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-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.util.*
-import kotlin.collections.ArrayList
-import kotlin.concurrent.scheduleAtFixedRate
-
-class CacheController {
-
-    private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
-
-    // hso parser links (hardcoded)
-    private val courseListURL = "https://www.hs-offenburg.de/studium/vorlesungsplaene/"
-    private val mensaMenuURL = "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/"
-    private val mensaName = "Offenburg"
-
-    // cache objects
-    companion object{
-
-        lateinit var courseList: CourseList
-        lateinit var mensaMenu: MensaMenu
-
-        var timetableList = ArrayList<TimetableCourseWeek>() // this list contains all timetables
-    }
-
-    init {
-        initUpdates()
-        scheduledUpdates()
-    }
-
-    fun getTimetable(courseName: String, week: Int): TimetableCourseWeek = runBlocking {
-        val currentTime = System.currentTimeMillis() / 1000
-        var timetable = TimetableWeek()
-        // check if the timetable already exists and is up to date
-
-        when (timetableList.stream().filter { x -> x.meta.courseName == courseName && x.meta.week == week }.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 timetableMeta = TimetableCourseMeta(currentTime, courseName, week, courseLink.replace("week=0","week=$week"))
-
-                val jobTimetable = GlobalScope.async {
-                    timetable = TimetableParser().getTimeTable(timetableMeta.link)
-                }
-
-                jobTimetable.await()
-
-                timetableList.add(TimetableCourseWeek(timetableMeta, timetable))
-                logger.info("added new timetable for $courseName, week $week")
-            }
-        }
-
-        return@runBlocking timetableList.stream().filter { x -> x.meta.courseName == courseName && x.meta.week == week }.findAny().orElse(null)
-    }
-
-    /**
-     * this function updates the courseList
-     * during the update process the old data will be returned for a API request
-     */
-    private fun asyncUpdateCourseList() = GlobalScope.launch {
-        val result = CourseListParser().getCourseLinks(courseListURL)
-        if (result != null) {
-            courseList = CourseList(CourseMeta(System.currentTimeMillis() / 1000, result.size), result)
-        }
-
-        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(mensaMenuURL)
-        val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(mensaMenuURL))
-
-        // only update if we get valid data
-        if (mensaCurrentWeek != null && mensaNextWeek != null) {
-            mensaMenu = MensaMenu(MensaMeta(System.currentTimeMillis() / 1000, 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
-     */
-    private fun asyncUpdateTimetables() = GlobalScope.launch {
-        timetableList.forEach { timetableCourse ->
-            val updateURL = timetableCourse.meta.link
-            timetableCourse.timetable = TimetableParser().getTimeTable(updateURL)
-            timetableCourse.meta.updateTime = System.currentTimeMillis() / 1000
-        }
-        logger.info("updated ${timetableList.size} timetables successful!")
-    }
-
-    /**
-     * 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 {
-            val result = CourseListParser().getCourseLinks(courseListURL)
-            if (result != null) {
-                courseList = CourseList(CourseMeta(System.currentTimeMillis() / 1000, result.size), result)
-            }
-        }
-
-        // get the current and next weeks mensa menus
-        val jobMensa = GlobalScope.async{
-            val mensaCurrentWeek = MensaParser().getMensaMenu(mensaMenuURL)
-            val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(mensaMenuURL))
-
-            // only update if we get valid data
-            if (mensaCurrentWeek != null && mensaNextWeek != null) {
-                mensaMenu = MensaMenu(MensaMeta(System.currentTimeMillis() / 1000, mensaName), mensaCurrentWeek, mensaNextWeek)
-            }
-        }
-
-        jobCourseUpdate.await()
-        jobMensa.await()
-
-        logger.info("init updates successful")
-    }
-
-    /**
-     * 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) % 10800000)) + 60000
-
-        println(initDelay1h / 1000)
-
-        // 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()
-        }
-    }
-
-}

src/main/kotlin/org/mosad/thecitadelofricks/DataTypes.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
@@ -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)
@@ -41,10 +43,12 @@ data class MensaWeek(val days: Array<Meals> = Array(7) { Meals(ArrayList()) })
 
 data class MensaMeta(val updateTime: Long, val mensaName: String)
 
-data class MensaMenu(val meta: MensaMeta, val currentWeek: MensaWeek, val nextWeek: MensaWeek) {
-}
+data class MensaMenu(val meta: MensaMeta, val currentWeek: MensaWeek, val nextWeek: MensaWeek)
 
 // data classes for the timetable part
+
+data class CalendarWeek(val week: Int, val year: Int)
+
 data class Lesson(
     val lessonID: String,
     val lessonSubject: String,
@@ -57,18 +61,23 @@ 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, val courseName: String, val week: Int, 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, var timetable: TimetableWeek)
+data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek())
 
 
 // data classes for the status part
+
 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 courseListRequests: Int,
+    val timetableRequests: HashMap<String, Int>,
+    val timetableListSize: Int,
     val coursesLastUpdate: Date,
     val mensaLastUpdate: Date,
     val hsoResponseCode: Int,

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

@@ -0,0 +1,295 @@
+/**
+ * TheCitadelofRicks
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.thecitadelofricks.controller
+
+import com.google.gson.Gson
+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.*
+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 {
+
+    init {
+        initUpdates()
+        scheduledUpdates()
+    }
+
+    companion object {
+        private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
+
+        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 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 {
+
+            // 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 timetableParser =
+                    TimetableParser(htmlDoc = Jsoup.parse(instr!!, "UTF-8", "https://www.hs-offenburg.de/"))
+                val timetableTest = timetableParser.parseTimeTable()
+
+                return TimetableCourseWeek(
+                    TimetableCourseMeta(
+                        currentTime,
+                        courseName,
+                        weekIndex,
+                        weekNumberYear,
+                        year,
+                        timetableLink
+                    ), timetableTest ?: TimetableWeek()
+                )
+            }
+
+            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 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
+         */
+        fun getLessonSubjectList(courseName: String, weekIndex: Int): HashSet<String> = runBlocking {
+            val lessonSubjectList = ArrayList<String>()
+
+            // get every lesson subject for the given week
+            val flatMap = getTimetable(courseName, weekIndex).timetable.days.flatMap { it.timeslots.asIterable() }
+            flatMap.forEach {
+                it.stream().filter { x -> x.lessonSubject.isNotEmpty() }.findAny().ifPresent { x -> lessonSubjectList.add(x.lessonSubject) }
+            }
+
+            return@runBlocking HashSet(lessonSubjectList)
+        }
+
+        /**
+         * get every lesson of a subject in a week
+         * @param courseName the name of the course to be requested
+         * @param lessonSubject the lesson subject to be requested
+         * @param weekIndex request week number (current week = 0)
+         * @return a ArrayList<[Lesson]> of every lesson with lessonSubject for one week
+         */
+        fun getLesson(courseName: String, lessonSubject: String, weekIndex: Int): ArrayList<Lesson> {
+            val lessonList = ArrayList<Lesson>()
+
+            // get all lessons from the weeks timetable
+            val flatMap = getTimetable(courseName, weekIndex).timetable.days.flatMap { it.timeslots.asIterable() }
+            flatMap.forEach {
+                it.stream().filter { x -> x.lessonSubject.contains(lessonSubject) }.findAny().ifPresent { x -> lessonList.add(x) }
+            }
+
+            return lessonList
+        }
+
+        // private cache functions
+
+        /**
+         * 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 = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
+            }
+
+            // TODO just for testing
+            courseList.courses["TEST_A"] = Course("TEST_A", "https://mosad.xyz")
+            courseList.courses["TEST_B"] = Course("TEST_B", "https://mosad.xyz")
+
+            logger.info("Updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
+        }
+
+        /**
+         * this function updates the mensa menu list
+         * during the update process the old data will be returned for 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)
+            }
+
+            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()
+            }
+        }
+
+        /**
+         * 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))
+
+            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()
+                }
+            }
+        }
+
+    }
+}

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

@@ -0,0 +1,75 @@
+/**
+ * TheCitadelofRicks
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.thecitadelofricks.controller
+
+import org.mosad.thecitadelofricks.controller.StatusController.Companion.totalRequests
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
+import java.net.HttpURLConnection
+import java.net.URL
+
+class CachetAPIController {
+
+     companion object {
+
+         private val logger: Logger = LoggerFactory.getLogger(CachetAPIController::class.java)
+
+         private var oldTotalRequests = 0
+
+         fun postTotalRequests() {
+             try {
+                 val url = URL("${StartupController.cachetBaseURL}/api/v1/metrics/1/points")
+                 val jsonInputString = "{\"value\": ${totalRequests -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
+                 oldTotalRequests = totalRequests
+
+                 val con = url.openConnection() as HttpURLConnection
+                 con.requestMethod = "POST"
+                 con.setRequestProperty("Content-Type", "application/json; utf-8")
+                 con.setRequestProperty("Accept", "application/json")
+                 con.setRequestProperty("X-Cachet-Token", StartupController.cachetAPIKey)
+                 con.doOutput = true
+
+                 val os = con.outputStream
+                 val input = jsonInputString.toByteArray(charset("utf-8"))
+                 os.write(input, 0, input.size)
+
+                 val br = BufferedReader(InputStreamReader(con.inputStream, "utf-8"))
+                 val response = StringBuilder()
+                 var responseLine: String?
+
+                 while (br.readLine().also { responseLine = it } != null) {
+                     response.append(responseLine!!.trim { it <= ' ' })
+                 }
+                 logger.info(response.toString())
+
+             } catch (e1: IOException) {
+                 e1.printStackTrace()
+             }
+         }
+
+     }
+
+}

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

@@ -0,0 +1,149 @@
+/**
+ * TheCitadelofRicks
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.thecitadelofricks.controller
+
+import com.google.gson.Gson
+import com.google.gson.JsonParser
+import org.mosad.thecitadelofricks.TimetableCourseWeek
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.io.*
+import java.util.*
+
+class StartupController {
+
+    private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
+
+    companion object {
+        val userHome: String = System.getProperty("user.dir")
+        val tcorHome = "$userHome/tcor"
+        val dirTcorHome = File(tcorHome)
+        val dirTcorCache = File("$tcorHome/cache")
+        val fileConfig = File("$tcorHome/config.xml")
+
+        var cachetAPIKey = "0"
+        var cachetBaseURL = "https://status.mosad.xyz"
+        var courseListURL = "https://www.hs-offenburg.de/studium/vorlesungsplaene/"
+        var mensaMenuURL = "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
+        var mensaName = "Offenburg"
+    }
+
+    init {
+        // if the tcor directory doesn't exist, create it
+        if (!dirTcorHome.exists()) {
+            dirTcorHome.mkdir()
+        }
+
+        // if the cache directory doesn't exist, create it
+        if (!dirTcorCache.exists()) {
+            dirTcorCache.mkdir()
+        }
+
+        // check if the config file exist, if so load it
+        if (fileConfig.exists()) {
+            loadConfig()
+        } else {
+            createConfig()
+        }
+
+        // read cached timetable files, as they are not initially cached
+        readCachedTimetables()
+    }
+
+    /**
+     * load the config stored in the config.xml file
+     */
+    private fun loadConfig() = try {
+        val properties = Properties()
+        properties.loadFromXML(FileInputStream(fileConfig))
+
+        cachetAPIKey = try {
+            properties.getProperty("cachetAPIKey")
+        } catch (ex: Exception) {
+            "0"
+        }
+
+        cachetBaseURL = try {
+            properties.getProperty("cachetBaseURL")
+        } catch (ex: Exception) {
+            "https://status.mosad.xyz"
+        }
+
+        mensaMenuURL = try {
+            properties.getProperty("mensaMenuURL")
+        } catch (ex: Exception) {
+            "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
+        }
+
+        mensaName = try {
+            properties.getProperty("mensaName")
+        } catch (ex: Exception) {
+            "Offenburg"
+        }
+
+    } catch (ex: Exception) {
+        logger.error("error while loading config", ex)
+    }
+
+    /**
+     * create an initial config file
+     */
+    private fun createConfig() = try {
+        val properties = Properties()
+
+        properties.setProperty("cachetAPIKey", "0")
+        properties.setProperty("cachetBaseURL", "https://status.mosad.xyz")
+        properties.setProperty("mensaMenuURL", "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/")
+        properties.setProperty("mensaName", "Offenburg")
+
+        val outputStream = FileOutputStream(fileConfig)
+        properties.storeToXML(outputStream, "tcor configuration")
+        outputStream.close()
+    } catch (ex: Exception) {
+        logger.error("error while creating config", ex)
+    }
+
+    /**
+     * read all previously cached timetables
+     */
+    private fun readCachedTimetables() {
+        dirTcorCache.walkTopDown().forEach {
+            if (it.isFile && it.name.endsWith(".json")) {
+                val fileReader = FileReader(it)
+                val bufferedReader = BufferedReader(fileReader)
+
+                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()
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,113 @@
+/**
+ * TheCitadelofRicks
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.thecitadelofricks.controller
+
+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.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.net.HttpURLConnection
+import java.net.URL
+import java.time.LocalDateTime
+import java.util.*
+import kotlin.collections.HashMap
+
+class StatusController {
+
+    companion object {
+        private val logger: Logger = LoggerFactory.getLogger(StatusController::class.java)
+
+        var totalRequests = 0
+            private set
+        var mensaMenuRequests = 0
+            private set
+        var courseListRequests = 0
+            private set
+        var timetableRequests = HashMap<String, Int>()
+            private set
+
+        /**
+         * if a mensamenu/courseList/timetable is requested update the specific and total request count
+         */
+        fun updateMensaMenuRequests() {
+            mensaMenuRequests++
+            totalRequests++
+        }
+
+        fun updateCourseListRequests() {
+            courseListRequests++
+            totalRequests++
+        }
+
+        fun updateTimetableRequests(courseName: String) {
+            timetableRequests[courseName] = (timetableRequests[courseName] ?: 0) + 1
+            totalRequests++
+        }
+
+        fun getStatus(): Status {
+            val currentTime = System.currentTimeMillis() / 1000
+            val minutes = (currentTime - startTime) % 3600 / 60
+            val hours = (currentTime - startTime) % 86400 / 3600
+            val days = (currentTime - startTime) / 86400
+
+            var hsoCode = 999
+            var swfrCode = 999
+
+            try {
+                val hsoURL = URL("https://www.hs-offenburg.de/")
+                val swfrURL = URL("https://www.swfr.de/")
+
+                var connection = hsoURL.openConnection() as HttpURLConnection
+                connection.requestMethod = "HEAD"
+
+                connection.connectTimeout = 15000
+                hsoCode = connection.responseCode
+
+                connection = swfrURL.openConnection() as HttpURLConnection
+                connection.connectTimeout = 15000
+                swfrCode = connection.responseCode
+            } catch (e: Exception) {
+                logger.error("Error while fetching url response codes!", e)
+            }
+
+            return Status(
+                LocalDateTime.now(),
+                "$days days, $hours:$minutes",
+                apiVersion,
+                softwareVersion,
+                totalRequests,
+                mensaMenuRequests,
+                courseListRequests,
+                timetableRequests,
+                CacheController.timetableList.size,
+                Date(CacheController.courseList.meta.updateTime * 1000),
+                Date(CacheController.mensaMenu.meta.updateTime * 1000),
+                hsoCode,
+                swfrCode
+            )
+        }
+
+    }
+}

src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/CourseListParser.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
@@ -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

src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/MensaParser.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
@@ -23,32 +23,49 @@
 package org.mosad.thecitadelofricks.hsoparser
 
 import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
 import org.mosad.thecitadelofricks.Meal
 import org.mosad.thecitadelofricks.MensaWeek
 import org.slf4j.LoggerFactory
 import java.net.SocketTimeoutException
 
 class MensaParser {
-
-    var logger: org.slf4j.Logger = LoggerFactory.getLogger(MensaParser::class.java)
+    private var logger: org.slf4j.Logger = LoggerFactory.getLogger(MensaParser::class.java)
 
     /**
-     * returns the mensa menu for a week
+     * returns the mensa's menu for a week
      * @param mensaMenuURL the url to a mensa menu (swfr)
-     * @return the menu plan found at menuURL or null if the request was not successful
+     * @return the mensa's menu as MensaWeek found at menuURL or null if the request was not successful
      */
     fun getMensaMenu(mensaMenuURL: String): MensaWeek? {
-        val mealWeekList = MensaWeek()
-        try {
+        return try {
             val menuHTML = Jsoup.connect(mensaMenuURL).timeout(15000).get()
+            parseMensaMenu(menuHTML)
+        } catch (ex: SocketTimeoutException) {
+            logger.warn("timeout from $mensaMenuURL, updating on next attempt!")
+            null
+        } catch (gex: Exception) {
+            logger.error("general MensaParser error", gex)
+            null
+        }
+    }
 
-            menuHTML.select("#speiseplan-tabs").select("div.tab-content").select("div.menu-tagesplan")
+    /**
+     * parse the mensa's menu from the html document
+     * @param htmlDoc the html document containing the menu
+     * @return the mensa's menu as MensaWeek
+     */
+    fun parseMensaMenu(htmlDoc: Document): MensaWeek? {
+        val mealWeekList = MensaWeek()
+
+        try {
+            htmlDoc.select("#speiseplan-tabs").select("div.tab-content").select("div.menu-tagesplan")
                 .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() }
 
@@ -56,11 +73,8 @@ class MensaParser {
                     }
 
                 }
-        } catch (ex: SocketTimeoutException) {
-            logger.warn("timeout from $mensaMenuURL, updating on next attempt!")
-            return null
-        } catch (gex: Exception) {
-            logger.error("general MensaParser error", gex)
+        } catch (pex: Exception) {
+            logger.error("error while parsing the html file", pex)
             return null
         }
 

src/main/kotlin/org/mosad/thecitadelofricks/hsoparser/TimetableParser.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
@@ -22,27 +22,51 @@
 
 package org.mosad.thecitadelofricks.hsoparser
 
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.sync.Semaphore
 import org.jsoup.Jsoup
+import org.jsoup.nodes.Document
+import org.mosad.thecitadelofricks.CalendarWeek
 import org.mosad.thecitadelofricks.Lesson
 import org.mosad.thecitadelofricks.TimetableWeek
+import org.slf4j.LoggerFactory
 
-class TimetableParser {
+/**
+ * @param timetableURL the URL of the timetable you want to get
+ * @param htmlDoc the html document to use (the timetableURL will be ignored if this value is present)
+ */
+class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
+    private var logger: org.slf4j.Logger = LoggerFactory.getLogger(TimetableParser::class.java)
     private val days = arrayOf("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday")
 
+    companion object {
+        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()
+            }
+        }
+    }
+
     /**
-     * get the timetable from the given url
+     * 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
-     * @param timetableURL the URL of the timetable you want to get
      */
-    fun getTimeTable(timetableURL: String): TimetableWeek {
+    fun parseTimeTable(): TimetableWeek? = htmlDoc?.let {
         val timetableWeek = TimetableWeek()
-        val scheduleHTML = Jsoup.connect(timetableURL).get() // TODO add a try catch block to cover timeouts
+        val rows = it.select("table.timetable").select("tr[scope=\"row\"]")
 
-        //val week = scheduleHTML.select("h1.timetable-caption").text()
-        //println("$week successful!\n")
-
-        val rows = scheduleHTML.select("table.timetable").select("tr[scope=\"row\"]")
         var sDay = -1
         var sRow = -1
         var sLesson = Lesson("", "", "", "", "")
@@ -53,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))) {
@@ -96,8 +120,7 @@ class TimetableParser {
 
                 lessonIndexDay++
 
-                if (element.hasClass("lastcol"))
-                {
+                if (element.hasClass("lastcol")) {
                     day++
                     lessonIndexDay = 0
                 }
@@ -105,11 +128,19 @@ class TimetableParser {
 
         }
 
-        //printTimetableWeek(timetableWeek)
-
         return timetableWeek
     }
 
+    /**
+     * parse the calendar week and the associated year for the timetable
+     */
+    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")
     /**
      * print a timetable
@@ -157,4 +188,5 @@ class TimetableParser {
 
         println(" \n")
     }
+
 }

src/main/resources/application.properties

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

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

@@ -0,0 +1,60 @@
+/**
+ * TheCitadelofRicks
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+package org.mosad.thecitadelofricks.hsoparser
+
+import org.jsoup.Jsoup
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import java.io.File
+
+internal class MensaParserTest {
+    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()
+
+        Assertions.assertEquals(expectedOutput, mensaWeek.toString())
+    }
+
+    @Test
+    fun parseMensaMenuEmptyWeek() {
+        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(expectedOutput, mensaWeek.toString())
+    }
+
+    // TODO add test for special days ie. public holiday
+
+    @Test
+    fun getMenuLinkNextWeek() {
+        val urlNextWeek = MensaParser().getMenuLinkNextWeek(mensaMenuURL) // this need a connection to the swfr server
+        Assertions.assertNotNull(urlNextWeek)
+    }
+}

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

@@ -0,0 +1,61 @@
+/**
+ * TheCitadelofRicks
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+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 {
+
+    @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(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
+        val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_normal-week.txt").readText().trim()
+
+        Assertions.assertEquals(expectedTimetable, actualTimetable)
+    }
+
+    @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(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
+        val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_empty-week.txt").readText().trim()
+
+        Assertions.assertEquals(expectedTimetable, actualTimetable)
+    }
+
+    @Test
+    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 actualCalendarWeek = TimetableParser(htmlDoc = htmlDoc).parseCalendarWeek()
+
+        Assertions.assertEquals(CalendarWeek(42, 2019), actualCalendarWeek)
+    }
+}

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=[])])

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=[])])

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

@@ -0,0 +1 @@
+TimetableWeek(days=[TimetableDay(timeslots=[[], [], [], [], [], []]), TimetableDay(timeslots=[[], [], [], [], [], []]), TimetableDay(timeslots=[[], [], [], [], [], []]), TimetableDay(timeslots=[[], [], [], [], [], []]), TimetableDay(timeslots=[[], [], [], [], [], []]), TimetableDay(timeslots=[[], [], [], [], [], []])])

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

@@ -0,0 +1 @@
+TimetableWeek(days=[TimetableDay(timeslots=[[Lesson(lessonID=0.0.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=0.1.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=0.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=0.3.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A111a, lessonRemark=)], [Lesson(lessonID=0.4.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A111a, lessonRemark=)], [Lesson(lessonID=0.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[Lesson(lessonID=1.0.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=1.1.0, lessonSubject=Systemprogramm., lessonTeacher=Mayer E., lessonRoom=B040, lessonRemark=)], [Lesson(lessonID=1.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=1.3.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A112, lessonRemark=)], [Lesson(lessonID=1.4.0, lessonSubject=Prakt. Computernetze, lessonTeacher=Mayer E., lessonRoom=STB 0.28, A112, lessonRemark=)], [Lesson(lessonID=1.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[Lesson(lessonID=2.0.0, lessonSubject=Softw. Engin. 1, lessonTeacher=Dorer, K., lessonRoom=A213, lessonRemark=)], [Lesson(lessonID=2.1.0, lessonSubject=Datenbanksysteme 1, lessonTeacher=Grabowski, H., lessonRoom=B040, lessonRemark=)], [Lesson(lessonID=2.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=2.3.0, lessonSubject=Praktikum Internet-Programmierung, lessonTeacher=Orb, J., lessonRoom=B207, lessonRemark=)], [Lesson(lessonID=2.4.0, lessonSubject=Praktikum Internet-Programmierung, lessonTeacher=Orb, J., lessonRoom=B207, lessonRemark=)], [Lesson(lessonID=2.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[Lesson(lessonID=3.0.0, lessonSubject=Prakt. Datenbanksyst., lessonTeacher=Grabowski, H., lessonRoom=D115, B204b, lessonRemark=)], [Lesson(lessonID=3.1.0, lessonSubject=Zusatzübung C++, lessonTeacher=Behr, A., lessonRoom=D116, lessonRemark=), Lesson(lessonID=3.1.1, lessonSubject=Prakt. Datenbanksyst., lessonTeacher=Grabowski, H., lessonRoom=D115, B204b, lessonRemark=)], [Lesson(lessonID=3.2.0, lessonSubject=Softw. Engin. 1, lessonTeacher=Dorer, K., lessonRoom=B013, lessonRemark=)], [Lesson(lessonID=3.3.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=3.4.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=3.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[Lesson(lessonID=4.0.0, lessonSubject=Computernetze 1, lessonTeacher=Mayer E., lessonRoom=A213, lessonRemark=)], [Lesson(lessonID=4.1.0, lessonSubject=Internet-Programmierung, lessonTeacher=Orb, J., lessonRoom=A213, lessonRemark=)], [Lesson(lessonID=4.2.0, lessonSubject=Prakt. Systemprogr., lessonTeacher=Mayer E., lessonRoom=STB 0.28, lessonRemark=)], [Lesson(lessonID=4.3.0, lessonSubject=Prakt. Systemprogr., lessonTeacher=Mayer E., lessonRoom=STB 0.28, lessonRemark=)], [Lesson(lessonID=4.4.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=4.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]]), TimetableDay(timeslots=[[Lesson(lessonID=5.0.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=5.1.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=5.2.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=5.3.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=5.4.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)], [Lesson(lessonID=5.5.0, lessonSubject=, lessonTeacher=, lessonRoom=, lessonRemark=)]])])

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

@@ -0,0 +1,134 @@
+<div id="speiseplan-tabs">
+    <div id="tab-menu-container" class="row">
+        <div class="col-md-1 col-xs-6"></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>
+            </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>
+    <div class="row">
+        <div class="col-sm-4">
+            <table class="table legende">
+                <tbody>
+                <tr>
+                    <td class="vegetarisch legend"></td>
+                    <td class="legend-info">vegetarisch</td>
+                </tr>
+                <tr>
+                    <td class="vegan legend"></td>
+                    <td class="legend-info">vegan</td>
+                </tr>
+                <tr>
+                    <td class="wunsch-vegan legend"></td>
+                    <td class="legend-info">auf Wunsch vegan</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+        <div class="col-sm-4 pt-3">
+            <div class="hide-with-allergenes">
+                <p><a download="_KW_33-2019.pdf" title="Wochenplan in Farbe herunterladen" target="_blank"
+                      href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=9c8a69897ba4f187d21b350d48473425"><i
+                        class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
+                <p><a download="_KW_33-2019.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank"
+                      href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=3e887f29d8cf2a15bd54620c56f43e02"><i
+                        class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
+            </div>
+            <div class="show-with-allergenes">
+                <p><a download="_KW_33-2019.pdf" title="Wochenplan in Farbe herunterladen" target="_blank"
+                      href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=e5c36a88733c75c5eded775acad35bc6"><i
+                        class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
+                <p><a download="_KW_33-2019.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank"
+                      href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=b0d4e30323a2010310bbb6cad8b55fe9"><i
+                        class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
+            </div>
+        </div>
+        <div class="col-sm-4 pt-3">
+            <p class="hide-with-allergenes"><a href="#" data-toggle="modal" data-target="#allergenesModal"><i
+                    class="fas fa-redo-alt"></i> Allergiehinweise anzeigen</a></p>
+            <p class="show-with-allergenes"><a href="#" class="btn-hide-allergenes"><i class="fas fa-undo-alt"></i>
+                Allergiehinweise verbergen</a></p>
+        </div>
+    </div>
+    <div class="tab-content">
+        <div id="tab-mon" class="menu-tagesplan tab-pane fade">
+            <h3>Montag 12.08.</h3>
+            <div class="row row-narrow row-buffer row-table">
+                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                    <i class="glyphicons glyphicons-circle-info"></i>
+                </div>
+                <div class="col-md-11 border-beige-hell">
+                    <h4>heute keine Essensausgabe</h4>
+                </div>
+            </div>
+        </div>
+        <div id="tab-tue" class="menu-tagesplan tab-pane fade">
+            <h3>Dienstag 13.08.</h3>
+            <div class="row row-narrow row-buffer row-table">
+                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                    <i class="glyphicons glyphicons-circle-info"></i>
+                </div>
+                <div class="col-md-11 border-beige-hell">
+                    <h4>heute keine Essensausgabe</h4>
+                </div>
+            </div>
+        </div>
+        <div id="tab-wed" class="menu-tagesplan tab-pane fade">
+            <h3>Mittwoch 14.08.</h3>
+            <div class="row row-narrow row-buffer row-table">
+                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                    <i class="glyphicons glyphicons-circle-info"></i>
+                </div>
+                <div class="col-md-11 border-beige-hell">
+                    <h4>heute keine Essensausgabe</h4>
+                </div>
+            </div>
+        </div>
+        <div id="tab-thu" class="menu-tagesplan tab-pane fade">
+            <h3>Donnerstag 15.08.</h3>
+            <div class="row row-narrow row-buffer row-table">
+                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                    <i class="glyphicons glyphicons-circle-info"></i>
+                </div>
+                <div class="col-md-11 border-beige-hell">
+                    <h4>heute keine Essensausgabe</h4>
+                </div>
+            </div>
+        </div>
+        <div id="tab-fri" class="menu-tagesplan tab-pane fade in show active">
+            <h3>Freitag 16.08.</h3>
+            <div class="row row-narrow row-buffer row-table">
+                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                    <i class="glyphicons glyphicons-circle-info"></i>
+                </div>
+                <div class="col-md-11 border-beige-hell">
+                    <h4>heute keine Essensausgabe</h4>
+                </div>
+            </div>
+        </div>
+        <div id="tab-sat" class="menu-tagesplan tab-pane fade">
+            <h3>Samstag 17.08.</h3>
+            <div class="row row-narrow row-buffer row-table">
+                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                    <i class="glyphicons glyphicons-circle-info"></i>
+                </div>
+                <div class="col-md-11 border-beige-hell">
+                    <h4>heute keine Essensausgabe</h4>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,513 @@
+<div id="speiseplan-tabs">
+    <div id="tab-menu-container" class="row">
+        <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 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="/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">
+                <tr>
+                    <td class="vegetarisch legend"></td>
+                    <td class="legend-info">vegetarisch</td>
+                </tr>
+                <tr>
+                    <td class="vegan legend"></td>
+                    <td class="legend-info">vegan</td>
+                </tr>
+                <tr>
+                    <td class="wunsch-vegan legend"></td>
+                    <td class="legend-info">auf Wunsch vegan</td>
+                </tr>
+            </table>
+        </div>
+        <div class="col-sm-4 pt-3">
+            <div class="hide-with-allergenes">
+                <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="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>
+        </div>
+    </div>
+    <div class="tab-content">
+        <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  {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-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>3,05 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>4,00 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>5,40 €</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="row grey lighten-4 mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    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-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>3,05 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>4,00 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>5,40 €</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="row grey lighten-4 mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Grill und Salatbar
+                    <br>Asiatisches aus dem Wok
+                    <br>Fleisch- und Fischspezialitäten
+                    <br>Pasta-, Reis und Kartoffelvariationen
+                    <br>Gemüse
+                    <br>
+                </div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div id="tab-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  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Tortellini mit Gemüsefüllung
+                    <br>Tomatensauce
+                    <br>Geriebener Hartkäse
+                    <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-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>3,05 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>4,00 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>5,40 €</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="row grey lighten-4 mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    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  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Grill und Salatbar
+                    <br>Asiatisches aus dem Wok
+                    <br>Fleisch- und Fischspezialitäten
+                    <br>Pasta-, Reis und Kartoffelvariationen
+                    <br>Gemüse
+                    <br>
+                </div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div id="tab-wed" class="menu-tagesplan tab-pane fade">
+            <h3>Mittwoch 11.03.</h3>
+            <div class="row wunsch-vegan mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Gebratener Gemüsereis Nasi Goreng
+                    <br>Raita
+                    <br>Mixsalat
+                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5<br>enthält Allergene: So,Sn,Se,Gl,GlW,ML</span></div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>3,05 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>4,00 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>5,40 €</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="row grey lighten-4 mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Kalbsbratwurst
+                    <br>Bratensauce
+                    <br>Kartoffelbrei
+                    <br>Apfelrotkraut
+                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,5,6,8,ri</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,5,6,8,ri<br>enthält Allergene: Sn,Se,Sf,Gl,GlW,GlG,ML</span></div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>3,05 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>4,00 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>5,40 €</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="row grey lighten-4 mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Grill und Salatbar
+                    <br>Asiatisches aus dem Wok
+                    <br>Fleisch- und Fischspezialitäten
+                    <br>Pasta-, Reis und Kartoffelvariationen
+                    <br>Gemüse
+                    <br>
+                </div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div id="tab-thu" class="menu-tagesplan tab-pane fade">
+            <h3>Donnerstag 12.03.</h3>
+            <div class="row vegetarisch mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Spaghetti
+                    <br>Chinagemüse
+                    <br>Sauce süß-sauer
+                    <br>Geriebener Hartkäse
+                    <br>Mixsalat
+                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5,6</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5,6<br>enthält Allergene: Ei,Sn,Se,Sf,Gl,GlW,GlG,ML</span></div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>3,05 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>4,00 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>5,40 €</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="row grey lighten-4 mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Paniertes Seelachsfilet
+                    <br>Sesam-Mayonnaise
+                    <br>Salzkartoffeln
+                    <br>Karottenmix mit Brokkoli und Bohnen
+                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: nF</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: nF<br>enthält Allergene: Ei,Sn,Fi,Sa,Gl,GlW</span></div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>3,05 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>4,00 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>5,40 €</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="row grey lighten-4 mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Grill und Salatbar
+                    <br>Asiatisches aus dem Wok
+                    <br>Fleisch- und Fischspezialitäten
+                    <br>Pasta-, Reis und Kartoffelvariationen
+                    <br>Gemüse
+                    <br>
+                </div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div id="tab-fri" class="menu-tagesplan tab-pane fade">
+            <h3>Freitag 13.03.</h3>
+            <div class="row vegetarisch mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Kartoffel-Gorgonzolagratin
+                    <br>Brokkoligemüse
+                    <br>Beilagensalat
+                    <br><span class="zusatzsstoffe show-with-allergenes">enthält Allergene: ML</span></div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>3,05 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>4,00 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>5,40 €</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="row grey lighten-4 mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Hähnchenbrustfilet
+                    <br>Apfel-Rahmsauce
+                    <br>Mandelreis
+                    <br>Karottengemüse
+                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5<br>enthält Allergene: Gl,GlW,GlG,Nu,NM,ML</span></div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>3,05 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>4,00 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>5,40 €</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="row grey lighten-4 mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Grill und Salatbar
+                    <br>Asiatisches aus dem Wok
+                    <br>Fleisch- und Fischspezialitäten
+                    <br>Pasta-, Reis und Kartoffelvariationen
+                    <br>Gemüse
+                    <br>
+                </div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div id="tab-sat" class="menu-tagesplan tab-pane fade">
+            <h3>Samstag 14.03.</h3>
+            <div class="row row-narrow row-buffer row-table">
+                <div class="col-md-1 bg-beige-hell zusatzangaben"><i class="glyphicons glyphicons-circle-info"></i></div>
+                <div class="col-md-11 border-beige-hell">
+                    <h4>heute keine Essensausgabe</h4></div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-sm-6">
+        <h4 class="grau">Kennzeichnungen/Zusatzstoffe</h4>
+        <dl class="dl-horizontal menu-zusatzstoffe grau"><dt>nF</dt>
+            <dd>aus nachhaltigem Fischfang</dd><dt>ri</dt>
+            <dd>mit Rindfleisch</dd><dt>sch</dt>
+            <dd>mit Schwein</dd><dt>4</dt>
+            <dd>mit Farbstoff</dd><dt>5</dt>
+            <dd>mit Antioxidationsmittel</dd><dt>6</dt>
+            <dd>mit Konservierungsstoff</dd><dt>8</dt>
+            <dd>mit Phosphat</dd>
+        </dl>
+    </div>
+    <div class="col-sm-6 show-with-allergenes"><div id="c5219" class="csc-default ortsfilter-show ">
+        <h4 class="grau">Allergene</h4>
+        <dl class="dl-horizontal menu-zusatzstoffe grau"><dt>Ei</dt>
+            <dd>Eier</dd><dt>Fi</dt>
+            <dd>Fisch</dd><dt>Gl</dt>
+            <dd>GLUTENHALTIGES Getreide</dd><dt>GlG</dt>
+            <dd>Gerste</dd><dt>GlH</dt>
+            <dd>Hafer</dd><dt>GlW</dt>
+            <dd>Weizen</dd><dt>ML</dt>
+            <dd>Milch /-erzeugnisse</dd><dt>NM</dt>
+            <dd>Mandel</dd><dt>Nu</dt>
+            <dd>SCHALENFRÜCHTE/Nüsse</dd><dt>Sa</dt>
+            <dd>Sesam</dd><dt>Se</dt>
+            <dd>Sellerie</dd><dt>Sf</dt>
+            <dd>Schwefeldioxid/Sulfite</dd><dt>Sn</dt>
+            <dd>Senf</dd><dt>So</dt>
+            <dd>Soja</dd>
+        </dl>
+    </div>
+    </div>
+    <!-- Modal -->
+    <div class="modal fade" id="allergenesModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+        <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="myModalLabel">Allergikerspeiseplan</h4>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                </div>
+                <div class="modal-body">
+                    <p>Die Angaben über die Inhaltsstoffe der Speisen beruhen auf Rezepturen, einzelnen Zutaten und den Informationen, die wir von den Herstellern und Lieferanten der einzelnen Speisezutaten erhalten. Da die Hersteller selten nur ein Produkt herstellen und vertreiben, kann nie ganz ausgeschlossen werden, dass auch Anteile von nicht aufgeführten Inhaltsstoffen in den Produkten enthalten sind.</p>
+                    <p>Des Weiteren bringt es die handwerkliche Verarbeitung und Behandlung von Lebensmitteln in Großküchen mit sich, dass bei der Zusammenführung der verschiedenen Speisekomponenten eine ungewollte Vermischung auftreten kann und damit verbunden, der Übergang geringer Mengen von weiteren Stoffen, die Allergien und Unverträglichkeiten auslösen können. Diese Spuren sind in der Kennzeichnung nicht berücksichtigt.</p>
+                    <p>Aus diesem Grund müssen Allergiker/innen beachten, dass in den angebotenen Speisen neben den gekennzeichneten noch weitere allergieauslösende Inhaltsstoffe enthalten sein können. Das Studierendenwerk Freiburg schließt daher jegliche Haftung aufgrund von nicht rezeptürlichen Bestandteilen der Speisen aus. </p>
+                    <p>Bitte beachten Sie beim Wochenplan: Die Allergenkennzeichnung kann sich bis zum Ausgabetag ändern, Richtigkeit wird nur im aktuellen Tagesplan gewährleistet.</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
+                    <button type="button" class="btn btn-primary btn-show-allergenes">Ich habe die Nutzungsbedingungen verstanden und möchte den Allergikerspeiseplan sehen.</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>