34 Commits
1.2.0 ... 1.2.7

Author SHA1 Message Date
1d614a06c4 version 1.2.7
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
* update coroutines 1.3.7 -> 1.3.8
2020-08-16 20:03:37 +02:00
3f10c8afaa fix courseList sorting
All checks were successful
continuous-integration/drone/push Build is passing
closes #15
2020-08-16 19:56:13 +02:00
9de1e295dd fix reading file from resources
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2020-08-06 17:27:49 +02:00
6287d4582d update spring-boot
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
* add TEST_A and TEST_B courses for testing during summer break
2020-08-06 16:31:05 +02:00
7dfa0fc6c4 fix .drone.yml (again)
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2020-06-26 10:34:56 +02:00
a53b2b8fc1 only publish to docker hub if a release is tagged 2020-06-26 10:32:20 +02:00
36972c9322 fix .drone.yml
All checks were successful
continuous-integration/drone/push Build is passing
2020-06-26 10:26:07 +02:00
7bf2920d17 add docker hub publish to .drone.yml
Some checks failed
continuous-integration/drone/push Build is failing
2020-06-26 10:14:57 +02:00
c30306c163 fix courseList
All checks were successful
continuous-integration/drone/push Build is passing
2020-06-11 17:22:31 +02:00
46c9a61124 remove the workaround introduced in 36acf1a00a and update the Dockerfile
All checks were successful
continuous-integration/drone/push Build is passing
2020-06-08 17:49:38 +02:00
36acf1a00a add workaround for ssl errors
All checks were successful
continuous-integration/drone/push Build is passing
2020-06-08 11:57:20 +02:00
f9029bf1c3 use HashMap insted of ArrayList to store the timetables
All checks were successful
continuous-integration/drone/push Build is passing
2020-06-06 23:07:23 +02:00
fe72c02562 remove unneeded dependency, use try catch when writing files
All checks were successful
continuous-integration/drone/push Build is passing
2020-06-06 20:53:23 +02:00
8d9fcd3d7c update gradle to version 6.5
All checks were successful
continuous-integration/drone/push Build is passing
2020-06-05 19:16:39 +02:00
ec7a0a7a64 change some parameters
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
* fixes #13
* use a HashMap for timetableRequests count
* api version 1.2.0
* software version 1.2.3
2020-06-05 18:23:15 +02:00
efd8f9f9f5 update spring
All checks were successful
continuous-integration/drone/push Build is passing
* spring-boot 2.2.7 -> 2.3.0
2020-05-25 11:21:24 +02:00
e2dce9fab3 update gradle, kotlin & coroutines
All checks were successful
continuous-integration/drone/push Build is passing
* gradle 6.1.1 -> 6.4
* kotlin 1.3.71 -> 1.3.72
* coroutines 1.3.5 -> 1.3.6
2020-05-14 17:16:31 +02:00
bbac0d3688 „README.md“ ändern
All checks were successful
continuous-integration/drone/push Build is passing
2020-05-07 20:31:26 +02:00
6114077591 update spring boot, jsoup and kotlin coroutines
All checks were successful
continuous-integration/drone/push Build is passing
* kotlin coroutines 1.3.3 -> 1.3.5
* jsoup 1.12.2 -> 1.13.1
* spring boot 2.2.5 -> 2.2.6
* various performance improvements
2020-04-13 21:08:01 +02:00
678a97f140 fix MensaParser & update spring boot, kotlin
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
* fixed the MensaParser(), it should now work more reliable
* updated spring boot 2.2.4 -> 2.2.5
* updated kotlin 1.3.61 -> 1.3.70
* clean up MensaParserTest
2020-03-03 19:31:12 +01:00
c22f752788 ci test 2
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-02 22:34:10 +01:00
1798054580 ci test
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-02 18:28:02 +01:00
9a48b1a859 minor fixes
All checks were successful
continuous-integration/drone/push Build is passing
2020-03-02 18:21:36 +01:00
2f1f65eba0 count courseList requests seperat 2020-02-27 17:42:19 +01:00
be95af43c2 made CacheCOntroller() static
All checks were successful
continuous-integration/drone/push Build is passing
2020-02-16 17:17:39 +01:00
f20279a4b4 updated jsoup 1.12.1 -> 1.12.2
All checks were successful
continuous-integration/drone/push Build is passing
2020-02-16 15:18:52 +01:00
3aa27dff4a don't use lateinit in CacheController()
All checks were successful
continuous-integration/drone/push Build is passing
2020-02-10 17:42:44 +01:00
f01916b363 updated gradle and spring boot
All checks were successful
continuous-integration/drone/push Build is passing
* gradle 5.6.2 -> 6.1.1
* spring boot 2.1.11 -> 2.2.4
* junit-jupiter 5.5.1 -> 5.6.0
2020-01-26 17:46:16 +01:00
a13203c477 use the current directory to store the config.xml and cached timetables
All checks were successful
continuous-integration/drone/push Build is passing
2020-01-15 13:42:40 +01:00
2bb6bc6534 Update 'README.md'
All checks were successful
continuous-integration/drone/push Build is passing
2020-01-07 16:00:24 +01:00
d0d5e4b6d1 removed Java legacy code
All checks were successful
continuous-integration/drone/push Build is passing
the minimum is now Java 11
2019-12-30 01:36:21 +01:00
16cb89ca38 update kotlin to 1.3.61
* update coroutines to 1.3.3
2019-12-13 14:06:08 +01:00
b428840df7 update to spring boot 2.1.11 2019-12-12 14:25:13 +01:00
4ca79e6540 removed invalid TODOs
All checks were successful
continuous-integration/drone/push Build is passing
2019-11-21 14:58:34 +01:00
28 changed files with 2296 additions and 568 deletions

