Compare commits

...

57 Commits

Author SHA1 Message Date
Jannik bfd301e3a5 Merge pull request 'Unescape parts in MensaParser' (#31) from unescape-mensa-parts into master
Reviewed-on: #31
Reviewed-by: Jannik <seil0@mosad.xyz>
2024-02-13 17:40:06 +01:00
Hannes Braun 9bdb14896b Unescape parts in MensaParser 2024-01-28 18:30:31 +01:00
Hannes Braun f40afe84ed Fix TimetableParserTest 2023-12-05 19:31:03 +01:00
Jannik 3c1d5ac6c7
update gradle wrapper to version 8.4 2023-11-14 22:26:25 +01:00
Jannik 302e1c7307 Merge pull request 'Parse course name for room occupancies' (#30) from parse-lessoncourse into master
Reviewed-on: #30
2023-09-29 23:12:06 +02:00
Hannes Braun 22ba5d5f7f Parse course name for room occupancies 2023-09-29 16:39:46 +02:00
Jannik b2a429cc48 Merge pull request 'Add API for room occupancy' (#29) from room-api into master
Reviewed-on: #29
2023-09-29 12:36:06 +02:00
Hannes Braun 1a768e1188 Add API for room occupancy 2023-09-25 15:33:42 +02:00
Hannes Braun b78d28a6d3 Fix some more typos 2023-09-15 18:59:11 +02:00
Hannes Braun 954e8ec359 Fix typo in comment about mensa menu update 2023-08-24 23:26:57 +02:00
Jannik a5d13629e5 Merge pull request 'CourseListParser: don't replace https with httpss' (#28) from fix-course-list-parser into master
Reviewed-on: #28
2023-06-30 13:18:24 +02:00
Hannes Braun a3b3c40d77 CourseListParser: don't replace https with httpss 2023-05-15 14:35:55 +02:00
Jannik 0f59fb51b4 Merge pull request 'Remove -Xopt-in compiler argument' (#27) from opt-out into master
Reviewed-on: #27
2023-04-05 11:06:34 +02:00
Hannes Braun 97f32069fa
Remove -Xopt-in compiler argument
We don't need to opt in to the experimental Time class any longer.
2023-04-03 21:17:54 +02:00
Jannik 9f8ca744bc Merge pull request 'Fix permissions of TCoR volume in Docker container' (#26) from fix-docker-permissions into master
Reviewed-on: #26
2023-02-19 14:23:17 +01:00
Hannes Braun 14b212dcf8
Fix permissions of TCoR volume in Docker container 2023-01-31 18:53:41 +01:00
Jannik be415a8ee4 Merge pull request 'Update year when updating cached timetables' (#25) from fix-year-update into master
Reviewed-on: #25
2023-01-14 12:45:31 +01:00
Hannes Braun 7f7aaa180a
Update year when updating cached timetables 2023-01-13 20:21:15 +01:00
Jannik 3e17a788d7
update gradle wrapper to version 7.6 2022-12-22 16:15:17 +01:00
Jannik fb838f5a32
update dependencies
* kotlin 1.6.20 -> 1.7.20
* spring boot 2.6.6 -> 2.7.6
* coroutines 1.6.1 -> 1.6.4
* gson 2.9.0 -> 2.10
2022-12-22 15:56:10 +01:00
Jannik 7581dc058c Merge pull request 'Replace GlobalScope with CoroutineScope in CacheController' (#22) from feature/CoroutineScope into master
Reviewed-on: #22
2022-12-22 15:47:16 +01:00
Jannik a212539366
replace GlobalScope with CoroutineScope in CacheController 2022-12-22 15:42:46 +01:00
Jannik dc6c41578a Merge pull request 'Update MensaParser for new Mensa website' (#24) from fix-mensaparser into master
Reviewed-on: #24
2022-12-22 15:38:20 +01:00
Hannes Braun a39da6deba
Update MensaParser for new Mensa website 2022-12-19 21:02:50 +01:00
Hannes Braun d457627e00
Update jsoup from 1.14.3 to 1.15.3
Version 1.14.3 also included a vulnerability (CVE-2022-36033) that got fixed with 1.15.3.
2022-12-19 20:30:14 +01:00
Hannes Braun 795ddc516d
Deduplicate default values in StartupController 2022-12-19 20:26:45 +01:00
Jannik e6f09c11ba
update libraries
* spring boot 2.5.5 -> 2.6.6
* kotlin 1.5.31 -> 1.6.20
* coroutines 1.5.2 -> 1.6.1
* gson 2.8.8 -> 2.9.0
* gradle wrapper 7.2 -> 7.4.2
2022-04-08 14:54:06 +02:00
Jannik f7c8958d20 Merge pull request 'Fix CacheController lookup' (#23) from fix/cache-controller into master
continuous-integration/woodpecker the build was successful Details
Reviewed-on: #23
2022-01-14 18:46:24 +01:00
Hannes Braun 006e962bf1
Fix CacheController lookup
continuous-integration/woodpecker the build was successful Details
2022-01-14 15:42:25 +01:00
Jannik f49e600613
version 1.3.0
continuous-integration/woodpecker the build was successful Details
2021-10-31 22:09:12 +01:00
Jannik 940a30e9aa Merge pull request 'Parse the year of a timetable' (#21) from hannesbraun/TheCitadelofRicks:feature/parse-year into master
continuous-integration/woodpecker the build was successful Details
Reviewed-on: #21
2021-10-24 15:00:13 +02:00
Hannes Braun d863f4fb1e
TimetableParser: parse year
continuous-integration/woodpecker the build was successful Details
This also adds the parsed year to the meta object included in the timetable response
2021-10-24 14:39:22 +02:00
Jannik dc57a0d0c1 Merge pull request 'Various improvements' (#17) from hannesbraun/TheCitadelofRicks:fix/timeout-resilience into master
continuous-integration/woodpecker the build was successful Details
Reviewed-on: #17
2021-10-24 14:38:12 +02:00
Hannes Braun 5ba9dfc263
Better null checks 2021-10-24 14:34:00 +02:00
Hannes Braun ca8efdaa85
Only add timetable to cache on success 2021-10-24 14:34:00 +02:00
Hannes Braun 8e3af696e0
Limit sending timetable requests in parallel to 3
Otherwise, the requests may fail (from my experience). Also we don't want to look suspicious (flooding their server with tons of requests at the same time).
2021-10-24 14:34:00 +02:00
Hannes Braun fb6291792d
Use ConcurrentHashMap for timetableList
Multiple requests may be processed at the same time and could otherwise cause problems (concurrent write operations)
2021-10-24 14:34:00 +02:00
Hannes Braun 993b8f6a71
Small improvements
- Improve formatting
- Fix some typos
- Mini code improvements
2021-10-24 14:34:00 +02:00
Hannes Braun f9cc9b5e14
Make the update scheduling more readable (hopefully) 2021-10-24 14:34:00 +02:00
Hannes Braun 460d1ee131
StatusController: use properties instead of getters 2021-10-24 14:33:59 +02:00
Hannes Braun 90847a2730
Also set JVM target to 11 for Java 2021-10-24 14:33:59 +02:00
Hannes Braun a292b45fcb
Dependency updates
This also replaces JCenter with Maven Central since JCenter is now read-only
2021-10-24 14:33:59 +02:00
Hannes Braun 22f17d10e0
Timetable fixes
- Only one request is made to get the timetable HTML document for parsing the timetable and the weekNumberYear
- On timeouts or other errors, the cached data won't be overwritten with emptiness anymore
- The scheduled updates will now also update the weekNumberYear
2021-10-24 14:33:59 +02:00
Hannes Braun ae9bf2a562
Update Kotlin to 1.5.31 2021-10-24 14:33:58 +02:00
Jannik 6394a7c880
fix secrets (1st try)
continuous-integration/drone the build was successful Details
2021-10-16 15:48:34 +02:00
Jannik 5ab5e850bd
execute the docker build/deploy image with privileged: true
continuous-integration/drone the build failed Details
2021-10-16 15:21:01 +02:00
Jannik a97a464a83 Merge pull request 'use techknowlogick's drone-docker image' (#20) from fix/docker-build into master
continuous-integration/drone the build failed Details
Reviewed-on: #20
2021-10-16 14:39:38 +02:00
Jannik 2b06efeece
use techknowlogick's drone-docker image
continuous-integration/drone the build was successful Details
this should fix the docker build issues
2021-10-16 14:35:37 +02:00
Jannik 024f2b04ce „README.md“ ändern
continuous-integration/drone the build was successful Details
2021-10-13 20:09:46 +02:00
Jannik bf71d62dc5
version 1.2.8
continuous-integration/drone the build failed Details
2021-10-13 20:03:14 +02:00
Jannik 7dce2c6cfd Merge pull request 'updated mensa URL' (#16) from fix/mensa_url into master
continuous-integration/drone the build was successful Details
Reviewed-on: #16
2021-10-13 19:49:53 +02:00
Hendrik Schutter a1dc5656b8
updated mensa URL, thanks to Hannes B.
continuous-integration/drone the build was successful Details
2021-10-13 19:47:38 +02:00
Jannik dd4c5259d2 Merge pull request 'move ci config from drone to woodpecker' (#18) from fix/ci into master
continuous-integration/drone the build failed Details
Reviewed-on: #18
2021-10-13 19:45:32 +02:00
Jannik 884aab08ed
move ci config from drone to woodpecker
continuous-integration/drone the build failed Details
2021-10-13 19:39:37 +02:00
Jannik c64c8779e3
update kotlin to 1.4
continuous-integration/drone/push Build is passing Details
* update spring boot 2.3.2 -> 2.3.3
* update gradle wrapper to version 6.6.1
2020-09-16 18:56:24 +02:00
Jannik 1d614a06c4
version 1.2.7
continuous-integration/drone/tag Build is passing Details
continuous-integration/drone/push Build is passing Details
* update coroutines 1.3.7 -> 1.3.8
2020-08-16 20:03:37 +02:00
Jannik 3f10c8afaa
fix courseList sorting
continuous-integration/drone/push Build is passing Details
closes #15
2020-08-16 19:56:13 +02:00
26 changed files with 1259 additions and 1048 deletions

View File

@ -1,30 +0,0 @@
kind: pipeline
name: default
steps:
- name: test
image: gradle:jdk11
commands:
- gradle test
- name: build
image: gradle:jdk11
commands:
- 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

21
.woodpecker.yml Normal file
View File

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

View File

@ -1,6 +1,7 @@
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
RUN mkdir /tcor && chown spring:spring /tcor
USER spring:spring
ARG JAR_FILE=build/libs/*.jar
COPY ${JAR_FILE} thecitadelofricks.jar

View File

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

View File

@ -1,25 +1,25 @@
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'
id 'org.jetbrains.kotlin.jvm' version '1.7.20'
id 'org.jetbrains.kotlin.plugin.spring' version '1.7.20'
id 'org.springframework.boot' version '2.7.6'
id 'io.spring.dependency-management' version '1.1.0'
}
group 'org.mosad'
version '1.2.6'
version '1.3.1'
repositories {
jcenter()
mavenCentral()
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
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'
implementation 'org.springframework.boot:spring-boot-starter-web:2.7.6'
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.7.22'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
implementation 'org.jsoup:jsoup:1.15.3'
implementation 'com.google.code.gson:gson:2.10'
testImplementation 'org.junit.jupiter:junit-jupiter:5.6.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
}
test {
@ -30,9 +30,16 @@ test {
}
}
def jvmTargetVersion = "11"
compileKotlin {
kotlinOptions.jvmTarget = "11"
kotlinOptions.jvmTarget = jvmTargetVersion
}
compileJava {
targetCompatibility = jvmTargetVersion
}
compileTestKotlin {
kotlinOptions.jvmTarget = "11"
kotlinOptions.jvmTarget = jvmTargetVersion
}
compileTestJava {
targetCompatibility = jvmTargetVersion
}

Binary file not shown.

View File

@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

285
gradlew vendored
View File

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

34
gradlew.bat vendored
View File

@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -54,7 +55,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -64,21 +65,6 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
@ -86,17 +72,19 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal

View File

@ -26,12 +26,16 @@ import org.mosad.thecitadelofricks.controller.CacheController
import org.mosad.thecitadelofricks.controller.CacheController.Companion.courseList
import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLesson
import org.mosad.thecitadelofricks.controller.CacheController.Companion.getLessonSubjectList
import org.mosad.thecitadelofricks.controller.CacheController.Companion.getRoomSchedule
import org.mosad.thecitadelofricks.controller.CacheController.Companion.getTimetable
import org.mosad.thecitadelofricks.controller.CacheController.Companion.mensaMenu
import org.mosad.thecitadelofricks.controller.CacheController.Companion.roomList
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.updateRoomListRequests
import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateRoomScheduleRequests
import org.mosad.thecitadelofricks.controller.StatusController.Companion.updateTimetableRequests
import org.slf4j.Logger
import org.slf4j.LoggerFactory
@ -48,8 +52,8 @@ class APIController {
private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
companion object {
const val apiVersion = "1.2.0"
const val softwareVersion = "1.2.6"
const val apiVersion = "1.4.0"
const val softwareVersion = "1.3.1"
val startTime = System.currentTimeMillis() / 1000
}
@ -98,12 +102,29 @@ class APIController {
@RequestParam(value = "course", defaultValue = "AI4") courseName: String,
@RequestParam(value = "subject", defaultValue = "Mathematik 4") lessonSubject: String,
@RequestParam(value = "week", defaultValue = "0") week: Int
): ArrayList<Lesson> {
): ArrayList<LessonWithRoom> {
logger.info("lesson request at ${LocalDateTime.now()}!")
updateTimetableRequests(courseName)
return getLesson(courseName, lessonSubject, week)
}
@RequestMapping("/roomList")
fun roomList(): RoomsListRet {
logger.info("roomList request at ${LocalDateTime.now()}!")
updateRoomListRequests()
return RoomsListRet(roomList.meta, ArrayList(roomList.rooms.values))
}
@RequestMapping("/roomSchedule")
fun roomSchedule(
@RequestParam(value = "room", defaultValue = "B040") roomName: String,
@RequestParam(value = "week", defaultValue = "0") week: Int
): RoomScheduleWeekRet {
logger.info("roomSchedule request at ${LocalDateTime.now()}!")
updateRoomScheduleRequests(roomName)
return getRoomSchedule(roomName, week)
}
@RequestMapping("/status")
fun status(): Status {
logger.info("status request at ${LocalDateTime.now()}!")

View File

@ -31,7 +31,7 @@ data class Course(val courseName: String, val courseLink: String)
data class CoursesMeta(val updateTime: Long = 0, val totalCourses: Int = 0)
data class CoursesList(val meta: CoursesMeta = CoursesMeta(), val courses: HashMap<String, Course> = HashMap())
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
@ -46,7 +46,10 @@ data class MensaMeta(val updateTime: Long, val mensaName: String)
data class MensaMenu(val meta: MensaMeta, val currentWeek: MensaWeek, val nextWeek: MensaWeek)
// data classes for the timetable part
data class Lesson(
data class CalendarWeek(val week: Int, val year: Int)
data class LessonWithRoom(
val lessonID: String,
val lessonSubject: String,
val lessonTeacher: String,
@ -54,13 +57,33 @@ data class Lesson(
val lessonRemark: String
)
data class TimetableDay(val timeslots: Array<ArrayList<Lesson>> = Array(6) { ArrayList<Lesson>() })
data class LessonWithCourse(
val lessonID: String,
val lessonSubject: String,
val lessonTeacher: String,
val lessonCourse: String,
val lessonRemark: String
)
data class TimetableWeek(val days: Array<TimetableDay> = Array(6) { TimetableDay() })
data class TimetableDay<Lesson>(val timeslots: Array<ArrayList<Lesson>> = Array(6) { ArrayList<Lesson>() })
data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, val weekNumberYear: Int = 0, val link: String = "")
data class TimetableWeek<Lesson>(val days: Array<TimetableDay<Lesson>> = Array(6) { TimetableDay() })
data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek())
data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, var weekNumberYear: Int = 0, var year: Int = 0, val link: String = "")
data class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek<LessonWithRoom> = TimetableWeek())
// data classes for the room occupancy part
data class Room(val roomName: String, val roomLink: String)
data class RoomsMeta(val updateTime: Long = 0, val totalRooms: Int = 0)
data class RoomsList(val meta: RoomsMeta = RoomsMeta(), val rooms: SortedMap<String, Room>)
data class RoomsListRet(val meta: RoomsMeta = RoomsMeta(), val rooms: ArrayList<Room> = ArrayList())
data class RoomScheduleMeta(var updateTime: Long = 0, val roomName: String = "", val weekIndex: Int = 0, var weekNumberYear: Int = 0, var year: Int = 0, val link: String = "")
data class RoomScheduleWeekRet(val meta: RoomScheduleMeta = RoomScheduleMeta(), var timetable: TimetableWeek<LessonWithCourse> = TimetableWeek())
// data classes for the status part
@ -76,6 +99,10 @@ data class Status(
val timetableRequests: HashMap<String, Int>,
val timetableListSize: Int,
val coursesLastUpdate: Date,
val roomListRequests: Int,
val roomScheduleRequests: HashMap<String, Int>,
val roomScheduleListSize: Int,
val roomsLastUpdate: Date,
val mensaLastUpdate: Date,
val hsoResponseCode: Int,
val swfrResponseCode: Int

View File

@ -27,17 +27,21 @@ import kotlinx.coroutines.*
import org.jsoup.Jsoup
import org.mosad.thecitadelofricks.*
import org.mosad.thecitadelofricks.hsoparser.CourseListParser
import org.mosad.thecitadelofricks.hsoparser.CourseTimetableParser
import org.mosad.thecitadelofricks.hsoparser.MensaParser
import org.mosad.thecitadelofricks.hsoparser.TimetableParser
import org.mosad.thecitadelofricks.hsoparser.RoomListParser
import org.mosad.thecitadelofricks.hsoparser.RoomTimetableParser
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import java.io.*
import java.util.*
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.Executors
import kotlin.collections.ArrayList
import kotlin.collections.HashMap
import kotlin.collections.HashSet
import kotlin.concurrent.scheduleAtFixedRate
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.minutes
class CacheController {
@ -46,12 +50,14 @@ class CacheController {
scheduledUpdates()
}
companion object{
companion object {
private val logger: Logger = LoggerFactory.getLogger(CacheController::class.java)
var courseList = CoursesList()
var mensaMenu = MensaMenu(MensaMeta(0,""), MensaWeek(), MensaWeek())
var timetableList = HashMap<String, TimetableCourseWeek>() // this list contains all timetables
var courseList = CoursesList(CoursesMeta(), sortedMapOf())
var mensaMenu = MensaMenu(MensaMeta(0, ""), MensaWeek(), MensaWeek())
var timetableList = ConcurrentHashMap<String, TimetableCourseWeek>() // this list contains all timetables
var roomList = RoomsList(RoomsMeta(), sortedMapOf())
var roomScheduleList = ConcurrentHashMap<String, RoomScheduleWeekRet>() // this list contains all room schedules
/**
* get a timetable, since they may not be cached, we need to make sure it's cached, otherwise download
@ -59,36 +65,55 @@ class CacheController {
* @param weekIndex request week number (current week = 0)
* @return timetable of the course (Type: [TimetableCourseWeek])
*/
fun getTimetable(courseName: String, weekIndex: Int): TimetableCourseWeek = runBlocking {
fun getTimetable(courseName: String, weekIndex: Int): TimetableCourseWeek {
// 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 year = 0
val instr = CacheController::class.java.getResourceAsStream("/html/Timetable_normal-week.html")
val htmlDoc = Jsoup.parse(instr,"UTF-8", "https://www.hs-offenburg.de/")
val timetableTest = TimetableParser().parseTimeTable(htmlDoc)
val timetableParser =
CourseTimetableParser(htmlDoc = Jsoup.parse(instr!!, "UTF-8", "https://www.hs-offenburg.de/"))
val timetableTest = timetableParser.parseTimeTable()
return@runBlocking TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink), timetableTest)
return TimetableCourseWeek(
TimetableCourseMeta(
currentTime,
courseName,
weekIndex,
weekNumberYear,
year,
timetableLink
), timetableTest ?: TimetableWeek()
)
}
return@runBlocking timetableList.getOrPut("$courseName-$weekIndex") {
val key = "$courseName-$weekIndex"
return if (timetableList.containsKey(key)) {
timetableList[key]!!
} else {
val timetableLink = courseList.courses[courseName]
?.courseLink
?.replace("week=0", "week=$weekIndex") ?: ""
val currentTime = System.currentTimeMillis() / 1000
var timetable = TimetableWeek()
var weekNumberYear = 0
val timetableJobs = listOf(
async { timetable = TimetableParser().getTimeTable(timetableLink) },
async { weekNumberYear = TimetableParser().getWeekNumberYear(timetableLink) }
)
val timetableParser = CourseTimetableParser(timetableLink)
val calendarWeek = timetableParser.parseCalendarWeek()
val timetable = timetableParser.parseTimeTable()
timetableJobs.awaitAll()
TimetableCourseWeek(TimetableCourseMeta(currentTime, courseName, weekIndex, weekNumberYear, timetableLink), timetable)
TimetableCourseWeek(
TimetableCourseMeta(
currentTime,
courseName,
weekIndex,
calendarWeek?.week ?: 0,
calendarWeek?.year ?: 0,
timetableLink
), timetable ?: TimetableWeek()
).also { if (timetable != null) timetableList[key] = it }
}
}
@ -117,8 +142,8 @@ class CacheController {
* @param weekIndex request week number (current week = 0)
* @return a ArrayList<[Lesson]> of every lesson with lessonSubject for one week
*/
fun getLesson(courseName: String, lessonSubject: String, weekIndex: Int): ArrayList<Lesson> {
val lessonList = ArrayList<Lesson>()
fun getLesson(courseName: String, lessonSubject: String, weekIndex: Int): ArrayList<LessonWithRoom> {
val lessonList = ArrayList<LessonWithRoom>()
// get all lessons from the weeks timetable
val flatMap = getTimetable(courseName, weekIndex).timetable.days.flatMap { it.timeslots.asIterable() }
@ -129,29 +154,75 @@ class CacheController {
return lessonList
}
/**
* Get a room schedule.
* Since they may not be cached, we need to make sure it's cached. Download the schedule if it is not cached.
* @param roomName the name of the room to be requested
* @param weekIndex request week number (current week = 0)
* @return room schedule of the room (Type: [RoomScheduleWeekRet])
*/
fun getRoomSchedule(roomName: String, weekIndex: Int): RoomScheduleWeekRet {
val key = "$roomName-$weekIndex"
return if (roomScheduleList.containsKey(key)) {
roomScheduleList[key]!!
} else {
val roomScheduleLink = roomList.rooms[roomName]
?.roomLink
?.replace("week=0", "week=$weekIndex") ?: ""
val currentTime = System.currentTimeMillis() / 1000
val roomScheduleParser = RoomTimetableParser(roomScheduleLink)
val calendarWeek = roomScheduleParser.parseCalendarWeek()
val roomSchedule = roomScheduleParser.parseTimeTable()
RoomScheduleWeekRet(
RoomScheduleMeta(
currentTime,
roomName,
weekIndex,
calendarWeek?.week ?: 0,
calendarWeek?.year ?: 0,
roomScheduleLink
), roomSchedule ?: TimetableWeek()
).also { if (roomSchedule != null) roomScheduleList[key] = it }
}
}
// private cache functions
/**
* this function updates the courseList
* during the update process the old data will be returned for a API request
* during the update process the old data will be returned for an API request
*/
private fun asyncUpdateCourseList() = GlobalScope.launch {
CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it)
private fun asyncUpdateCourseList() = CoroutineScope(Dispatchers.IO).launch {
CourseListParser().getLinks(StartupController.courseListURL)?.let {
courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
}
// TODO just for testing
courseList.courses["TEST_A"] = Course("TEST_A", "https://mosad.xyz")
courseList.courses["TEST_B"] = Course("TEST_B", "https://mosad.xyz")
logger.info("Updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
logger.info("Updated courses successfully at ${Date(courseList.meta.updateTime * 1000)}")
}
/**
* this function updates the roomList
* during the update process the old data will be returned for an API request
*/
private fun asyncUpdateRoomList() = CoroutineScope(Dispatchers.IO).launch {
RoomListParser().getLinks(StartupController.roomListURL)?.let {
roomList = RoomsList(RoomsMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
}
logger.info("Updated room list successfully at ${Date(courseList.meta.updateTime * 1000)}")
}
/**
* this function updates the mensa menu list
* during the update process the old data will be returned for a API request
* during the update process the old data will be returned for an API request
*/
private fun asyncUpdateMensa() = GlobalScope.launch {
private fun asyncUpdateMensa() = CoroutineScope(Dispatchers.IO).launch {
val mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(StartupController.mensaMenuURL))
@ -160,15 +231,15 @@ class CacheController {
mensaMenu = MensaMenu(MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek)
}
logger.info("Updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
logger.info("Updated mensa menu successfully 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
* during the update process the old data will be returned for an API request
* a FixedThreadPool is used to make parallel requests for faster updates
*/
private fun asyncUpdateTimetables() = GlobalScope.launch {
private fun asyncUpdateTimetables() = CoroutineScope(Dispatchers.IO).launch {
logger.info("Updating ${timetableList.size} timetables ...")
// create a new ThreadPool with 5 threads
@ -177,7 +248,12 @@ class CacheController {
try {
timetableList.forEach { timetableCourse ->
executor.execute {
timetableCourse.value.timetable = TimetableParser().getTimeTable(timetableCourse.value.meta.link)
val timetableParser = CourseTimetableParser(timetableCourse.value.meta.link)
timetableCourse.value.timetable = timetableParser.parseTimeTable() ?: return@execute
timetableParser.parseCalendarWeek()?.also {
timetableCourse.value.meta.weekNumberYear = it.week
timetableCourse.value.meta.year = it.year
} ?: return@execute
timetableCourse.value.meta.updateTime = System.currentTimeMillis() / 1000
saveTimetableToCache(timetableCourse.value) // save the updated timetable to the cache directory
@ -209,6 +285,52 @@ class CacheController {
}
}
private fun asyncUpdateRoomSchedules() = CoroutineScope(Dispatchers.IO).launch {
logger.info("Updating ${roomScheduleList.size} room schedules ...")
// create a new ThreadPool with 5 threads
val executor = Executors.newFixedThreadPool(5)
try {
roomScheduleList.forEach { roomSchedule ->
executor.execute {
val roomScheduleParser = RoomTimetableParser(roomSchedule.value.meta.link)
roomSchedule.value.timetable = roomScheduleParser.parseTimeTable() ?: return@execute
roomScheduleParser.parseCalendarWeek()?.also {
roomSchedule.value.meta.weekNumberYear = it.week
roomSchedule.value.meta.year = it.year
} ?: return@execute
roomSchedule.value.meta.updateTime = System.currentTimeMillis() / 1000
saveRoomScheduleToCache(roomSchedule.value) // save the updated timetable to the cache directory
}
}
} catch (ex: Exception) {
logger.error("Error while updating the room schedules", 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 roomSchedule a room schedule of the type [RoomScheduleWeekRet]
*/
private fun saveRoomScheduleToCache(roomSchedule: RoomScheduleWeekRet) {
val file = File(StartupController.dirTcorCache, "roomSchedule-${roomSchedule.meta.roomName}-${roomSchedule.meta.weekIndex}.json")
val writer = BufferedWriter(FileWriter(file))
try {
writer.write(Gson().toJson(roomSchedule))
} catch (e: Exception) {
logger.error("something went wrong while trying to write a cache file", e)
} finally {
writer.close()
}
}
/**
* before the APIController is up, get the data fist
* runBlocking: otherwise the api would return no data to requests for a few seconds after startup
@ -217,9 +339,11 @@ class CacheController {
// get all course links on startup, make sure there are course links
val jobCourseUpdate = asyncUpdateCourseList()
val jobMensa = asyncUpdateMensa()
val jobRoomListUpdate = asyncUpdateRoomList()
jobCourseUpdate.join()
jobMensa.join()
jobRoomListUpdate.join()
logger.info("Initial updates successful")
}
@ -230,28 +354,42 @@ class CacheController {
*/
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) {
val duration24h = 24.hours.inWholeMilliseconds
val duration3h = 3.hours.inWholeMilliseconds
val duration1h = 1.hours.inWholeMilliseconds
val duration1m = 1.minutes.inWholeMilliseconds
// Calculate the initial delay to make the update time independent of the start time
fun calcInitDelay(period: Long) = (period - ((currentTime + duration1h) % period)) + duration1m
val initDelay24h = calcInitDelay(duration24h)
val initDelay3h = calcInitDelay(duration3h)
val initDelay1h = calcInitDelay(duration1h)
// update courseList and roomList every 24 hours (time in ms)
Timer().scheduleAtFixedRate(initDelay24h, duration24h) {
asyncUpdateCourseList()
}
// update all already existing timetables every 3 hours (time in ms)
Timer().scheduleAtFixedRate(initDelay3h, 10800000) {
asyncUpdateTimetables()
Timer().scheduleAtFixedRate(initDelay24h, duration24h) {
asyncUpdateRoomList()
}
// update courses every hour (time in ms)
Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
// update all already existing timetables and room schedules every 3 hours (time in ms)
Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
asyncUpdateTimetables()
}
Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
asyncUpdateRoomSchedules()
}
// update mensa menu every hour (time in ms)
Timer().scheduleAtFixedRate(initDelay1h, duration1h) {
asyncUpdateMensa()
}
// post to status.mosad.xyz every hour, if an API key is present
if (StartupController.cachetAPIKey != "0") {
Timer().scheduleAtFixedRate(initDelay1h, 3600000) {
Timer().scheduleAtFixedRate(initDelay1h, duration1h) {
CachetAPIController.postTotalRequests()
}
}

View File

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

View File

@ -44,7 +44,8 @@ class StartupController {
var cachetAPIKey = "0"
var cachetBaseURL = "https://status.mosad.xyz"
var courseListURL = "https://www.hs-offenburg.de/studium/vorlesungsplaene/"
var mensaMenuURL = "https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/"
val roomListURL = "https://www.hs-offenburg.de/die-hochschule/organisation/infos-services/raumbelegungen"
var mensaMenuURL = "https://www.swfr.de/essen/mensen-cafes-speiseplaene/mensa-offenburg"
var mensaName = "Offenburg"
}
@ -77,29 +78,21 @@ class StartupController {
val properties = Properties()
properties.loadFromXML(FileInputStream(fileConfig))
cachetAPIKey = try {
properties.getProperty("cachetAPIKey")
} catch (ex: Exception) {
"0"
}
try {
cachetAPIKey = properties.getProperty("cachetAPIKey")
} catch (_: Exception) {}
cachetBaseURL = try {
properties.getProperty("cachetBaseURL")
} catch (ex: Exception) {
"https://status.mosad.xyz"
}
try {
cachetBaseURL = properties.getProperty("cachetBaseURL")
} catch (_: Exception) {}
mensaMenuURL = try {
properties.getProperty("mensaMenuURL")
} catch (ex: Exception) {
"https://www.swfr.de/de/essen-trinken/speiseplaene/mensa-offenburg/"
}
try {
mensaMenuURL = properties.getProperty("mensaMenuURL")
} catch (_: Exception) {}
mensaName = try {
properties.getProperty("mensaName")
} catch (ex: Exception) {
"Offenburg"
}
try {
mensaName = properties.getProperty("mensaName")
} catch (_: Exception) {}
} catch (ex: Exception) {
logger.error("error while loading config", ex)
@ -111,10 +104,10 @@ class StartupController {
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")
properties.setProperty("cachetAPIKey", cachetAPIKey)
properties.setProperty("cachetBaseURL", cachetBaseURL)
properties.setProperty("mensaMenuURL", mensaMenuURL)
properties.setProperty("mensaName", mensaName)
val outputStream = FileOutputStream(fileConfig)
properties.storeToXML(outputStream, "tcor configuration")
@ -135,7 +128,8 @@ class StartupController {
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)
CacheController.timetableList["${timetable.meta.courseName}-${timetable.meta.weekIndex}"] =
timetable
} catch (ex: Exception) {
logger.error("error while reading cache", ex)
} finally {
@ -145,4 +139,4 @@ class StartupController {
}
}
}
}
}

View File

@ -39,10 +39,18 @@ class StatusController {
companion object {
private val logger: Logger = LoggerFactory.getLogger(StatusController::class.java)
private var totalRequests = 0
private var mensaMenuRequests = 0
private var courseListRequests = 0
private var timetableRequests = HashMap<String, Int>()
var totalRequests = 0
private set
var mensaMenuRequests = 0
private set
var courseListRequests = 0
private set
var timetableRequests = HashMap<String, Int>()
private set
var roomListRequests = 0
private set
var roomScheduleRequests = HashMap<String, Int>()
private set
/**
* if a mensamenu/courseList/timetable is requested update the specific and total request count
@ -58,27 +66,18 @@ class StatusController {
}
fun updateTimetableRequests(courseName: String) {
timetableRequests[courseName] = timetableRequests.getOrPut(courseName) {0} + 1
timetableRequests[courseName] = (timetableRequests[courseName] ?: 0) + 1
totalRequests++
}
/**
* getters and setters
*/
fun getTotalRequests(): Int {
return totalRequests
fun updateRoomListRequests() {
roomListRequests++
totalRequests++
}
fun getMensaMenuRequests(): Int {
return mensaMenuRequests
}
fun getCourseListRequests(): Int {
return courseListRequests
}
fun getTimetableRequests(): HashMap<String, Int> {
return timetableRequests
fun updateRoomScheduleRequests(roomName: String) {
roomScheduleRequests[roomName] = (roomScheduleRequests[roomName] ?: 0) + 1
totalRequests++
}
fun getStatus(): Status {
@ -112,12 +111,16 @@ class StatusController {
"$days days, $hours:$minutes",
apiVersion,
softwareVersion,
getTotalRequests(),
getMensaMenuRequests(),
getCourseListRequests(),
getTimetableRequests(),
totalRequests,
mensaMenuRequests,
courseListRequests,
timetableRequests,
CacheController.timetableList.size,
Date(CacheController.courseList.meta.updateTime * 1000),
roomListRequests,
roomScheduleRequests,
CacheController.roomScheduleList.size,
Date(CacheController.roomList.meta.updateTime * 1000),
Date(CacheController.mensaMenu.meta.updateTime * 1000),
hsoCode,
swfrCode

View File

@ -1,61 +0,0 @@
/**
* TheCitadelofRicks
*
* Copyright 2019-2020 <seil0@mosad.xyz>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*
*/
package org.mosad.thecitadelofricks.hsoparser
import org.jsoup.Jsoup
import org.mosad.thecitadelofricks.Course
import org.slf4j.LoggerFactory
import java.net.SocketTimeoutException
class CourseListParser {
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): 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[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
} catch (gex: Exception) {
logger.error("general CourseListParser error", gex)
return null
}
return courseLinkList
}
}

View File

@ -24,6 +24,7 @@ package org.mosad.thecitadelofricks.hsoparser
import org.jsoup.Jsoup
import org.jsoup.nodes.Document
import org.jsoup.parser.Parser
import org.mosad.thecitadelofricks.Meal
import org.mosad.thecitadelofricks.MensaWeek
import org.slf4j.LoggerFactory
@ -59,19 +60,24 @@ class MensaParser {
val mealWeekList = MensaWeek()
try {
htmlDoc.select("#speiseplan-tabs").select("div.tab-content").select("div.menu-tagesplan")
htmlDoc.select("#tabsWeekdaysMenu").select("div.menu-tagesplan")
.forEachIndexed { dayIndex, day ->
val meals = mealWeekList.days[dayIndex].meals
val strDay = day.select("h3").text()
day.select("div.row").forEachIndexed { mealIndex, meal ->
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()
day.select("div.menu-tagesplan > div.grid").first()?.select("div.flex-col")?.forEachIndexed { _, meal ->
val heading = meal.select("h5").text()
val parts = ArrayList(meal.select("small.extra-text").html().split("<br>").map { Parser.unescapeEntities(it, true).trim() })
val additives = meal.select("small.zusatzsstoffe[x-show=showAllergenes]").text()
parts.removeIf { x -> x.isEmpty() || x.isBlank() }
mealWeekList.days[dayIndex].meals.add(Meal(strDay, heading, parts, additives))
meals.add(Meal(strDay, heading, parts, additives))
}
if (meals.isEmpty()) {
// Add an empty Meal entry to preserve the day information
meals.add(Meal(strDay, "", ArrayList(), ""))
}
}
} catch (pex: Exception) {
logger.error("error while parsing the html file", pex)
@ -87,8 +93,7 @@ class MensaParser {
*/
fun getMenuLinkNextWeek(mensaMenuURL: String): String {
val menuHTML = Jsoup.connect(mensaMenuURL).get()
return "https://www.swfr.de" + menuHTML.select("#speiseplan-tabs").select("a.next-week").attr("href")
return "https://www.swfr.de" + menuHTML.select("div.section-mensa").select("a.next-week").attr("href")
}
}

View File

@ -0,0 +1,86 @@
/**
* TheCitadelofRicks
*
* Copyright 2019-2020 <seil0@mosad.xyz>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*
*/
package org.mosad.thecitadelofricks.hsoparser
import org.jsoup.Jsoup
import org.jsoup.nodes.Element
import org.mosad.thecitadelofricks.Course
import org.mosad.thecitadelofricks.Room
import org.slf4j.LoggerFactory
import java.net.SocketTimeoutException
sealed class TimetableLinkListParser<T> {
private var logger: org.slf4j.Logger = LoggerFactory.getLogger(TimetableLinkListParser::class.java)
abstract fun constructValue(key: String, link: String): T
abstract val blacklist: List<String>
abstract val liClass: String
/**
* return a list of all elements at listURL
* @param listURL the url to the list page
* @return a ArrayList<T> with all links or null if the request was not successful
*/
fun getLinks(listURL: String): HashMap<String, T>? {
val linkList = HashMap<String, T>()
try {
val courseHTML = Jsoup.connect(listURL).get()
courseHTML
.select("ul.index-group")
.select("li.$liClass")
.select("a[href]")
.filter{ it: Element -> !blacklist.contains(it.text()) }
.forEach {
linkList[it.text()] = constructValue(
it.text(),
it.attr("href").replace("http:", "https:")
)
}
logger.info("successfully retrieved link List")
} catch (ex: SocketTimeoutException) {
logger.warn("timeout from hs-offenburg.de, updating on next attempt!")
return null
} catch (gex: Exception) {
logger.error("general TimetableLinkListParser error", gex)
return null
}
return linkList
}
}
class CourseListParser : TimetableLinkListParser<Course>() {
override fun constructValue(key: String, link: String) = Course(key, link)
override val blacklist = emptyList<String>()
override val liClass = "Class"
}
class RoomListParser : TimetableLinkListParser<Room>() {
override fun constructValue(key: String, link: String) = Room(key, link)
override val blacklist = listOf("STÜBER SYSTEMS")
override val liClass = "Room"
}

View File

@ -22,38 +22,58 @@
package org.mosad.thecitadelofricks.hsoparser
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.Semaphore
import org.jsoup.Jsoup
import org.jsoup.nodes.Document
import org.mosad.thecitadelofricks.Lesson
import org.mosad.thecitadelofricks.CalendarWeek
import org.mosad.thecitadelofricks.LessonWithCourse
import org.mosad.thecitadelofricks.LessonWithRoom
import org.mosad.thecitadelofricks.TimetableWeek
import org.slf4j.LoggerFactory
class TimetableParser {
/**
* @param timetableURL the URL of the timetable you want to get
* @param htmlDoc the html document to use (the timetableURL will be ignored if this value is present)
*/
sealed class TimetableParser<Lesson>(timetableURL: String? = null, htmlDoc: Document? = null) {
private var logger: org.slf4j.Logger = LoggerFactory.getLogger(TimetableParser::class.java)
private val days = arrayOf("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday")
/**
* get the timetable from the given url
* the timetable is organised per row not per column;
* Mon 1, Tue 1, Wed 1, Thur 1, Fri 1, Sat 1, Mon 2 and so on
* @param timetableURL the URL of the timetable you want to get
*/
fun getTimeTable(timetableURL: String): TimetableWeek {
return try {
parseTimeTable(Jsoup.connect(timetableURL).get())
} catch (gex: Exception) {
logger.error("general TimetableParser error", gex)
TimetableWeek()
abstract fun constructLesson(lessonID: String, lessonSubject: String, lessonTeacher: String, value4: String, lessonRemark: String): Lesson
abstract val value4Class: String
companion object {
val semaphore = Semaphore(3, 0)
}
private val htmlDoc: Document? = htmlDoc ?: timetableURL?.let {
runBlocking {
try {
// Only allow sending a limited amount of requests at the same time
semaphore.acquire()
Jsoup.connect(timetableURL).get()
} catch (gex: Exception) {
logger.error("general TimetableParser error", gex)
null
} finally {
semaphore.release()
}
}
}
fun parseTimeTable(htmlDoc: Document): TimetableWeek {
val timetableWeek = TimetableWeek()
val rows = htmlDoc.select("table.timetable").select("tr[scope=\"row\"]")
/**
* parse the timetable from the previously given url
* the timetable is organised per row not per column;
* Mon 1, Tue 1, Wed 1, Thur 1, Fri 1, Sat 1, Mon 2 and so on
*/
fun parseTimeTable(): TimetableWeek<Lesson>? = htmlDoc?.let {
val timetableWeek = TimetableWeek<Lesson>()
val rows = it.select("table.timetable").select("tr[scope=\"row\"]")
var sDay = -1
var sRow = -1
var sLesson = Lesson("", "", "", "", "")
var sLesson = constructLesson("", "", "", "", "")
// get each row with index, reflects 1 timeslot per day
for ((rowIndex, row) in rows.withIndex()) {
@ -61,7 +81,7 @@ class TimetableParser {
var lessonIndexDay = 0 // the index of the lesson per timeslot
// elements are now all lessons, including empty ones
row.select("td.lastcol, td[style]").forEach {element ->
row.select("td.lastcol, td[style]").forEach { element ->
// if there is a lecture with rowspan="2", we need to shift everything by one to the left. This is stupid and ugly there needs to bee an API
if ((sDay > -1 && sRow > -1) && (sDay == day && ((sRow + 1) == rowIndex))) {
@ -70,11 +90,11 @@ class TimetableParser {
// adjust the following slot
sDay++
sLesson = Lesson(
sLesson = constructLesson(
"$day.$rowIndex.$lessonIndexDay",
element.select("div.lesson-subject").text(),
element.select("div.lesson-teacher").text(),
element.select("div.lesson-room").text(),
element.select("div.$value4Class").text(),
element.select("div.lesson-remark").text()
)
@ -85,11 +105,11 @@ class TimetableParser {
} else {
timetableWeek.days[day].timeslots[rowIndex].add(
Lesson(
constructLesson(
"$day.$rowIndex.$lessonIndexDay",
element.select("div.lesson-subject").text(),
element.select("div.lesson-teacher").text(),
element.select("div.lesson-room").text(),
element.select("div.$value4Class").text(),
element.select("div.lesson-remark").text()
)
)
@ -104,8 +124,7 @@ class TimetableParser {
lessonIndexDay++
if (element.hasClass("lastcol"))
{
if (element.hasClass("lastcol")) {
day++
lessonIndexDay = 0
}
@ -117,21 +136,13 @@ class TimetableParser {
}
/**
* get the week number of the year for the timetable
* @param timetableURL the URL of the timetable you want to get
* parse the calendar week and the associated year for the timetable
*/
fun getWeekNumberYear(timetableURL: String): Int {
return try {
parseWeekNumberYear(Jsoup.connect(timetableURL).get())
} catch (gex: Exception) {
logger.error("general TimetableParser error", gex)
0
}
}
fun parseWeekNumberYear(htmlDoc: Document): Int {
return htmlDoc.select("h1.timetable-caption").text().substringAfter("- ")
.substringBefore(".").replace(" ", "").toInt()
fun parseCalendarWeek(): CalendarWeek? = htmlDoc?.let {
val dateStr = it.select("h1.timetable-caption").text().substringAfter("- ")
val week = dateStr.substringBefore(".").replace(" ", "").toInt()
val year = dateStr.substringAfter("Woche ").replace(" ", "").toInt()
CalendarWeek(week, year)
}
@Suppress("unused")
@ -139,7 +150,7 @@ class TimetableParser {
* print a timetable
* @param timetable the timetable to print
*/
fun printTimetableWeek(timetable: TimetableWeek) {
fun printTimetableWeek(timetable: TimetableWeek<LessonWithRoom>) {
for (j in 0..5) print(days[j].padEnd(75, ' ') + " | ")
println()
for (j in 0..5) print("-".padEnd(76 + (j.toFloat().div(j).toInt()), '-') + "+")
@ -182,4 +193,18 @@ class TimetableParser {
println(" \n")
}
}
}
class CourseTimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) : TimetableParser<LessonWithRoom>(timetableURL, htmlDoc) {
override fun constructLesson(lessonID: String, lessonSubject: String, lessonTeacher: String, value4: String, lessonRemark: String)
= LessonWithRoom(lessonID, lessonSubject, lessonTeacher, value4, lessonRemark)
override val value4Class = "lesson-room"
}
class RoomTimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) : TimetableParser<LessonWithCourse>(timetableURL, htmlDoc) {
override fun constructLesson(lessonID: String, lessonSubject: String, lessonTeacher: String, value4: String, lessonRemark: String)
= LessonWithCourse(lessonID, lessonSubject, lessonTeacher, value4, lessonRemark)
override val value4Class = "lesson-class"
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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