change some parameters

* fixes #13
* use a HashMap for timetableRequests count
* api version 1.2.0
* software version 1.2.3

.drone.yml

@@ -7,8 +7,3 @@ steps:
   commands:
   - gradle test
 
-- name: test-jdk8
-  image: gradle:jdk8
-  commands:
-  - gradle test
-

.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/
 

README.md

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

build.gradle

@@ -1,51 +1,39 @@
-
+plugins {
-buildscript {
+    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
-    ext.kotlin_version = '1.3.50'
+    id 'org.jetbrains.kotlin.plugin.spring' version '1.3.72'
-    ext.spring_boot_version = '2.1.9.RELEASE'
+    id 'org.springframework.boot' version '2.3.0.RELEASE'
-
+    id 'io.spring.dependency-management' version '1.0.9.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'
+group 'org.mosad'
-apply plugin: 'kotlin-spring'
+version '1.2.2'
-apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-
-test {
-    useJUnitPlatform()
-
-    testLogging {
-        events "PASSED", "FAILED", "SKIPPED"
-    }
-}
 
 repositories {
     jcenter()
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.1"
-    implementation 'org.jsoup:jsoup:1.12.1'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
+    implementation 'org.jsoup:jsoup:1.13.1'
+    implementation 'com.google.code.gson:gson:2.8.6'
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.5.1")
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
+}
+
+test {
+    useJUnitPlatform()
+
+    testLogging {
+        events 'PASSED', 'FAILED', 'SKIPPED'
+    }
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
-
-group 'org.mosad'
-version '1.1.6'

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
+        0) set -- ;;
-        (1) set -- "$args0" ;;
+        1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
+        2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # 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"
 
-# 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")"
-fi
-
 exec "$JAVACMD" "$@"

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
@@ -28,10 +28,11 @@ import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLesso
 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.mosad.thecitadelofricks.controller.StatusController.Companion.updateTotalRequests
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.RequestMapping
@@ -39,7 +40,6 @@ import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import java.time.LocalDateTime
 import java.util.*
-import kotlin.collections.ArrayList
 
 @RestController
 class APIController {
@@ -47,66 +47,58 @@ class APIController {
     private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
 
     companion object {
-        const val apiVersion = "1.1.4"
+        const val apiVersion = "1.2.0"
-        const val softwareVersion = "1.1.6"
+        const val softwareVersion = "1.2.3"
         val startTime = System.currentTimeMillis() / 1000
     }
 
     init {
-        CacheController() // initialize the CacheController
+        StartupController()
-    }
+        CacheController()
-
-    // TODO remove this with API version 1.2.0
-    @Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()"))
-    @RequestMapping("/courses")
-    fun courses(): CourseList {
-        return courseList()
     }
 
     @RequestMapping("/courseList")
-    fun courseList(): CourseList {
+    fun courseList(): CoursesList {
         logger.info("courseList request at ${LocalDateTime.now()}!")
-        updateTotalRequests()
+        updateCourseListRequests()
         return courseList
     }
 
     @RequestMapping("/mensamenu")
     fun mensamenu(): MensaMenu {
         logger.info("mensamenu request at ${LocalDateTime.now()}!")
-        updateTotalRequests()
         updateMensaMenuRequests()
         return mensaMenu
     }
 
     @RequestMapping("/timetable")
     fun timetable(
-        @RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
+        @RequestParam(value = "course", defaultValue = "AI4") courseName: String,
         @RequestParam(value = "week", defaultValue = "0") week: Int
     ): TimetableCourseWeek {
         logger.info("timetable request at ${LocalDateTime.now()}!")
-        updateTotalRequests()
         updateTimetableRequests(courseName)
         return getTimetable(courseName, week)
     }
 
-    @RequestMapping("/lessonSubjectList")
+    @RequestMapping("/subjectList")
     fun lessonSubjectList(
-        @RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
+        @RequestParam(value = "course", defaultValue = "AI4") courseName: String,
         @RequestParam(value = "week", defaultValue = "0") week: Int
     ): HashSet<String> {
-        logger.info("lessonSubjectList request at ${LocalDateTime.now()}!")
+        logger.info("subjectList request at ${LocalDateTime.now()}!")
-        updateTotalRequests()
+        updateTimetableRequests(courseName)
         return getLessonSubjectList(courseName, week)
     }
 
     @RequestMapping("/lessons")
     fun lesson(
-        @RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
+        @RequestParam(value = "course", defaultValue = "AI4") courseName: String,
-        @RequestParam(value = "lessonSubject", defaultValue = "Mathematik 4") lessonSubject: String,
+        @RequestParam(value = "subject", defaultValue = "Mathematik 4") lessonSubject: String,
         @RequestParam(value = "week", defaultValue = "0") week: Int
     ): ArrayList<Lesson> {
         logger.info("lesson request at ${LocalDateTime.now()}!")
-        updateTotalRequests()
+        updateTimetableRequests(courseName)
         return getLesson(courseName, lessonSubject, week)
     }
 
@@ -122,4 +114,25 @@ class APIController {
         return 200
     }
 
+    /**
+     * Deprecated section
+     */
+
+    // TODO remove this with API version 2.0.0
+    @Deprecated("courses is replaced by courseList", replaceWith = ReplaceWith("courseList()"))
+    @RequestMapping("/courses")
+    fun courses(): CoursesList {
+        return courseList()
+    }
+
+    // TODO remove this with API version 2.0.0
+    @Deprecated("the parameter courseName is deprecated please use course", ReplaceWith("timetable(courseName, week)"))
+    @RequestMapping("/timetable", params= ["courseName", "week"])
+    fun timetableDep(
+        @RequestParam(value = "courseName", defaultValue = "AI4") courseName: String,
+        @RequestParam(value = "week", defaultValue = "0") week: Int
+    ): TimetableCourseWeek {
+       return timetable(courseName, week)
+    }
+
 }

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/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,14 @@ 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, val totalCourses: Int)
 
-data class CourseList(val meta: CourseMeta, val courses: ArrayList<Course>)
+data class CoursesList(val meta: CoursesMeta, val courses: ArrayList<Course>)
 
 // data classes for the Mensa part
 data class Meal(val day: String, val heading: String, val parts: ArrayList<String>, val additives: String)
@@ -56,9 +57,9 @@ 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 weekIndex: Int, val weekNumberYear: Int, val link: String)
+data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, val weekNumberYear: 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
@@ -69,9 +70,10 @@ data class Status(
     val uptime: String,
     val apiVersion: String,
     val softwareVersion: String,
-    val requestCount: Int,
+    val totalRequests: Int,
     val mensaMenuRequests: Int,
-    val timetableRequests: ArrayList<TimetableCounter>,
+    val courseListRequests: Int,
+    val timetableRequests: HashMap<String, Int>,
     val timetableListSize: Int,
     val coursesLastUpdate: Date,
     val mensaLastUpdate: Date,

src/main/kotlin/org/mosad/thecitadelofricks/controller/CacheController.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,6 +22,7 @@
 
 package org.mosad.thecitadelofricks.controller
 
+import com.google.gson.Gson
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
@@ -32,37 +33,34 @@ import org.mosad.thecitadelofricks.hsoparser.MensaParser
 import org.mosad.thecitadelofricks.hsoparser.TimetableParser
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import java.io.BufferedWriter
+import java.io.File
+import java.io.FileWriter
 import java.util.*
+import java.util.concurrent.Executors
 import kotlin.collections.ArrayList
+import kotlin.collections.HashSet
 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"
-
     init {
         initUpdates()
         scheduledUpdates()
     }
 
-    // cache objects
     companion object{
         private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
 
-        lateinit var courseList: CourseList
+        var courseList = CoursesList(CoursesMeta(0, 0), ArrayList())
-        lateinit var mensaMenu: MensaMenu
+        var mensaMenu = MensaMenu(MensaMeta(0,""), MensaWeek(), MensaWeek())
         var timetableList = ArrayList<TimetableCourseWeek>() // this list contains all timetables
 
         /**
-         * get a timetable, since they may not cached, we need to make sure it's cached, otherwise download
+         * get a timetable, since they may not be cached, we need to make sure it's cached, otherwise download
          * @param courseName the name of the course to be requested
          * @param weekIndex request week number (current week = 0)
-         * @return the timetable of a course (courseName)
+         * @return timetable of the course (Type: [TimetableCourseWeek])
          */
         fun getTimetable(courseName: String, weekIndex: Int): TimetableCourseWeek = runBlocking {
             val currentTime = System.currentTimeMillis() / 1000
@@ -76,25 +74,14 @@ class CacheController {
                     val courseLink = courseList.courses.stream().filter { x -> x.courseName == courseName }.findFirst().orElse(null).courseLink
                     val timetableLink = courseLink.replace("week=0","week=$weekIndex")
 
-                    val jobTimetable = GlobalScope.async {
+                    val jobTimetable = async {
                         timetable = TimetableParser().getTimeTable(timetableLink)
                         weekNumberYear = TimetableParser().getWeekNumberYear(timetableLink)
                     }
 
                     jobTimetable.await()
+                    timetableList.add(TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink), timetable))
 
-                    timetableList.add(
-                        TimetableCourseWeek(
-                            TimetableCourseMeta(
-                                currentTime,
-                                courseName,
-                                weekIndex,
-                                weekNumberYear,
-                                timetableLink
-                            ),
-                            timetable
-                        )
-                    )
                     logger.info("added new timetable for $courseName, week $weekIndex")
                 }
             }
@@ -103,7 +90,7 @@ class CacheController {
         }
 
         /**
-         * get every explicit lesson in a week
+         * get every explicit lesson in a week for a selected course
          * @param courseName the name of the course to be requested
          * @param weekIndex request week number (current week = 0)
          * @return a HashSet of explicit lessons for one week
@@ -121,11 +108,11 @@ class CacheController {
         }
 
         /**
-         * get every explicit lesson in a week
+         * 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 of every lesson with lessonSubject for one week
+         * @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>()
@@ -133,36 +120,24 @@ class CacheController {
             // get all lessons from the weeks timetable
             val flatMap = getTimetable(courseName, weekIndex).timetable.days.flatMap { it.timeslots.asIterable() }
             flatMap.forEach {
-                it.forEach { lesson ->
+                it.stream().filter { x -> x.lessonSubject.contains(lessonSubject) }.findAny().ifPresent { x -> lessonList.add(x) }
-                    if(lesson.lessonSubject.contains(lessonSubject)) {
-                        lessonList.add(lesson)
-                    }
-                }
-
-                // TODO Java 11
-                //it.stream().filter { x -> x.lessonSubject.contains(lessonSubject) }.findAny().ifPresent { x -> println("${x.lessonSubject}, ${x.lessonTeacher}") }
             }
 
             return lessonList
         }
-    }
+
+        // private cache functions
 
         /**
          * this function updates the courseList
          * during the update process the old data will be returned for a API request
          */
         private fun asyncUpdateCourseList() = GlobalScope.launch {
-        CourseListParser().getCourseLinks(courseListURL)?.let {
+            CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
-            courseList =
+                courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it)
-                CourseList(
-                    CourseMeta(
-                        System.currentTimeMillis() / 1000,
-                        it.size
-                    ), it
-                )
             }
 
-        logger.info("updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
+            logger.info("Updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
         }
 
         /**
@@ -170,34 +145,57 @@ class CacheController {
          * 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 mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
-        val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(mensaMenuURL))
+            val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(StartupController.mensaMenuURL))
 
             // only update if we get valid data
             if (mensaCurrentWeek != null && mensaNextWeek != null) {
-            mensaMenu =
+                mensaMenu = MensaMenu(MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek)
-                MensaMenu(
-                    MensaMeta(
-                        System.currentTimeMillis() / 1000,
-                        mensaName
-                    ), mensaCurrentWeek, mensaNextWeek
-                )
             }
 
-        logger.info("updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
+            logger.info("Updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
         }
 
         /**
          * this function updates all existing timetables
          * during the update process the old data will be returned for a API request
+         * a FixedThreadPool is used to make parallel requests for faster updates
          */
         private fun asyncUpdateTimetables() = GlobalScope.launch {
+            logger.info("Updating ${timetableList.size} timetables ...")
+
+            // create a new ThreadPool with 5 threads
+            val executor = Executors.newFixedThreadPool(5)
+
+            try {
                 timetableList.forEach { timetableCourse ->
-            val updateURL = timetableCourse.meta.link
+                    executor.execute {
-            timetableCourse.timetable = TimetableParser().getTimeTable(updateURL)
+                        timetableCourse.timetable = TimetableParser().getTimeTable(timetableCourse.meta.link)
                         timetableCourse.meta.updateTime = System.currentTimeMillis() / 1000
+
+                        saveTimetableToCache(timetableCourse) // save the updated timetable to the cache directory
                     }
-        logger.info("updated ${timetableList.size} timetables successful!")
+
+                }
+            } catch (ex: Exception) {
+                logger.error("Error while updating the timetables", ex)
+            } finally {
+                executor.shutdown()
+            }
+        }
+
+        /**
+         * save a timetable to the cache directory
+         * this is only call on async updates, it is NOT call when first getting the timetable
+         * @param timetable a timetable of the type [TimetableCourseWeek]
+         */
+        private fun saveTimetableToCache(timetable: TimetableCourseWeek) {
+            println(timetable.timetable.toString())
+
+            val file = File(StartupController.dirTcorCache, "timetable-${timetable.meta.courseName}-${timetable.meta.weekIndex}.json")
+            val writer = BufferedWriter(FileWriter(file))
+            writer.write(Gson().toJson(timetable))
+            writer.close()
         }
 
         /**
@@ -205,45 +203,19 @@ class CacheController {
          * 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
+            // get all course links on startup, make sure there are course links
-        val jobCourseUpdate = GlobalScope.async {
+            val jobCourseUpdate = asyncUpdateCourseList()
-            CourseListParser().getCourseLinks(courseListURL)?.let {
+            val jobMensa = asyncUpdateMensa()
-                courseList =
-                    CourseList(
-                        CourseMeta(
-                            System.currentTimeMillis() / 1000,
-                            it.size
-                        ), it
-                    )
-            }
-        }
 
-        // get the current and next weeks mensa menus
+            jobCourseUpdate.join()
-        val jobMensa = GlobalScope.async{
+            jobMensa.join()
-            val mensaCurrentWeek = MensaParser().getMensaMenu(mensaMenuURL)
-            val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(mensaMenuURL))
 
-            // only update if we get valid data
+            logger.info("Initial updates successful")
-            if (mensaCurrentWeek != null && mensaNextWeek != null) {
-                mensaMenu =
-                    MensaMenu(
-                        MensaMeta(
-                            System.currentTimeMillis() / 1000,
-                            mensaName
-                        ), mensaCurrentWeek, mensaNextWeek
-                    )
-            }
-        }
-
-        jobCourseUpdate.await()
-        jobMensa.await()
-
-        logger.info("init updates successful")
         }
 
         /**
+         * update the CourseList every 24h, the Timetables every 3h and the Mensa Menu every hour
          * doesn't account the change between winter and summer time!
-     *
          */
         private fun scheduledUpdates() {
             val currentTime = System.currentTimeMillis()
@@ -266,10 +238,13 @@ class CacheController {
                 asyncUpdateMensa()
             }
 
-        // post to status.mosad.xyz every hour
+            // post to status.mosad.xyz every hour, if an API key is present
+            if (StartupController.cachetAPIKey != "0") {
                 Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
                     CachetAPIController.postTotalRequests()
                 }
             }
+        }
 
+    }
 }

src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.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
@@ -36,14 +36,12 @@ class CachetAPIController {
      companion object {
 
          private val logger: Logger = LoggerFactory.getLogger(CachetAPIController::class.java)
-         private const val baseURL = "https://status.mosad.xyz"
-         private const val apiKey = "" //TODO
 
          private var oldTotalRequests = 0
 
          fun postTotalRequests() {
              try {
-                 val url = URL("$baseURL/api/v1/metrics/1/points")
+                 val url = URL("${StartupController.cachetBaseURL}/api/v1/metrics/1/points")
                  val jsonInputString = "{\"value\": ${getTotalRequests() -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
                  oldTotalRequests = getTotalRequests()
 
@@ -51,7 +49,7 @@ class CachetAPIController {
                  con.requestMethod = "POST"
                  con.setRequestProperty("Content-Type", "application/json; utf-8")
                  con.setRequestProperty("Accept", "application/json")
-                 con.setRequestProperty("X-Cachet-Token", apiKey)
+                 con.setRequestProperty("X-Cachet-Token", StartupController.cachetAPIKey)
                  con.doOutput = true
 
                  val os = con.outputStream

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

@@ -0,0 +1,147 @@
+/**
+ * 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/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/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/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
+                    CacheController.timetableList.add(Gson().fromJson(timetableObject, TimetableCourseWeek().javaClass))
+                } catch (ex: Exception) {
+                    logger.error("error while reading cache", ex)
+                } finally {
+                    bufferedReader.close()
+                    fileReader.close()
+                }
+            }
+        }
+    }
+}

src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.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
@@ -26,14 +26,13 @@ import org.mosad.thecitadelofricks.APIController.Companion.apiVersion
 import org.mosad.thecitadelofricks.APIController.Companion.softwareVersion
 import org.mosad.thecitadelofricks.APIController.Companion.startTime
 import org.mosad.thecitadelofricks.Status
-import org.mosad.thecitadelofricks.TimetableCounter
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.net.HttpURLConnection
 import java.net.URL
 import java.time.LocalDateTime
 import java.util.*
-import kotlin.collections.ArrayList
+import kotlin.collections.HashMap
 
 class StatusController {
 
@@ -42,33 +41,30 @@ class StatusController {
 
         private var totalRequests = 0
         private var mensaMenuRequests = 0
-        private var timetableRequests = ArrayList<TimetableCounter>()
+        private var courseListRequests = 0
+        private var timetableRequests = HashMap<String, Int>()
 
-        fun updateTotalRequests() {
+        /**
+         * if a mensamenu/courseList/timetable is requested update the specific and total request count
+         */
+        fun updateMensaMenuRequests() {
+            mensaMenuRequests++
             totalRequests++
         }
 
-        fun updateMensaMenuRequests() {
+        fun updateCourseListRequests() {
-            mensaMenuRequests++
+            courseListRequests++
+            totalRequests++
+        }
+
+        fun updateTimetableRequests(courseName: String) {
+            timetableRequests[courseName] = timetableRequests.getOrPut(courseName) {0} + 1
+            totalRequests++
         }
 
         /**
-         * if a timetable is requested update the request counter
+         * getters and setters
          */
-        fun updateTimetableRequests(courseName: String) {
-            when (timetableRequests.stream().filter { x -> x.courseName == courseName }.findAny().orElse(null)) {
-                null -> timetableRequests.add(TimetableCounter(courseName, 0))
-            }
-            timetableRequests.stream().filter { x ->x.courseName == courseName }.findFirst().ifPresent { x -> x.requests++ }
-
-            // TODO Java 11
-//        timetableRequests.stream().filter { it.courseName == courseName }.findFirst().ifPresentOrElse({
-//            it.requests++
-//        }, {
-//
-//        })
-        }
-
         fun getTotalRequests(): Int {
             return totalRequests
         }
@@ -77,7 +73,11 @@ class StatusController {
             return mensaMenuRequests
         }
 
-        fun getTimetableRequests(): ArrayList<TimetableCounter> {
+        fun getCourseListRequests(): Int {
+            return courseListRequests
+        }
+
+        fun getTimetableRequests(): HashMap<String, Int> {
             return timetableRequests
         }
 
@@ -114,6 +114,7 @@ class StatusController {
                 softwareVersion,
                 getTotalRequests(),
                 getMensaMenuRequests(),
+                getCourseListRequests(),
                 getTimetableRequests(),
                 CacheController.timetableList.size,
                 Date(CacheController.courseList.meta.updateTime * 1000),

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,7 +29,7 @@ import java.net.SocketTimeoutException
 
 class CourseListParser {
 
-    var logger: org.slf4j.Logger = LoggerFactory.getLogger(MensaParser::class.java)
+    private var logger: org.slf4j.Logger = LoggerFactory.getLogger(MensaParser::class.java)
 
     /**
      * return a list of all courses at courseListURL

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
@@ -63,9 +63,9 @@ class MensaParser {
                 .forEachIndexed { dayIndex, day ->
                     val strDay = day.select("h3").text()
 
-                    day.select("div.menu-info").forEachIndexed { mealIndex, meal ->
+                    day.select("div.row").forEachIndexed { mealIndex, meal ->
-                        val heading = day.select("h4")[mealIndex].text()
+                        val heading = meal.select("h4.menu-header").text()
-                        val parts = ArrayList(meal.html().substringBefore("<br>\n").replace("\n", "").split("<br>"))
+                        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() }
 

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

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

@@ -1,7 +1,7 @@
 /**
  * TheCitadelofRicks
  *
- * Copyright 2019  <seil0@mosad.xyz>
+ * Copyright 2019-2020  <seil0@mosad.xyz>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,13 +35,9 @@ internal class MensaParserTest {
         val htmlFile = File(MensaParserTest::class.java.getResource("/html/Mensa_normal-week.html").path)
         val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.swfr.de/")
         val mensaWeek = MensaParser().parseMensaMenu(htmlDoc)
+        val expectedOutput = MensaParserTest::class.java.getResource("/expected/Mensa_normal-week.txt").readText()
 
-        // maybe we can find another way for the comparison
+        Assertions.assertEquals(expectedOutput, mensaWeek.toString())
-        Assertions.assertEquals(
-            "MensaWeek(days=[Meals(meals=[Meal(day=Montag 03.07., heading=Essen 1, parts=[Gemüseauflauf , Frischkäse-Paprikasauce , Blattsalat <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9, enthält Allergene: Ei,ML,Lak</span>], additives=Kennzeichnungen/Zusatzstoffe: 9 enthält Allergene: Ei,ML,Lak), Meal(day=Montag 03.07., heading=Essen 2, parts=[Schweinesteak , Pfeffer-Rahmsauce , Country Potatoes , Blattsalat <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 1,5</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 1,5, enthält Allergene: Gl,GlW,GlG,ML,Lak</span>], additives=Kennzeichnungen/Zusatzstoffe: 1,5 enthält Allergene: Gl,GlW,GlG,ML,Lak), Meal(day=Montag 03.07., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse], additives=)]), Meals(meals=[Meal(day=Dienstag 04.07., heading=Essen 1, parts=[Riesenrösti , Rahmchampignons , Blattsalat <span class=\"zusatzsstoffe show-with-allergenes\">enthält Allergene: Gl,GlW,GlG,ML,Lak</span>], additives=enthält Allergene: Gl,GlW,GlG,ML,Lak), Meal(day=Dienstag 04.07., heading=Essen 2, parts=[Spaghetti , Sauce Bolognese , Geriebener Hartkäse , Blattsalat <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 15</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 15, enthält Allergene: Ei,Se,Gl,GlW,ML</span>], additives=Kennzeichnungen/Zusatzstoffe: 15 enthält Allergene: Ei,Se,Gl,GlW,ML), Meal(day=Dienstag 04.07., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse], additives=)]), Meals(meals=[Meal(day=Mittwoch 05.07., heading=Essen 1, parts=[Frühlingsrollen , Feuriger Chilidip , Patnareis , Wokgemüsepfanne <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9, enthält Allergene: Ei,So,Sn,Se,Sf,Gl,GlW,ML,Lak</span>], additives=Kennzeichnungen/Zusatzstoffe: 9 enthält Allergene: Ei,So,Sn,Se,Sf,Gl,GlW,ML,Lak), Meal(day=Mittwoch 05.07., heading=Essen 2, parts=[Bratwurstschnecke , Bratenjus , Kartoffelbrei , Karottengemüse <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 1,8</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 1,8, enthält Allergene: Sn,Se,Gl,GlW,GlG,ML,Lak</span>], additives=Kennzeichnungen/Zusatzstoffe: 1,8 enthält Allergene: Sn,Se,Gl,GlW,GlG,ML,Lak), Meal(day=Mittwoch 05.07., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse], additives=)]), Meals(meals=[Meal(day=Donnerstag 06.07., heading=Essen 1, parts=[Farfalle tricolore , Gorgonzola-Spinatsauce , Endiviensalat <span class=\"zusatzsstoffe show-with-allergenes\">enthält Allergene: Gl,GlW,ML</span>], additives=enthält Allergene: Gl,GlW,ML), Meal(day=Donnerstag 06.07., heading=Essen 2, parts=[Paniertes Seelachsfilet MSC , Remouladensauce , Salzkartoffeln , Brokkoligemüse <span class=\"zusatzsstoffe hide-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9,MSC</span> <span class=\"zusatzsstoffe show-with-allergenes\">Kennzeichnungen/Zusatzstoffe: 9,MSC, enthält Allergene: Ei,Sn,Fi,Gl,GlW,ML,Lak</span>], additives=Kennzeichnungen/Zusatzstoffe: 9,MSC enthält Allergene: Ei,Sn,Fi,Gl,GlW,ML,Lak), Meal(day=Donnerstag 06.07., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse], additives=)]), Meals(meals=[Meal(day=Freitag 07.07., heading=Essen 1, parts=[Italienischer Nudelauflauf mit Gemüse , Tomatenragout , Blattsalat <span class=\"zusatzsstoffe show-with-allergenes\">enthält Allergene: Gl,GlW,ML,Lak</span>], additives=enthält Allergene: Gl,GlW,ML,Lak), Meal(day=Freitag 07.07., heading=Essen 2, parts=[Hähnchen-Saté-Spieß , Erdnusssauce , Langkornreis , Karotten-Erbsengemüse <span class=\"zusatzsstoffe show-with-allergenes\">enthält Allergene: Er,So,Kr,Fi,We,Gl,GlW,ML,Lak</span>], additives=enthält Allergene: Er,So,Kr,Fi,We,Gl,GlW,ML,Lak), Meal(day=Freitag 07.07., heading=Buffet, parts=[Grill und Salatbar , Asiatisches aus dem Wok , Fleisch- und Fischspezialitäten , Pasta-, Reis und Kartoffelvariationen , Gemüse], additives=)]), Meals(meals=[]), Meals(meals=[])])",
-            mensaWeek.toString()
-        )
-
     }
 
     @Test
@@ -49,11 +45,9 @@ internal class MensaParserTest {
         val htmlFile = File(MensaParserTest::class.java.getResource("/html/Mensa_empty-week.html").path)
         val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.swfr.de/")
         val mensaWeek = MensaParser().parseMensaMenu(htmlDoc)
+        val expectedOutput = MensaParserTest::class.java.getResource("/expected/Mensa_empty-week.txt").readText()
 
-        Assertions.assertEquals(
+        Assertions.assertEquals(expectedOutput, mensaWeek.toString())
-            "MensaWeek(days=[Meals(meals=[]), Meals(meals=[]), Meals(meals=[]), Meals(meals=[]), Meals(meals=[]), Meals(meals=[]), Meals(meals=[])])",
-            mensaWeek.toString()
-        )
     }
 
     // TODO add test for special days ie. public holiday

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

@@ -1,7 +1,7 @@
 /**
  * TheCitadelofRicks
  *
- * Copyright 2019  <seil0@mosad.xyz>
+ * Copyright 2019-2020  <seil0@mosad.xyz>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ class TimetableParserTest {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_normal-week.html").path)
         val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.hs-offenburg.de/")
         val actualTimetable = TimetableParser().parseTimeTable(htmlDoc).toString().trim()
-        val expectedTimetable = File(TimetableParserTest::class.java.getResource("/expected/Timetable_normal-week_expected.txt").toURI()).readText().trim()
+        val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_normal-week.txt").readText().trim()
 
         Assertions.assertEquals(expectedTimetable, actualTimetable)
     }
@@ -44,7 +44,7 @@ class TimetableParserTest {
         val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_empty-week.html").path)
         val htmlDoc = Jsoup.parse(htmlFile,"UTF-8", "https://www.hs-offenburg.de/")
         val actualTimetable = TimetableParser().parseTimeTable(htmlDoc).toString().trim()
-        val expectedTimetable = File(TimetableParserTest::class.java.getResource("/expected/Timetable_empty-week_expected.txt").toURI()).readText().trim()
+        val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_empty-week.txt").readText().trim()
 
         Assertions.assertEquals(expectedTimetable, actualTimetable)
     }

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/html/Mensa_normal-week.html

@@ -1,28 +1,23 @@
 <div id="speiseplan-tabs">
     <div id="tab-menu-container" class="row">
-        <div class="col-md-1 col-xs-6"></div>
+        <div class="col-md-1 col-xs-6">
+            <a class="prev-week" title="eine Woche zurück" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=ad074b11cc01a680e4c0d0675dd1f91c"><img src="/fileadmin/templates/images/keil-grau-links.png" width="16" height="16" alt="" /><span class="d-inline d-sm-none">vorherige Woche</span></a>
+        </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-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" data-toggle="tab" role="tab">Di 13.08.</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 14.08.</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 15.08.</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 active show" data-toggle="tab" role="tab">Fr
+                <li class="col-md-2"><a href="#tab-fri" class="nav-link" data-toggle="tab" role="tab">Fr 13.03.</a></li>
-                    16.08.</a></li>
+                <li class="col-md-2"><a href="#tab-sat" class="nav-link" data-toggle="tab" role="tab">Sa 14.03.</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">
+        <div class="col-md-1 col-xs-6 pull-right"><a class="next-week text-right" title="eine Woche weiter" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=2&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=3c3048ebdd7f42a104bd780a0a6a0fd1"><span class="d-inline d-sm-none">nächste Woche</span><img src="/fileadmin/templates/images/keil-grau-rechts.png" width="16" height="16" alt="" /></a></div>
-            <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>
@@ -35,484 +30,484 @@
                     <td class="wunsch-vegan legend"></td>
                     <td class="legend-info">auf Wunsch vegan</td>
                 </tr>
-                </tbody>
             </table>
         </div>
         <div class="col-sm-4 pt-3">
             <div class="hide-with-allergenes">
-                <p><a download="_KW_33-2019.pdf" title="Wochenplan in Farbe herunterladen" target="_blank"
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=4de091579c564e42f79473da2701f179"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
-                      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
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=84edf4562bdc95f103b70ef99e4d7af6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
-                        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"
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=51f0f1e0083f9ef48038920dfb676eb6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
-                      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
+                <p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=c3a9d1eafce78d8f8d281c6060be989c"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
-                        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
+            <p class="hide-with-allergenes"><a href="#" data-toggle="modal" data-target="#allergenesModal"><i class="fas fa-redo-alt"></i> Allergiehinweise anzeigen</a></p>
-                    class="fas fa-redo-alt"></i> Allergiehinweise anzeigen</a></p>
+            <p class="show-with-allergenes"><a href="#" class="btn-hide-allergenes"><i class="fas fa-undo-alt"></i> Allergiehinweise verbergen</a></p>
-            <p class="show-with-allergenes"><a href="#" class="btn-hide-allergenes"><i class="fas fa-undo-alt"></i>
-                Allergiehinweise verbergen</a></p>
         </div>
     </div>
     <div class="tab-content">
-        <div id="tab-mon" class="menu-tagesplan r-tabs-panel r-tabs-state-active" style="display: block;">
+        <div id="tab-mon" class="menu-tagesplan tab-pane fade">
-            <h3>Montag 03.07.</h3>
+            <h3>Montag 09.03.</h3>
-            <div class="row row-narrow row-table">
+            <div class="row vegetarisch mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell vegetarisch">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Gemüseauflauf
+                    Kartoffel-Frischkäsebratling
-                    <br>Frischkäse-Paprikasauce
+                    <br>Gemüseragout Toskana
-                    <br>Blattsalat
+                    <br>Beilagensalat
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9</span>
+                    <br><span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Se,Gl,GlW,ML</span></div>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9<br>enthält Allergene: Ei,ML,Lak</span>
-                </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
-            <div class="row row-narrow row-table">
+            <div class="row grey lighten-4 mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Schweinesteak
+                    Schweineschnitzel Wiener Art
-                    <br>Pfeffer-Rahmsauce
+                    <br>Bratensauce
-                    <br>Country Potatoes
+                    <br>Pommes frites
-                    <br>Blattsalat
+                    <br>Mixsalat
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,5</span>
+                    <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>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,5<br>enthält Allergene: Gl,GlW,GlG,ML,Lak</span>
-                </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
-            <div class="row row-narrow row-table">
+            <div class="row grey lighten-4 mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
                     Grill und Salatbar
                     <br>Asiatisches aus dem Wok
                     <br>Fleisch- und Fischspezialitäten
                     <br>Pasta-, Reis und Kartoffelvariationen
                     <br>Gemüse
+                    <br>
                 </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,85 €<span class="tara"> / 100g</span></td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,00 €<span class="tara"> / 100g</span></td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>1,20 €<span class="tara"> / 100g</span></td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
         </div>
-        <div id="tab-tue" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
+        <div id="tab-tue" class="menu-tagesplan tab-pane fade in show active">
-            <h3>Dienstag 04.07.</h3>
+            <h3>Dienstag 10.03.</h3>
-            <div class="row row-narrow row-table">
+            <div class="row wunsch-vegan mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell vegetarisch">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Riesenrösti
+                    Tortellini mit Gemüsefüllung
-                    <br>Rahmchampignons
+                    <br>Tomatensauce
-                    <br>Blattsalat
-                    <span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Gl,GlW,GlG,ML,Lak</span>
-                </div>
-                <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
-                        <tbody>
-                        <tr>
-                            <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
-                        </tr>
-                        <tr>
-                            <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="row row-narrow row-table">
-                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
-                    Spaghetti
-                    <br>Sauce Bolognese
                     <br>Geriebener Hartkäse
-                    <br>Blattsalat
+                    <br>Beilagensalat
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 15</span>
+                    <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>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 15<br>enthält Allergene: Ei,Se,Gl,GlW,ML</span>
-                </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
-            <div class="row row-narrow row-table">
+            <div class="row grey lighten-4 mb-2">
+                <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
+                    Frikadelle
+                    <br>Champignon-Rahmsauce
+                    <br>Bauernspätzle
+                    <br>Blattsalat
+                    <br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,ri</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,ri<br>enthält Allergene: Ei,Gl,GlW,GlG,ML</span></div>
+                <div class="col-md-4 col-sm-4 menu-price">
+                    <table class="table-sm">
+                        <tr>
+                            <td class="price-studierende">Studierende, Schüler</td>
+                            <td>3,05 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-mitarbeiter">Mitarbeiter</td>
+                            <td>4,00 €</td>
+                        </tr>
+                        <tr>
+                            <td class="price-gaeste">Gäste</td>
+                            <td>5,40 €</td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="row grey lighten-4 mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
                     Grill und Salatbar
                     <br>Asiatisches aus dem Wok
                     <br>Fleisch- und Fischspezialitäten
                     <br>Pasta-, Reis und Kartoffelvariationen
                     <br>Gemüse
+                    <br>
                 </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,85 €<span class="tara"> / 100g</span></td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,00 €<span class="tara"> / 100g</span></td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>1,20 €<span class="tara"> / 100g</span></td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
         </div>
-        <div id="tab-wed" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
+        <div id="tab-wed" class="menu-tagesplan tab-pane fade">
-            <h3>Mittwoch 05.07.</h3>
+            <h3>Mittwoch 11.03.</h3>
-            <div class="row row-narrow row-table">
+            <div class="row wunsch-vegan mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell vegetarisch">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Frühlingsrollen
+                    Gebratener Gemüsereis Nasi Goreng
-                    <br>Feuriger Chilidip
+                    <br>Raita
-                    <br>Patnareis
+                    <br>Mixsalat
-                    <br>Wokgemüsepfanne
+                    <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>
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9</span>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9<br>enthält Allergene: Ei,So,Sn,Se,Sf,Gl,GlW,ML,Lak</span>
-                </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
-            <div class="row row-narrow row-table">
+            <div class="row grey lighten-4 mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Bratwurstschnecke
+                    Kalbsbratwurst
-                    <br>Bratenjus
+                    <br>Bratensauce
                     <br>Kartoffelbrei
-                    <br>Karottengemüse
+                    <br>Apfelrotkraut
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,8</span>
+                    <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>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,8<br>enthält Allergene: Sn,Se,Gl,GlW,GlG,ML,Lak</span>
-                </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
-            <div class="row row-narrow row-table">
+            <div class="row grey lighten-4 mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
                     Grill und Salatbar
                     <br>Asiatisches aus dem Wok
                     <br>Fleisch- und Fischspezialitäten
                     <br>Pasta-, Reis und Kartoffelvariationen
                     <br>Gemüse
+                    <br>
                 </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,85 €<span class="tara"> / 100g</span></td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,00 €<span class="tara"> / 100g</span></td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>1,20 €<span class="tara"> / 100g</span></td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
         </div>
-        <div id="tab-thu" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
+        <div id="tab-thu" class="menu-tagesplan tab-pane fade">
-            <h3>Donnerstag 06.07.</h3>
+            <h3>Donnerstag 12.03.</h3>
-            <div class="row row-narrow row-table">
+            <div class="row vegetarisch mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell vegetarisch">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Farfalle tricolore
+                    Spaghetti
-                    <br>Gorgonzola-Spinatsauce
+                    <br>Chinagemüse
-                    <br>Endiviensalat
+                    <br>Sauce süß-sauer
-                    <span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Gl,GlW,ML</span>
+                    <br>Geriebener Hartkäse
-                </div>
+                    <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">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
-            <div class="row row-narrow row-table">
+            <div class="row grey lighten-4 mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Paniertes Seelachsfilet MSC
+                    Paniertes Seelachsfilet
-                    <br>Remouladensauce
+                    <br>Sesam-Mayonnaise
                     <br>Salzkartoffeln
-                    <br>Brokkoligemüse
+                    <br>Karottenmix mit Brokkoli und Bohnen
-                    <span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9,MSC</span>
+                    <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>
-                    <span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9,MSC<br>enthält Allergene: Ei,Sn,Fi,Gl,GlW,ML,Lak</span>
-                </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
-            <div class="row row-narrow row-table">
+            <div class="row grey lighten-4 mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
                     Grill und Salatbar
                     <br>Asiatisches aus dem Wok
                     <br>Fleisch- und Fischspezialitäten
                     <br>Pasta-, Reis und Kartoffelvariationen
                     <br>Gemüse
+                    <br>
                 </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,85 €<span class="tara"> / 100g</span></td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,00 €<span class="tara"> / 100g</span></td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>1,20 €<span class="tara"> / 100g</span></td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
         </div>
-        <div id="tab-fri" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
+        <div id="tab-fri" class="menu-tagesplan tab-pane fade">
-            <h3>Freitag 07.07.</h3>
+            <h3>Freitag 13.03.</h3>
-            <div class="row row-narrow row-table">
+            <div class="row vegetarisch mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell vegetarisch">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Italienischer Nudelauflauf mit Gemüse
+                    Kartoffel-Gorgonzolagratin
-                    <br>Tomatenragout
+                    <br>Brokkoligemüse
-                    <br>Blattsalat
+                    <br>Beilagensalat
-                    <span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Gl,GlW,ML,Lak</span>
+                    <br><span class="zusatzsstoffe show-with-allergenes">enthält Allergene: ML</span></div>
-                </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
-            <div class="row row-narrow row-table">
+            <div class="row grey lighten-4 mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
-                    Hähnchen-Saté-Spieß
+                    Hähnchenbrustfilet
-                    <br>Erdnusssauce
+                    <br>Apfel-Rahmsauce
-                    <br>Langkornreis
+                    <br>Mandelreis
-                    <br>Karotten-Erbsengemüse
+                    <br>Karottengemüse
-                    <span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Er,So,Kr,Fi,We,Gl,GlW,ML,Lak</span>
+                    <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>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>2,90 €</td>
+                            <td>3,05 €</td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>3,80 €</td>
+                            <td>4,00 €</td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>5,10 €</td>
+                            <td>5,40 €</td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
-            <div class="row row-narrow row-table">
+            <div class="row grey lighten-4 mb-2">
                 <h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
-                <div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
+                <div class="col-md-5 col-sm-5 menu-info  {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
                     Grill und Salatbar
                     <br>Asiatisches aus dem Wok
                     <br>Fleisch- und Fischspezialitäten
                     <br>Pasta-, Reis und Kartoffelvariationen
                     <br>Gemüse
+                    <br>
                 </div>
                 <div class="col-md-4 col-sm-4 menu-price">
-                    <table class="table">
+                    <table class="table-sm">
-                        <tbody>
                         <tr>
                             <td class="price-studierende">Studierende, Schüler</td>
-                            <td>0,85 €<span class="tara"> / 100g</span></td>
+                            <td>0,90 €<span class="tara"> / 100g</span></td>
                         </tr>
                         <tr>
                             <td class="price-mitarbeiter">Mitarbeiter</td>
-                            <td>1,00 €<span class="tara"> / 100g</span></td>
+                            <td>1,10 €<span class="tara"> / 100g</span></td>
                         </tr>
                         <tr>
                             <td class="price-gaeste">Gäste</td>
-                            <td>1,20 €<span class="tara"> / 100g</span></td>
+                            <td>1,30 €<span class="tara"> / 100g</span></td>
                         </tr>
-                        </tbody>
                     </table>
                 </div>
             </div>
         </div>
-        <div id="tab-sat" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
+        <div id="tab-sat" class="menu-tagesplan tab-pane fade">
-            <h3>Samstag 08.07.</h3>
+            <h3>Samstag 14.03.</h3>
             <div class="row row-narrow row-buffer row-table">
-                <div class="col-md-1 bg-beige-hell zusatzangaben">
+                <div class="col-md-1 bg-beige-hell zusatzangaben"><i class="glyphicons glyphicons-circle-info"></i></div>
-                    <i class="glyphicons glyphicons-circle-info"></i>
-                </div>
                 <div class="col-md-11 border-beige-hell">
-                    <h4>heute keine Essensausgabe</h4>
+                    <h4>heute keine Essensausgabe</h4></div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-sm-6">
+        <h4 class="grau">Kennzeichnungen/Zusatzstoffe</h4>
+        <dl class="dl-horizontal menu-zusatzstoffe grau"><dt>nF</dt>
+            <dd>aus nachhaltigem Fischfang</dd><dt>ri</dt>
+            <dd>mit Rindfleisch</dd><dt>sch</dt>
+            <dd>mit Schwein</dd><dt>4</dt>
+            <dd>mit Farbstoff</dd><dt>5</dt>
+            <dd>mit Antioxidationsmittel</dd><dt>6</dt>
+            <dd>mit Konservierungsstoff</dd><dt>8</dt>
+            <dd>mit Phosphat</dd>
+        </dl>
+    </div>
+    <div class="col-sm-6 show-with-allergenes"><div id="c5219" class="csc-default ortsfilter-show ">
+        <h4 class="grau">Allergene</h4>
+        <dl class="dl-horizontal menu-zusatzstoffe grau"><dt>Ei</dt>
+            <dd>Eier</dd><dt>Fi</dt>
+            <dd>Fisch</dd><dt>Gl</dt>
+            <dd>GLUTENHALTIGES Getreide</dd><dt>GlG</dt>
+            <dd>Gerste</dd><dt>GlH</dt>
+            <dd>Hafer</dd><dt>GlW</dt>
+            <dd>Weizen</dd><dt>ML</dt>
+            <dd>Milch /-erzeugnisse</dd><dt>NM</dt>
+            <dd>Mandel</dd><dt>Nu</dt>
+            <dd>SCHALENFRÜCHTE/Nüsse</dd><dt>Sa</dt>
+            <dd>Sesam</dd><dt>Se</dt>
+            <dd>Sellerie</dd><dt>Sf</dt>
+            <dd>Schwefeldioxid/Sulfite</dd><dt>Sn</dt>
+            <dd>Senf</dd><dt>So</dt>
+            <dd>Soja</dd>
+        </dl>
+    </div>
+    </div>
+    <!-- Modal -->
+    <div class="modal fade" id="allergenesModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+        <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="myModalLabel">Allergikerspeiseplan</h4>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                </div>
+                <div class="modal-body">
+                    <p>Die Angaben über die Inhaltsstoffe der Speisen beruhen auf Rezepturen, einzelnen Zutaten und den Informationen, die wir von den Herstellern und Lieferanten der einzelnen Speisezutaten erhalten. Da die Hersteller selten nur ein Produkt herstellen und vertreiben, kann nie ganz ausgeschlossen werden, dass auch Anteile von nicht aufgeführten Inhaltsstoffen in den Produkten enthalten sind.</p>
+                    <p>Des Weiteren bringt es die handwerkliche Verarbeitung und Behandlung von Lebensmitteln in Großküchen mit sich, dass bei der Zusammenführung der verschiedenen Speisekomponenten eine ungewollte Vermischung auftreten kann und damit verbunden, der Übergang geringer Mengen von weiteren Stoffen, die Allergien und Unverträglichkeiten auslösen können. Diese Spuren sind in der Kennzeichnung nicht berücksichtigt.</p>
+                    <p>Aus diesem Grund müssen Allergiker/innen beachten, dass in den angebotenen Speisen neben den gekennzeichneten noch weitere allergieauslösende Inhaltsstoffe enthalten sein können. Das Studierendenwerk Freiburg schließt daher jegliche Haftung aufgrund von nicht rezeptürlichen Bestandteilen der Speisen aus. </p>
+                    <p>Bitte beachten Sie beim Wochenplan: Die Allergenkennzeichnung kann sich bis zum Ausgabetag ändern, Richtigkeit wird nur im aktuellen Tagesplan gewährleistet.</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Abbrechen</button>
+                    <button type="button" class="btn btn-primary btn-show-allergenes">Ich habe die Nutzungsbedingungen verstanden und möchte den Allergikerspeiseplan sehen.</button>
                 </div>
             </div>
         </div>
     </div>
 </div>
-</div>
-