View File

@ -6,9 +6,25 @@ steps:
image: gradle:jdk11
commands:
- gradle test
- name: test-jdk8
image: gradle:jdk8
- name: build
image: gradle:jdk11
commands:
- gradle test
- gradle bootJar
when:
event:
- tag
- name: docker
image: plugins/docker
settings:
username:
from_secret: docker_username
password:
from_secret: docker_password
repo: mosadxyz/tcor
tags:
- latest
when:
event:
- tag

6
.gitignore vendored
View File

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

8
Dockerfile Normal file
View File

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

View File

@ -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

View File

@ -1,52 +1,38 @@
buildscript {
ext.kotlin_version = '1.3.60'
ext.spring_boot_version = '2.1.10.RELEASE'
repositories {
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_version"
}
plugins {
id 'org.jetbrains.kotlin.jvm' version '1.3.72'
id 'org.jetbrains.kotlin.plugin.spring' version '1.3.72'
id 'org.springframework.boot' version '2.3.2.RELEASE'
id 'io.spring.dependency-management' version '1.0.9.RELEASE'
}
apply plugin: 'kotlin'
apply plugin: 'kotlin-spring'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
test {
useJUnitPlatform()
testLogging {
events "PASSED", "FAILED", "SKIPPED"
}
}
group 'org.mosad'
version '1.2.7'
repositories {
jcenter()
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2"
implementation "org.jsoup:jsoup:1.12.1"
implementation "org.springframework.boot:spring-boot-starter-web"
implementation "com.google.code.gson:gson:2.8.6"
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
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.2.0'

Binary file not shown.

View File

@ -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.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

31
gradlew vendored
View File

@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
@ -154,19 +156,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 -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
@ -175,14 +177,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" "$@"

4
gradlew.bat vendored
View File

@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

View File

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

View File

@ -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

View File

@ -1,7 +1,7 @@
/**
* TheCitadelofRicks
*
* Copyright 2019 <seil0@mosad.xyz>
* Copyright 2019-2020 <seil0@mosad.xyz>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -24,13 +24,15 @@ package org.mosad.thecitadelofricks
import java.time.LocalDateTime
import java.util.*
import kotlin.collections.HashMap
// data classes for the course part
data class Course(val courseName: String, val courseLink: String)
data class CourseMeta(val updateTime: Long, val totalCourses: Int)
data class CoursesMeta(val updateTime: Long = 0, val totalCourses: Int = 0)
data class CourseList(val meta: CourseMeta, val courses: ArrayList<Course>)
data class CoursesList(val meta: CoursesMeta = CoursesMeta(), val courses: SortedMap<String, Course>)
data class CoursesListRet(val meta: CoursesMeta = CoursesMeta(), val courses: ArrayList<Course> = ArrayList())
// data classes for the Mensa part
data class Meal(val day: String, val heading: String, val parts: ArrayList<String>, val additives: String)
@ -62,16 +64,16 @@ data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMe
// data classes for the status part
data class TimetableCounter(var courseName: String, var requests: Int)
data class Status(
val time: LocalDateTime,
val uptime: String,
val apiVersion: String,
val softwareVersion: String,
val requestCount: Int,
val totalRequests: Int,
val mensaMenuRequests: Int,
val timetableRequests: ArrayList<TimetableCounter>,
val courseListRequests: Int,
val timetableRequests: HashMap<String, Int>,
val timetableListSize: Int,
val coursesLastUpdate: Date,
val mensaLastUpdate: Date,

View File

@ -1,7 +1,7 @@
/**
* TheCitadelofRicks
*
* Copyright 2019 <seil0@mosad.xyz>
* Copyright 2019-2020 <seil0@mosad.xyz>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -23,82 +23,77 @@
package org.mosad.thecitadelofricks.controller
import com.google.gson.Gson
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.*
import org.jsoup.Jsoup
import org.mosad.thecitadelofricks.*
import org.mosad.thecitadelofricks.hsoparser.CourseListParser
import org.mosad.thecitadelofricks.hsoparser.MensaParser
import org.mosad.thecitadelofricks.hsoparser.TimetableParser
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import java.io.BufferedWriter
import java.io.File
import java.io.FileWriter
import java.io.*
import java.util.*
import java.util.concurrent.Executors
import kotlin.collections.ArrayList
import kotlin.collections.HashMap
import kotlin.collections.HashSet
import kotlin.concurrent.scheduleAtFixedRate
class CacheController {
private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
init {
initUpdates()
scheduledUpdates()
}
// cache objects
companion object{
private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
lateinit var courseList: CourseList
lateinit var mensaMenu: MensaMenu
var timetableList = ArrayList<TimetableCourseWeek>() // this list contains all timetables
var courseList = CoursesList(CoursesMeta(), sortedMapOf())
var mensaMenu = MensaMenu(MensaMeta(0,""), MensaWeek(), MensaWeek())
var timetableList = HashMap<String, TimetableCourseWeek>() // this list contains all timetables
/**
* get a timetable, since they may not cached, we need to make sure it's cached, otherwise download
* get a timetable, since they may not be cached, we need to make sure it's cached, otherwise download
* @param courseName the name of the course to be requested
* @param weekIndex request week number (current week = 0)
* @return timetable of the course (Type: [TimetableCourseWeek])
*/
fun getTimetable(courseName: String, weekIndex: Int): TimetableCourseWeek = runBlocking {
val currentTime = System.currentTimeMillis() / 1000
var timetable = TimetableWeek()
var weekNumberYear = 0
// check if the timetable already exists and is up to date
when (timetableList.stream().filter { x -> x.meta.courseName == courseName && x.meta.weekIndex == weekIndex }.findAny().orElse(null)) {
// there is no such course yet, create one
null -> {
val courseLink = courseList.courses.stream().filter { x -> x.courseName == courseName }.findFirst().orElse(null).courseLink
val timetableLink = courseLink.replace("week=0","week=$weekIndex")
// TODO just for testing
if (courseName == "TEST_A" || courseName == "TEST_B") {
val currentTime = System.currentTimeMillis() / 1000
val timetableLink = "https://mosad.xyz"
val weekNumberYear = 0
val instr = javaClass.getResourceAsStream("/html/Timetable_normal-week.html")
val jobTimetable = GlobalScope.async {
timetable = TimetableParser().getTimeTable(timetableLink)
weekNumberYear = TimetableParser().getWeekNumberYear(timetableLink)
}
val htmlDoc = Jsoup.parse(instr,"UTF-8", "https://www.hs-offenburg.de/")
val timetableTest = TimetableParser().parseTimeTable(htmlDoc)
jobTimetable.await()
timetableList.add(
TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink),
timetable
)
)
logger.info("added new timetable for $courseName, week $weekIndex")
}
return@runBlocking TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink), timetableTest)
}
return@runBlocking timetableList.stream().filter { x -> x.meta.courseName == courseName && x.meta.weekIndex == weekIndex }.findAny().orElse(null)
return@runBlocking timetableList.getOrPut("$courseName-$weekIndex") {
val timetableLink = courseList.courses[courseName]
?.courseLink
?.replace("week=0", "week=$weekIndex") ?: ""
val currentTime = System.currentTimeMillis() / 1000
var timetable = TimetableWeek()
var weekNumberYear = 0
val timetableJobs = listOf(
async { timetable = TimetableParser().getTimeTable(timetableLink) },
async { weekNumberYear = TimetableParser().getWeekNumberYear(timetableLink) }
)
timetableJobs.awaitAll()
TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink), timetable)
}
}
/**
* 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
@ -116,7 +111,7 @@ 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)
@ -128,158 +123,139 @@ class CacheController {
// get all lessons from the weeks timetable
val flatMap = getTimetable(courseName, weekIndex).timetable.days.flatMap { it.timeslots.asIterable() }
flatMap.forEach {
// TODO Java 11
//it.stream().filter { x -> x.lessonSubject.contains(lessonSubject) }.findAny().ifPresent { x -> println("${x.lessonSubject}, ${x.lessonTeacher}") }
it.forEach { lesson ->
if(lesson.lessonSubject.contains(lessonSubject)) {
lessonList.add(lesson)
}
}
it.stream().filter { x -> x.lessonSubject.contains(lessonSubject) }.findAny().ifPresent { x -> lessonList.add(x) }
}
return lessonList
}
}
/**
* this function updates the courseList
* during the update process the old data will be returned for a API request
*/
private fun asyncUpdateCourseList() = GlobalScope.launch {
CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
courseList = CourseList(
CourseMeta(System.currentTimeMillis() / 1000, it.size), it
)
}
// private cache functions
logger.info("updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
}
/**
* this function updates the mensa menu list
* during the update process the old data will be returned for a API request
*/
private fun asyncUpdateMensa() = GlobalScope.launch {
val mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(StartupController.mensaMenuURL))
// only update if we get valid data
if (mensaCurrentWeek != null && mensaNextWeek != null) {
mensaMenu = MensaMenu(
MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek
)
}
logger.info("updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
}
/**
* this function updates all existing timetables
* during the update process the old data will be returned for a API request
* a FixedThreadPool is used to make parallel requests for faster updates
*/
private fun asyncUpdateTimetables() = GlobalScope.launch {
logger.info("updating ${timetableList.size} timetables ...")
// create a new ThreadPool with 5 threads
val executor = Executors.newFixedThreadPool(5)
try {
timetableList.forEach { timetableCourse ->
executor.execute {
timetableCourse.timetable = TimetableParser().getTimeTable(timetableCourse.meta.link)
timetableCourse.meta.updateTime = System.currentTimeMillis() / 1000
saveTimetableToCache(timetableCourse) // save the updated timetable to the cache directory
}
}
} catch (ex: Exception) {
logger.error("error while updating the timetables", ex)
} finally {
executor.shutdown()
}
}
/**
* save a timetable to the cache directory
* this is only call on async updates, it is NOT call when first getting the timetable
* @param timetable a timetable of the type [TimetableCourseWeek]
*/
private fun saveTimetableToCache(timetable: TimetableCourseWeek) {
println(timetable.timetable.toString())
val file = File(StartupController.dirTcorCache, "timetable-${timetable.meta.courseName}-${timetable.meta.weekIndex}.json")
val writer = BufferedWriter(FileWriter(file))
writer.write(Gson().toJson(timetable))
writer.close()
}
/**
* before the APIController is up, get the data fist
* runBlocking: otherwise the api would return no data to requests for a few seconds after startup
*/
private fun initUpdates() = runBlocking {
// get all courses on startup
val jobCourseUpdate = GlobalScope.async {
/**
* this function updates the courseList
* during the update process the old data will be returned for a API request
*/
private fun asyncUpdateCourseList() = GlobalScope.launch {
CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
courseList = CourseList(
CourseMeta(System.currentTimeMillis() / 1000, it.size), it
)
courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
}
// TODO just for testing
courseList.courses["TEST_A"] = Course("TEST_A", "https://mosad.xyz")
courseList.courses["TEST_B"] = Course("TEST_B", "https://mosad.xyz")
logger.info("Updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
}
// get the current and next weeks mensa menus
val jobMensa = GlobalScope.async{
/**
* this function updates the mensa menu list
* during the update process the old data will be returned for a API request
*/
private fun asyncUpdateMensa() = GlobalScope.launch {
val mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(StartupController.mensaMenuURL))
// only update if we get valid data
if (mensaCurrentWeek != null && mensaNextWeek != null) {
mensaMenu = MensaMenu(
MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek
)
mensaMenu = MensaMenu(MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek)
}
logger.info("Updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
}
/**
* this function updates all existing timetables
* during the update process the old data will be returned for a API request
* a FixedThreadPool is used to make parallel requests for faster updates
*/
private fun asyncUpdateTimetables() = GlobalScope.launch {
logger.info("Updating ${timetableList.size} timetables ...")
// create a new ThreadPool with 5 threads
val executor = Executors.newFixedThreadPool(5)
try {
timetableList.forEach { timetableCourse ->
executor.execute {
timetableCourse.value.timetable = TimetableParser().getTimeTable(timetableCourse.value.meta.link)
timetableCourse.value.meta.updateTime = System.currentTimeMillis() / 1000
saveTimetableToCache(timetableCourse.value) // save the updated timetable to the cache directory
}
}
} catch (ex: Exception) {
logger.error("Error while updating the timetables", ex)
} finally {
executor.shutdown()
}
}
jobCourseUpdate.await()
jobMensa.await()
/**
* save a timetable to the cache directory
* this is only call on async updates, it is NOT call when first getting the timetable
* @param timetable a timetable of the type [TimetableCourseWeek]
*/
private fun saveTimetableToCache(timetable: TimetableCourseWeek) {
val file = File(StartupController.dirTcorCache, "timetable-${timetable.meta.courseName}-${timetable.meta.weekIndex}.json")
val writer = BufferedWriter(FileWriter(file))
logger.info("init updates successful")
}
/**
* update the CourseList every 24h, the Timetables every 3h and the Mensa Menu every hour
* doesn't account the change between winter and summer time!
*/
private fun scheduledUpdates() {
val currentTime = System.currentTimeMillis()
val initDelay24h = (86400000 - ((currentTime + 3600000) % 86400000)) + 60000
val initDelay3h = (10800000 - ((currentTime + 3600000) % 10800000)) + 60000
val initDelay1h = (3600000 - ((currentTime + 3600000) % 3600000)) + 60000
// update courseList every 24 hours (time in ms)
Timer().scheduleAtFixedRate(initDelay24h, 86400000) {
asyncUpdateCourseList()
try {
writer.write(Gson().toJson(timetable))
} catch (e: Exception) {
logger.error("something went wrong while trying to write a cache file", e)
} finally {
writer.close()
}
}
// update all already existing timetables every 3 hours (time in ms)
Timer().scheduleAtFixedRate(initDelay3h, 10800000) {
asyncUpdateTimetables()
/**
* before the APIController is up, get the data fist
* runBlocking: otherwise the api would return no data to requests for a few seconds after startup
*/
private fun initUpdates() = runBlocking {
// get all course links on startup, make sure there are course links
val jobCourseUpdate = asyncUpdateCourseList()
val jobMensa = asyncUpdateMensa()
jobCourseUpdate.join()
jobMensa.join()
logger.info("Initial updates successful")
}
// update courses every hour (time in ms)
Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
asyncUpdateMensa()
}
/**
* update the CourseList every 24h, the Timetables every 3h and the Mensa Menu every hour
* doesn't account the change between winter and summer time!
*/
private fun scheduledUpdates() {
val currentTime = System.currentTimeMillis()
val initDelay24h = (86400000 - ((currentTime + 3600000) % 86400000)) + 60000
val initDelay3h = (10800000 - ((currentTime + 3600000) % 10800000)) + 60000
val initDelay1h = (3600000 - ((currentTime + 3600000) % 3600000)) + 60000
// post to status.mosad.xyz every hour, if an API key is present
if (StartupController.cachetAPIKey != "0") {
// update courseList every 24 hours (time in ms)
Timer().scheduleAtFixedRate(initDelay24h, 86400000) {
asyncUpdateCourseList()
}
// update all already existing timetables every 3 hours (time in ms)
Timer().scheduleAtFixedRate(initDelay3h, 10800000) {
asyncUpdateTimetables()
}
// update courses every hour (time in ms)
Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
CachetAPIController.postTotalRequests()
asyncUpdateMensa()
}
// post to status.mosad.xyz every hour, if an API key is present
if (StartupController.cachetAPIKey != "0") {
Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
CachetAPIController.postTotalRequests()
}
}
}
}
}
}

View File

@ -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

View File

@ -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,8 +35,8 @@ class StartupController {
private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
companion object {
val userHome: String = System.getProperty("user.home")
val tcorHome = "$userHome/.tcor"
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")
@ -66,7 +66,7 @@ class StartupController {
createConfig()
}
// TODO read cached timetable files, as they are not initially cached
// read cached timetable files, as they are not initially cached
readCachedTimetables()
}
@ -129,16 +129,18 @@ class StartupController {
private fun readCachedTimetables() {
dirTcorCache.walkTopDown().forEach {
if (it.isFile && it.name.endsWith(".json")) {
try {
val fileReader = FileReader(it)
val bufferedReader = BufferedReader(fileReader)
val timetableObject = JsonParser.parseString(bufferedReader.readLine()).asJsonObject
val fileReader = FileReader(it)
val bufferedReader = BufferedReader(fileReader)
CacheController.timetableList.add(Gson().fromJson(timetableObject, TimetableCourseWeek().javaClass))
bufferedReader.close()
fileReader.close()
try {
val timetableObject = JsonParser.parseString(bufferedReader.readLine()).asJsonObject
val timetable = Gson().fromJson(timetableObject, TimetableCourseWeek().javaClass)
CacheController.timetableList.put("${timetable.meta.courseName}-${timetable.meta.weekIndex}", timetable)
} catch (ex: Exception) {
logger.error("error while reading cache", ex)
} finally {
bufferedReader.close()
fileReader.close()
}
}
}

View File

@ -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,34 +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() {
mensaMenuRequests++
fun updateCourseListRequests() {
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
}
@ -78,7 +73,11 @@ class StatusController {
return mensaMenuRequests
}
fun getTimetableRequests(): ArrayList<TimetableCounter> {
fun getCourseListRequests(): Int {
return courseListRequests
}
fun getTimetableRequests(): HashMap<String, Int> {
return timetableRequests
}
@ -115,6 +114,7 @@ class StatusController {
softwareVersion,
getTotalRequests(),
getMensaMenuRequests(),
getCourseListRequests(),
getTimetableRequests(),
CacheController.timetableList.size,
Date(CacheController.courseList.meta.updateTime * 1000),

View File

@ -1,7 +1,7 @@
/**
* TheCitadelofRicks
*
* Copyright 2019 <seil0@mosad.xyz>
* Copyright 2019-2020 <seil0@mosad.xyz>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -29,26 +29,25 @@ import java.net.SocketTimeoutException
class CourseListParser {
var logger: org.slf4j.Logger = LoggerFactory.getLogger(MensaParser::class.java)
private var logger: org.slf4j.Logger = LoggerFactory.getLogger(CourseListParser::class.java)
/**
* return a list of all courses at courseListURL
* @param courseListURL the url to the course list page
* @return a ArrayList<Course> with all courses or null if the request was not successful
*/
fun getCourseLinks(courseListURL: String): ArrayList<Course>? {
val courseLinkList = ArrayList<Course>()
fun getCourseLinks(courseListURL: String): HashMap<String, Course>? {
val courseLinkList = HashMap<String, Course>()
try {
val courseHTML = Jsoup.connect(courseListURL).get()
courseHTML.select("ul.index-group").select("li.Class").select("a[href]").forEachIndexed { _, element ->
courseLinkList.add(
Course(
element.text(),
element.attr("href").replace("http", "https")
)
courseLinkList[element.text()] = Course(
element.text(),
element.attr("href").replace("http", "https")
)
}
logger.info("successfully retrieved course List")
} catch (ex: SocketTimeoutException) {
logger.warn("timeout from hs-offenburg.de, updating on next attempt!")
return null

View File

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

View File

@ -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
@ -181,4 +181,5 @@ class TimetableParser {
println(" \n")
}
}

View File

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

File diff suppressed because one or more lines are too long

View File

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

View File

@ -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)
}

View File

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

View File

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

View File

@ -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-tue" class="nav-link" data-toggle="tab" role="tab">Di 13.08.</a></li>
<li class="col-md-2"><a href="#tab-wed" class="nav-link" data-toggle="tab" role="tab">Mi 14.08.</a></li>
<li class="col-md-2"><a href="#tab-thu" class="nav-link" data-toggle="tab" role="tab">Do 15.08.</a></li>
<li class="col-md-2"><a href="#tab-fri" class="nav-link active show" data-toggle="tab" role="tab">Fr
16.08.</a></li>
<li class="col-md-2"><a href="#tab-sat" class="nav-link" data-toggle="tab" role="tab">Sa 17.08.</a></li>
<li class="col-md-2"><a href="#tab-mon" class="nav-link" data-toggle="tab" role="tab">Mo 09.03.</a></li>
<li class="col-md-2"><a href="#tab-tue" class="nav-link active show" data-toggle="tab" role="tab">Di 10.03.</a></li>
<li class="col-md-2"><a href="#tab-wed" class="nav-link" data-toggle="tab" role="tab">Mi 11.03.</a></li>
<li class="col-md-2"><a href="#tab-thu" class="nav-link" data-toggle="tab" role="tab">Do 12.03.</a></li>
<li class="col-md-2"><a href="#tab-fri" class="nav-link" data-toggle="tab" role="tab">Fr 13.03.</a></li>
<li class="col-md-2"><a href="#tab-sat" class="nav-link" data-toggle="tab" role="tab">Sa 14.03.</a></li>
</ul>
</div>
<div class="col-md-1 col-xs-6 pull-right">
<a class="next-week text-right" title="eine Woche weiter"
href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=fab2e8b1bae3cdd249ace0e5d67c1c7e"><span
class="d-inline d-sm-none">nächste Woche</span><img
src="Mensa_empty-week-Dateien/keil-grau-rechts.png" alt="" width="16" height="16"></a>
</div>
<div class="col-md-1 col-xs-6 pull-right"><a class="next-week text-right" title="eine Woche weiter" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=2&amp;tx_swfrspeiseplan_pi1%5Baction%5D=show&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=3c3048ebdd7f42a104bd780a0a6a0fd1"><span class="d-inline d-sm-none">nächste Woche</span><img src="/fileadmin/templates/images/keil-grau-rechts.png" width="16" height="16" alt="" /></a></div>
</div>
<div class="row">
<div class="col-sm-4">
<table class="table legende">
<tbody>
<tr>
<td class="vegetarisch legend"></td>
<td class="legend-info">vegetarisch</td>
@ -35,484 +30,484 @@
<td class="wunsch-vegan legend"></td>
<td class="legend-info">auf Wunsch vegan</td>
</tr>
</tbody>
</table>
</div>
<div class="col-sm-4 pt-3">
<div class="hide-with-allergenes">
<p><a download="_KW_33-2019.pdf" title="Wochenplan in Farbe herunterladen" target="_blank"
href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=9c8a69897ba4f187d21b350d48473425"><i
class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
<p><a download="_KW_33-2019.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank"
href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=3e887f29d8cf2a15bd54620c56f43e02"><i
class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
<p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/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>
<p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=84edf4562bdc95f103b70ef99e4d7af6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
</div>
<div class="show-with-allergenes">
<p><a download="_KW_33-2019.pdf" title="Wochenplan in Farbe herunterladen" target="_blank"
href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=1&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=e5c36a88733c75c5eded775acad35bc6"><i
class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
<p><a download="_KW_33-2019.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank"
href="https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=b0d4e30323a2010310bbb6cad8b55fe9"><i
class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
<p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/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>
<p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/de/essen-trinken/speiseplaene/mensa-offenburg/?type=99&amp;tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&amp;tx_swfrspeiseplan_pi1%5Bcolored%5D=0&amp;tx_swfrspeiseplan_pi1%5Bort%5D=651&amp;tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&amp;tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&amp;cHash=c3a9d1eafce78d8f8d281c6060be989c"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
</div>
</div>
<div class="col-sm-4 pt-3">
<p class="hide-with-allergenes"><a href="#" data-toggle="modal" data-target="#allergenesModal"><i
class="fas fa-redo-alt"></i> Allergiehinweise anzeigen</a></p>
<p class="show-with-allergenes"><a href="#" class="btn-hide-allergenes"><i class="fas fa-undo-alt"></i>
Allergiehinweise verbergen</a></p>
<p class="hide-with-allergenes"><a href="#" data-toggle="modal" data-target="#allergenesModal"><i class="fas fa-redo-alt"></i> Allergiehinweise anzeigen</a></p>
<p class="show-with-allergenes"><a href="#" class="btn-hide-allergenes"><i class="fas fa-undo-alt"></i> Allergiehinweise verbergen</a></p>
</div>
</div>
<div class="tab-content">
<div id="tab-mon" class="menu-tagesplan r-tabs-panel r-tabs-state-active" style="display: block;">
<h3>Montag 03.07.</h3>
<div class="row row-narrow row-table">
<div id="tab-mon" class="menu-tagesplan tab-pane fade">
<h3>Montag 09.03.</h3>
<div class="row vegetarisch mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell vegetarisch">
Gemüseauflauf
<br>Frischkäse-Paprikasauce
<br>Blattsalat
<span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9</span>
<span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9<br>enthält Allergene: Ei,ML,Lak</span>
</div>
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Kartoffel-Frischkäsebratling
<br>Gemüseragout Toskana
<br>Beilagensalat
<br><span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Se,Gl,GlW,ML</span></div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>2,90</td>
<td>3,05</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>3,80 €</td>
<td>4,00 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,10 €</td>
<td>5,40 €</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row row-narrow row-table">
<div class="row grey lighten-4 mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
Schweinesteak
<br>Pfeffer-Rahmsauce
<br>Country Potatoes
<br>Blattsalat
<span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,5</span>
<span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,5<br>enthält Allergene: Gl,GlW,GlG,ML,Lak</span>
</div>
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Schweineschnitzel Wiener Art
<br>Bratensauce
<br>Pommes frites
<br>Mixsalat
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch<br>enthält Allergene: Gl,GlW,GlG</span></div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>2,90</td>
<td>3,05</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>3,80 €</td>
<td>4,00 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,10 €</td>
<td>5,40 €</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row row-narrow row-table">
<div class="row grey lighten-4 mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Grill und Salatbar
<br>Asiatisches aus dem Wok
<br>Fleisch- und Fischspezialitäten
<br>Pasta-, Reis und Kartoffelvariationen
<br>Gemüse
<br>
</div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>0,85<span class="tara"> / 100g</span></td>
<td>0,90<span class="tara"> / 100g</span></td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>1,00 €<span class="tara"> / 100g</span></td>
<td>1,10 €<span class="tara"> / 100g</span></td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>1,20 €<span class="tara"> / 100g</span></td>
<td>1,30 €<span class="tara"> / 100g</span></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div id="tab-tue" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
<h3>Dienstag 04.07.</h3>
<div class="row row-narrow row-table">
<div id="tab-tue" class="menu-tagesplan tab-pane fade in show active">
<h3>Dienstag 10.03.</h3>
<div class="row wunsch-vegan mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell vegetarisch">
Riesenrösti
<br>Rahmchampignons
<br>Blattsalat
<span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Gl,GlW,GlG,ML,Lak</span>
</div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>2,90 €</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>3,80 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,10 €</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row row-narrow row-table">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
Spaghetti
<br>Sauce Bolognese
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Tortellini mit Gemüsefüllung
<br>Tomatensauce
<br>Geriebener Hartkäse
<br>Blattsalat
<span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 15</span>
<span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 15<br>enthält Allergene: Ei,Se,Gl,GlW,ML</span>
</div>
<br>Beilagensalat
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 6</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 6<br>enthält Allergene: Ei,Se,Gl,GlW,ML</span></div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>2,90</td>
<td>3,05</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>3,80 €</td>
<td>4,00 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,10 €</td>
<td>5,40 €</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row row-narrow row-table">
<div class="row grey lighten-4 mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Frikadelle
<br>Champignon-Rahmsauce
<br>Bauernspätzle
<br>Blattsalat
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,ri</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,ri<br>enthält Allergene: Ei,Gl,GlW,GlG,ML</span></div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>3,05 €</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>4,00 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,40 €</td>
</tr>
</table>
</div>
</div>
<div class="row grey lighten-4 mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Grill und Salatbar
<br>Asiatisches aus dem Wok
<br>Fleisch- und Fischspezialitäten
<br>Pasta-, Reis und Kartoffelvariationen
<br>Gemüse
<br>
</div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>0,85<span class="tara"> / 100g</span></td>
<td>0,90<span class="tara"> / 100g</span></td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>1,00 €<span class="tara"> / 100g</span></td>
<td>1,10 €<span class="tara"> / 100g</span></td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>1,20 €<span class="tara"> / 100g</span></td>
<td>1,30 €<span class="tara"> / 100g</span></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div id="tab-wed" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
<h3>Mittwoch 05.07.</h3>
<div class="row row-narrow row-table">
<div id="tab-wed" class="menu-tagesplan tab-pane fade">
<h3>Mittwoch 11.03.</h3>
<div class="row wunsch-vegan mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell vegetarisch">
Frühlingsrollen
<br>Feuriger Chilidip
<br>Patnareis
<br>Wokgemüsepfanne
<span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9</span>
<span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9<br>enthält Allergene: Ei,So,Sn,Se,Sf,Gl,GlW,ML,Lak</span>
</div>
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Gebratener Gemüsereis Nasi Goreng
<br>Raita
<br>Mixsalat
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5<br>enthält Allergene: So,Sn,Se,Gl,GlW,ML</span></div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>2,90</td>
<td>3,05</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>3,80 €</td>
<td>4,00 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,10 €</td>
<td>5,40 €</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row row-narrow row-table">
<div class="row grey lighten-4 mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
Bratwurstschnecke
<br>Bratenjus
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Kalbsbratwurst
<br>Bratensauce
<br>Kartoffelbrei
<br>Karottengemüse
<span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,8</span>
<span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 1,8<br>enthält Allergene: Sn,Se,Gl,GlW,GlG,ML,Lak</span>
</div>
<br>Apfelrotkraut
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,5,6,8,ri</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,5,6,8,ri<br>enthält Allergene: Sn,Se,Sf,Gl,GlW,GlG,ML</span></div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>2,90</td>
<td>3,05</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>3,80 €</td>
<td>4,00 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,10 €</td>
<td>5,40 €</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row row-narrow row-table">
<div class="row grey lighten-4 mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Grill und Salatbar
<br>Asiatisches aus dem Wok
<br>Fleisch- und Fischspezialitäten
<br>Pasta-, Reis und Kartoffelvariationen
<br>Gemüse
<br>
</div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>0,85<span class="tara"> / 100g</span></td>
<td>0,90<span class="tara"> / 100g</span></td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>1,00 €<span class="tara"> / 100g</span></td>
<td>1,10 €<span class="tara"> / 100g</span></td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>1,20 €<span class="tara"> / 100g</span></td>
<td>1,30 €<span class="tara"> / 100g</span></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div id="tab-thu" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
<h3>Donnerstag 06.07.</h3>
<div class="row row-narrow row-table">
<div id="tab-thu" class="menu-tagesplan tab-pane fade">
<h3>Donnerstag 12.03.</h3>
<div class="row vegetarisch mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell vegetarisch">
Farfalle tricolore
<br>Gorgonzola-Spinatsauce
<br>Endiviensalat
<span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Gl,GlW,ML</span>
</div>
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Spaghetti
<br>Chinagemüse
<br>Sauce süß-sauer
<br>Geriebener Hartkäse
<br>Mixsalat
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5,6</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5,6<br>enthält Allergene: Ei,Sn,Se,Sf,Gl,GlW,GlG,ML</span></div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>2,90</td>
<td>3,05</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>3,80 €</td>
<td>4,00 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,10 €</td>
<td>5,40 €</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row row-narrow row-table">
<div class="row grey lighten-4 mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
Paniertes Seelachsfilet MSC
<br>Remouladensauce
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Paniertes Seelachsfilet
<br>Sesam-Mayonnaise
<br>Salzkartoffeln
<br>Brokkoligemüse
<span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9,MSC</span>
<span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 9,MSC<br>enthält Allergene: Ei,Sn,Fi,Gl,GlW,ML,Lak</span>
</div>
<br>Karottenmix mit Brokkoli und Bohnen
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: nF</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: nF<br>enthält Allergene: Ei,Sn,Fi,Sa,Gl,GlW</span></div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>2,90</td>
<td>3,05</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>3,80 €</td>
<td>4,00 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,10 €</td>
<td>5,40 €</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row row-narrow row-table">
<div class="row grey lighten-4 mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Grill und Salatbar
<br>Asiatisches aus dem Wok
<br>Fleisch- und Fischspezialitäten
<br>Pasta-, Reis und Kartoffelvariationen
<br>Gemüse
<br>
</div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>0,85<span class="tara"> / 100g</span></td>
<td>0,90<span class="tara"> / 100g</span></td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>1,00 €<span class="tara"> / 100g</span></td>
<td>1,10 €<span class="tara"> / 100g</span></td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>1,20 €<span class="tara"> / 100g</span></td>
<td>1,30 €<span class="tara"> / 100g</span></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div id="tab-fri" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
<h3>Freitag 07.07.</h3>
<div class="row row-narrow row-table">
<div id="tab-fri" class="menu-tagesplan tab-pane fade">
<h3>Freitag 13.03.</h3>
<div class="row vegetarisch mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell vegetarisch">
Italienischer Nudelauflauf mit Gemüse
<br>Tomatenragout
<br>Blattsalat
<span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Gl,GlW,ML,Lak</span>
</div>
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Kartoffel-Gorgonzolagratin
<br>Brokkoligemüse
<br>Beilagensalat
<br><span class="zusatzsstoffe show-with-allergenes">enthält Allergene: ML</span></div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>2,90</td>
<td>3,05</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>3,80 €</td>
<td>4,00 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,10 €</td>
<td>5,40 €</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row row-narrow row-table">
<div class="row grey lighten-4 mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
Hähnchen-Saté-Spieß
<br>Erdnusssauce
<br>Langkornreis
<br>Karotten-Erbsengemüse
<span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Er,So,Kr,Fi,We,Gl,GlW,ML,Lak</span>
</div>
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Hähnchenbrustfilet
<br>Apfel-Rahmsauce
<br>Mandelreis
<br>Karottengemüse
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5<br>enthält Allergene: Gl,GlW,GlG,Nu,NM,ML</span></div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>2,90</td>
<td>3,05</td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>3,80 €</td>
<td>4,00 €</td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>5,10 €</td>
<td>5,40 €</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="row row-narrow row-table">
<div class="row grey lighten-4 mb-2">
<h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
<div class="col-md-5 col-sm-5 menu-info bg-beige-hell ">
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
Grill und Salatbar
<br>Asiatisches aus dem Wok
<br>Fleisch- und Fischspezialitäten
<br>Pasta-, Reis und Kartoffelvariationen
<br>Gemüse
<br>
</div>
<div class="col-md-4 col-sm-4 menu-price">
<table class="table">
<tbody>
<table class="table-sm">
<tr>
<td class="price-studierende">Studierende, Schüler</td>
<td>0,85<span class="tara"> / 100g</span></td>
<td>0,90<span class="tara"> / 100g</span></td>
</tr>
<tr>
<td class="price-mitarbeiter">Mitarbeiter</td>
<td>1,00 €<span class="tara"> / 100g</span></td>
<td>1,10 €<span class="tara"> / 100g</span></td>
</tr>
<tr>
<td class="price-gaeste">Gäste</td>
<td>1,20 €<span class="tara"> / 100g</span></td>
<td>1,30 €<span class="tara"> / 100g</span></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div id="tab-sat" class="menu-tagesplan r-tabs-panel r-tabs-state-default" style="display: none;">
<h3>Samstag 08.07.</h3>
<div id="tab-sat" class="menu-tagesplan tab-pane fade">
<h3>Samstag 14.03.</h3>
<div class="row row-narrow row-buffer row-table">
<div class="col-md-1 bg-beige-hell zusatzangaben">
<i class="glyphicons glyphicons-circle-info"></i>
</div>
<div class="col-md-1 bg-beige-hell zusatzangaben"><i class="glyphicons glyphicons-circle-info"></i></div>
<div class="col-md-11 border-beige-hell">
<h4>heute keine Essensausgabe</h4>
</div>
<h4>heute keine Essensausgabe</h4></div>
</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>