Compare commits
No commits in common. "master" and "1.3.1" have entirely different histories.
@ -1,7 +1,6 @@
|
||||
FROM eclipse-temurin:21-jre-alpine
|
||||
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
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
|
||||
[](https://ci.mosad.xyz/Seil0/TheCitadelofRicks)
|
||||
[](https://git.mosad.xyz/Seil0/TheCitadelofRicks/releases)
|
||||
[](https://www.gnu.org/licenses/gpl-3.0)
|
||||
# TheCitadelofRicks
|
||||
|
||||
23
build.gradle
23
build.gradle
@ -1,8 +1,8 @@
|
||||
plugins {
|
||||
id 'org.jetbrains.kotlin.jvm' version '1.9.23'
|
||||
id 'org.jetbrains.kotlin.plugin.spring' version '1.9.23'
|
||||
id 'org.springframework.boot' version '3.2.4'
|
||||
id 'io.spring.dependency-management' version '1.1.4'
|
||||
id 'org.jetbrains.kotlin.jvm' version '1.6.20'
|
||||
id 'org.jetbrains.kotlin.plugin.spring' version '1.6.20'
|
||||
id 'org.springframework.boot' version '2.6.6'
|
||||
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
|
||||
}
|
||||
|
||||
group 'org.mosad'
|
||||
@ -13,13 +13,13 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web:3.2.4'
|
||||
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23'
|
||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0'
|
||||
implementation 'org.jsoup:jsoup:1.17.2'
|
||||
implementation 'com.google.code.gson:gson:2.10.1'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
implementation 'org.jetbrains.kotlin:kotlin-stdlib'
|
||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
|
||||
implementation 'org.jsoup:jsoup:1.14.3'
|
||||
implementation 'com.google.code.gson:gson:2.9.0'
|
||||
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||
}
|
||||
|
||||
test {
|
||||
@ -30,9 +30,10 @@ test {
|
||||
}
|
||||
}
|
||||
|
||||
def jvmTargetVersion = "21"
|
||||
def jvmTargetVersion = "11"
|
||||
compileKotlin {
|
||||
kotlinOptions.jvmTarget = jvmTargetVersion
|
||||
kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
|
||||
}
|
||||
compileJava {
|
||||
targetCompatibility = jvmTargetVersion
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
networkTimeout=10000
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
18
gradlew
vendored
18
gradlew
vendored
@ -55,7 +55,7 @@
|
||||
# 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
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@ -80,11 +80,11 @@ do
|
||||
esac
|
||||
done
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=${0##*/}
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
@ -143,16 +143,12 @@ fi
|
||||
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
|
||||
@ -209,12 +205,6 @@ set -- \
|
||||
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.
|
||||
|
||||
11
gradlew.bat
vendored
11
gradlew.bat
vendored
@ -26,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||
if "%ERRORLEVEL%"=="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!
|
||||
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%
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
@ -26,16 +26,12 @@ 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
|
||||
@ -52,7 +48,7 @@ class APIController {
|
||||
private val logger: Logger = LoggerFactory.getLogger(APIController::class.java)
|
||||
|
||||
companion object {
|
||||
const val apiVersion = "1.4.0"
|
||||
const val apiVersion = "1.3.0"
|
||||
const val softwareVersion = "1.3.1"
|
||||
val startTime = System.currentTimeMillis() / 1000
|
||||
}
|
||||
@ -102,29 +98,12 @@ 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<LessonWithRoom> {
|
||||
): ArrayList<Lesson> {
|
||||
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()}!")
|
||||
|
||||
@ -49,7 +49,7 @@ data class MensaMenu(val meta: MensaMeta, val currentWeek: MensaWeek, val nextWe
|
||||
|
||||
data class CalendarWeek(val week: Int, val year: Int)
|
||||
|
||||
data class LessonWithRoom(
|
||||
data class Lesson(
|
||||
val lessonID: String,
|
||||
val lessonSubject: String,
|
||||
val lessonTeacher: String,
|
||||
@ -57,33 +57,13 @@ data class LessonWithRoom(
|
||||
val lessonRemark: String
|
||||
)
|
||||
|
||||
data class LessonWithCourse(
|
||||
val lessonID: String,
|
||||
val lessonSubject: String,
|
||||
val lessonTeacher: String,
|
||||
val lessonCourse: String,
|
||||
val lessonRemark: String
|
||||
)
|
||||
data class TimetableDay(val timeslots: Array<ArrayList<Lesson>> = Array(6) { ArrayList<Lesson>() })
|
||||
|
||||
data class TimetableDay<Lesson>(val timeslots: Array<ArrayList<Lesson>> = Array(6) { ArrayList<Lesson>() })
|
||||
data class TimetableWeek(val days: Array<TimetableDay> = Array(6) { TimetableDay() })
|
||||
|
||||
data class TimetableWeek<Lesson>(val days: Array<TimetableDay<Lesson>> = Array(6) { TimetableDay() })
|
||||
data class TimetableCourseMeta(var updateTime: Long = 0, val courseName: String = "", val weekIndex: Int = 0, var weekNumberYear: Int = 0, val year: Int = 0, val link: String = "")
|
||||
|
||||
data class 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 class TimetableCourseWeek(val meta: TimetableCourseMeta = TimetableCourseMeta(), var timetable: TimetableWeek = TimetableWeek())
|
||||
|
||||
|
||||
// data classes for the status part
|
||||
@ -99,10 +79,6 @@ 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
|
||||
|
||||
@ -27,10 +27,8 @@ 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.RoomListParser
|
||||
import org.mosad.thecitadelofricks.hsoparser.RoomTimetableParser
|
||||
import org.mosad.thecitadelofricks.hsoparser.TimetableParser
|
||||
import org.slf4j.Logger
|
||||
import org.slf4j.LoggerFactory
|
||||
import java.io.*
|
||||
@ -42,6 +40,7 @@ import kotlin.collections.HashSet
|
||||
import kotlin.concurrent.scheduleAtFixedRate
|
||||
import kotlin.time.Duration.Companion.hours
|
||||
import kotlin.time.Duration.Companion.minutes
|
||||
import kotlin.time.ExperimentalTime
|
||||
|
||||
class CacheController {
|
||||
|
||||
@ -56,8 +55,6 @@ class CacheController {
|
||||
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
|
||||
@ -76,7 +73,7 @@ class CacheController {
|
||||
val instr = CacheController::class.java.getResourceAsStream("/html/Timetable_normal-week.html")
|
||||
|
||||
val timetableParser =
|
||||
CourseTimetableParser(htmlDoc = Jsoup.parse(instr!!, "UTF-8", "https://www.hs-offenburg.de/"))
|
||||
TimetableParser(htmlDoc = Jsoup.parse(instr!!, "UTF-8", "https://www.hs-offenburg.de/"))
|
||||
val timetableTest = timetableParser.parseTimeTable()
|
||||
|
||||
return TimetableCourseWeek(
|
||||
@ -100,7 +97,7 @@ class CacheController {
|
||||
?.replace("week=0", "week=$weekIndex") ?: ""
|
||||
val currentTime = System.currentTimeMillis() / 1000
|
||||
|
||||
val timetableParser = CourseTimetableParser(timetableLink)
|
||||
val timetableParser = TimetableParser(timetableLink)
|
||||
val calendarWeek = timetableParser.parseCalendarWeek()
|
||||
val timetable = timetableParser.parseTimeTable()
|
||||
|
||||
@ -142,8 +139,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<LessonWithRoom> {
|
||||
val lessonList = ArrayList<LessonWithRoom>()
|
||||
fun getLesson(courseName: String, lessonSubject: String, weekIndex: Int): ArrayList<Lesson> {
|
||||
val lessonList = ArrayList<Lesson>()
|
||||
|
||||
// get all lessons from the weeks timetable
|
||||
val flatMap = getTimetable(courseName, weekIndex).timetable.days.flatMap { it.timeslots.asIterable() }
|
||||
@ -154,48 +151,14 @@ 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 an API request
|
||||
*/
|
||||
private fun asyncUpdateCourseList() = CoroutineScope(Dispatchers.IO).launch {
|
||||
CourseListParser().getLinks(StartupController.courseListURL)?.let {
|
||||
private fun asyncUpdateCourseList() = GlobalScope.launch {
|
||||
CourseListParser().getCourseLinks(StartupController.courseListURL)?.let {
|
||||
courseList = CoursesList(CoursesMeta(System.currentTimeMillis() / 1000, it.size), it.toSortedMap())
|
||||
}
|
||||
|
||||
@ -203,26 +166,14 @@ class CacheController {
|
||||
courseList.courses["TEST_A"] = Course("TEST_A", "https://mosad.xyz")
|
||||
courseList.courses["TEST_B"] = Course("TEST_B", "https://mosad.xyz")
|
||||
|
||||
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)}")
|
||||
logger.info("Updated courses successful at ${Date(courseList.meta.updateTime * 1000)}")
|
||||
}
|
||||
|
||||
/**
|
||||
* this function updates the mensa menu list
|
||||
* during the update process the old data will be returned for an API request
|
||||
*/
|
||||
private fun asyncUpdateMensa() = CoroutineScope(Dispatchers.IO).launch {
|
||||
private fun asyncUpdateMensa() = GlobalScope.launch {
|
||||
val mensaCurrentWeek = MensaParser().getMensaMenu(StartupController.mensaMenuURL)
|
||||
val mensaNextWeek = MensaParser().getMensaMenu(MensaParser().getMenuLinkNextWeek(StartupController.mensaMenuURL))
|
||||
|
||||
@ -231,7 +182,7 @@ class CacheController {
|
||||
mensaMenu = MensaMenu(MensaMeta(System.currentTimeMillis() / 1000, StartupController.mensaName), mensaCurrentWeek, mensaNextWeek)
|
||||
}
|
||||
|
||||
logger.info("Updated mensa menu successfully at ${Date(mensaMenu.meta.updateTime * 1000)}")
|
||||
logger.info("Updated mensamenu successful at ${Date(mensaMenu.meta.updateTime * 1000)}")
|
||||
}
|
||||
|
||||
/**
|
||||
@ -239,7 +190,7 @@ class CacheController {
|
||||
* 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() = CoroutineScope(Dispatchers.IO).launch {
|
||||
private fun asyncUpdateTimetables() = GlobalScope.launch {
|
||||
logger.info("Updating ${timetableList.size} timetables ...")
|
||||
|
||||
// create a new ThreadPool with 5 threads
|
||||
@ -248,12 +199,10 @@ class CacheController {
|
||||
try {
|
||||
timetableList.forEach { timetableCourse ->
|
||||
executor.execute {
|
||||
val timetableParser = CourseTimetableParser(timetableCourse.value.meta.link)
|
||||
val timetableParser = TimetableParser(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.weekNumberYear =
|
||||
timetableParser.parseCalendarWeek()?.week ?: return@execute
|
||||
timetableCourse.value.meta.updateTime = System.currentTimeMillis() / 1000
|
||||
|
||||
saveTimetableToCache(timetableCourse.value) // save the updated timetable to the cache directory
|
||||
@ -285,52 +234,6 @@ 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
|
||||
@ -339,11 +242,9 @@ 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")
|
||||
}
|
||||
@ -352,6 +253,7 @@ class CacheController {
|
||||
* update the CourseList every 24h, the Timetables every 3h and the Mensa Menu every hour
|
||||
* doesn't account the change between winter and summer time!
|
||||
*/
|
||||
@OptIn(ExperimentalTime::class)
|
||||
private fun scheduledUpdates() {
|
||||
val currentTime = System.currentTimeMillis()
|
||||
|
||||
@ -366,23 +268,17 @@ class CacheController {
|
||||
val initDelay3h = calcInitDelay(duration3h)
|
||||
val initDelay1h = calcInitDelay(duration1h)
|
||||
|
||||
// update courseList and roomList every 24 hours (time in ms)
|
||||
// update courseList every 24 hours (time in ms)
|
||||
Timer().scheduleAtFixedRate(initDelay24h, duration24h) {
|
||||
asyncUpdateCourseList()
|
||||
}
|
||||
Timer().scheduleAtFixedRate(initDelay24h, duration24h) {
|
||||
asyncUpdateRoomList()
|
||||
}
|
||||
|
||||
// update all already existing timetables and room schedules every 3 hours (time in ms)
|
||||
// update all already existing timetables every 3 hours (time in ms)
|
||||
Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
|
||||
asyncUpdateTimetables()
|
||||
}
|
||||
Timer().scheduleAtFixedRate(initDelay3h, duration3h) {
|
||||
asyncUpdateRoomSchedules()
|
||||
}
|
||||
|
||||
// update mensa menu every hour (time in ms)
|
||||
// update courses every hour (time in ms)
|
||||
Timer().scheduleAtFixedRate(initDelay1h, duration1h) {
|
||||
asyncUpdateMensa()
|
||||
}
|
||||
|
||||
@ -29,7 +29,7 @@ import java.io.BufferedReader
|
||||
import java.io.IOException
|
||||
import java.io.InputStreamReader
|
||||
import java.net.HttpURLConnection
|
||||
import java.net.URI
|
||||
import java.net.URL
|
||||
|
||||
class CachetAPIController {
|
||||
|
||||
@ -41,7 +41,7 @@ class CachetAPIController {
|
||||
|
||||
fun postTotalRequests() {
|
||||
try {
|
||||
val url = URI("${StartupController.cachetBaseURL}/api/v1/metrics/1/points").toURL()
|
||||
val url = URL("${StartupController.cachetBaseURL}/api/v1/metrics/1/points")
|
||||
val jsonInputString = "{\"value\": ${totalRequests -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
|
||||
oldTotalRequests = totalRequests
|
||||
|
||||
|
||||
@ -44,8 +44,7 @@ class StartupController {
|
||||
var cachetAPIKey = "0"
|
||||
var cachetBaseURL = "https://status.mosad.xyz"
|
||||
var courseListURL = "https://www.hs-offenburg.de/studium/vorlesungsplaene/"
|
||||
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 mensaMenuURL = "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
|
||||
var mensaName = "Offenburg"
|
||||
}
|
||||
|
||||
@ -78,21 +77,29 @@ class StartupController {
|
||||
val properties = Properties()
|
||||
properties.loadFromXML(FileInputStream(fileConfig))
|
||||
|
||||
try {
|
||||
cachetAPIKey = properties.getProperty("cachetAPIKey")
|
||||
} catch (_: Exception) {}
|
||||
cachetAPIKey = try {
|
||||
properties.getProperty("cachetAPIKey")
|
||||
} catch (ex: Exception) {
|
||||
"0"
|
||||
}
|
||||
|
||||
try {
|
||||
cachetBaseURL = properties.getProperty("cachetBaseURL")
|
||||
} catch (_: Exception) {}
|
||||
cachetBaseURL = try {
|
||||
properties.getProperty("cachetBaseURL")
|
||||
} catch (ex: Exception) {
|
||||
"https://status.mosad.xyz"
|
||||
}
|
||||
|
||||
try {
|
||||
mensaMenuURL = properties.getProperty("mensaMenuURL")
|
||||
} catch (_: Exception) {}
|
||||
mensaMenuURL = try {
|
||||
properties.getProperty("mensaMenuURL")
|
||||
} catch (ex: Exception) {
|
||||
"https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
|
||||
}
|
||||
|
||||
try {
|
||||
mensaName = properties.getProperty("mensaName")
|
||||
} catch (_: Exception) {}
|
||||
mensaName = try {
|
||||
properties.getProperty("mensaName")
|
||||
} catch (ex: Exception) {
|
||||
"Offenburg"
|
||||
}
|
||||
|
||||
} catch (ex: Exception) {
|
||||
logger.error("error while loading config", ex)
|
||||
@ -104,10 +111,10 @@ class StartupController {
|
||||
private fun createConfig() = try {
|
||||
val properties = Properties()
|
||||
|
||||
properties.setProperty("cachetAPIKey", cachetAPIKey)
|
||||
properties.setProperty("cachetBaseURL", cachetBaseURL)
|
||||
properties.setProperty("mensaMenuURL", mensaMenuURL)
|
||||
properties.setProperty("mensaName", mensaName)
|
||||
properties.setProperty("cachetAPIKey", "0")
|
||||
properties.setProperty("cachetBaseURL", "https://status.mosad.xyz")
|
||||
properties.setProperty("mensaMenuURL", "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/")
|
||||
properties.setProperty("mensaName", "Offenburg")
|
||||
|
||||
val outputStream = FileOutputStream(fileConfig)
|
||||
properties.storeToXML(outputStream, "tcor configuration")
|
||||
|
||||
@ -29,7 +29,7 @@ import org.mosad.thecitadelofricks.Status
|
||||
import org.slf4j.Logger
|
||||
import org.slf4j.LoggerFactory
|
||||
import java.net.HttpURLConnection
|
||||
import java.net.URI
|
||||
import java.net.URL
|
||||
import java.time.LocalDateTime
|
||||
import java.util.*
|
||||
import kotlin.collections.HashMap
|
||||
@ -47,10 +47,6 @@ class StatusController {
|
||||
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
|
||||
@ -70,16 +66,6 @@ class StatusController {
|
||||
totalRequests++
|
||||
}
|
||||
|
||||
fun updateRoomListRequests() {
|
||||
roomListRequests++
|
||||
totalRequests++
|
||||
}
|
||||
|
||||
fun updateRoomScheduleRequests(roomName: String) {
|
||||
roomScheduleRequests[roomName] = (roomScheduleRequests[roomName] ?: 0) + 1
|
||||
totalRequests++
|
||||
}
|
||||
|
||||
fun getStatus(): Status {
|
||||
val currentTime = System.currentTimeMillis() / 1000
|
||||
val minutes = (currentTime - startTime) % 3600 / 60
|
||||
@ -90,8 +76,8 @@ class StatusController {
|
||||
var swfrCode = 999
|
||||
|
||||
try {
|
||||
val hsoURL = URI("https://www.hs-offenburg.de/").toURL()
|
||||
val swfrURL = URI("https://www.swfr.de/").toURL()
|
||||
val hsoURL = URL("https://www.hs-offenburg.de/")
|
||||
val swfrURL = URL("https://www.swfr.de/")
|
||||
|
||||
var connection = hsoURL.openConnection() as HttpURLConnection
|
||||
connection.requestMethod = "HEAD"
|
||||
@ -117,10 +103,6 @@ class StatusController {
|
||||
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
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
/**
|
||||
* TheCitadelofRicks
|
||||
*
|
||||
* Copyright 2019-2020 <seil0@mosad.xyz>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
* MA 02110-1301, USA.
|
||||
*
|
||||
*/
|
||||
|
||||
package org.mosad.thecitadelofricks.hsoparser
|
||||
|
||||
import org.jsoup.Jsoup
|
||||
import org.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
|
||||
}
|
||||
}
|
||||
@ -24,7 +24,6 @@ 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
|
||||
@ -60,24 +59,19 @@ class MensaParser {
|
||||
val mealWeekList = MensaWeek()
|
||||
|
||||
try {
|
||||
htmlDoc.select("#tabsWeekdaysMenu").select("div.menu-tagesplan")
|
||||
htmlDoc.select("#speiseplan-tabs").select("div.tab-content").select("div.menu-tagesplan")
|
||||
.forEachIndexed { dayIndex, day ->
|
||||
val meals = mealWeekList.days[dayIndex].meals
|
||||
val strDay = day.select("h3").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()
|
||||
day.select("div.row").forEachIndexed { _, meal ->
|
||||
val heading = meal.select("h4.menu-header").text()
|
||||
val parts = ArrayList(meal.select("div.menu-info").html().substringBefore("<br><span").replace("\n", "").split("<br>"))
|
||||
val additives = meal.select("span.show-with-allergenes").text()
|
||||
parts.removeIf { x -> x.isEmpty() || x.isBlank() }
|
||||
|
||||
meals.add(Meal(strDay, heading, parts, additives))
|
||||
mealWeekList.days[dayIndex].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)
|
||||
@ -93,7 +87,8 @@ class MensaParser {
|
||||
*/
|
||||
fun getMenuLinkNextWeek(mensaMenuURL: String): String {
|
||||
val menuHTML = Jsoup.connect(mensaMenuURL).get()
|
||||
return "https://www.swfr.de" + menuHTML.select("div.section-mensa").select("a.next-week").attr("href")
|
||||
|
||||
return "https://www.swfr.de" + menuHTML.select("#speiseplan-tabs").select("a.next-week").attr("href")
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,86 +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.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"
|
||||
}
|
||||
@ -27,8 +27,7 @@ import kotlinx.coroutines.sync.Semaphore
|
||||
import org.jsoup.Jsoup
|
||||
import org.jsoup.nodes.Document
|
||||
import org.mosad.thecitadelofricks.CalendarWeek
|
||||
import org.mosad.thecitadelofricks.LessonWithCourse
|
||||
import org.mosad.thecitadelofricks.LessonWithRoom
|
||||
import org.mosad.thecitadelofricks.Lesson
|
||||
import org.mosad.thecitadelofricks.TimetableWeek
|
||||
import org.slf4j.LoggerFactory
|
||||
|
||||
@ -36,13 +35,10 @@ import org.slf4j.LoggerFactory
|
||||
* @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) {
|
||||
class TimetableParser(timetableURL: String? = null, htmlDoc: Document? = null) {
|
||||
private var logger: org.slf4j.Logger = LoggerFactory.getLogger(TimetableParser::class.java)
|
||||
private val days = arrayOf("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday")
|
||||
|
||||
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)
|
||||
}
|
||||
@ -67,13 +63,13 @@ sealed class TimetableParser<Lesson>(timetableURL: String? = null, htmlDoc: Docu
|
||||
* 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>()
|
||||
fun parseTimeTable(): TimetableWeek? = htmlDoc?.let {
|
||||
val timetableWeek = TimetableWeek()
|
||||
val rows = it.select("table.timetable").select("tr[scope=\"row\"]")
|
||||
|
||||
var sDay = -1
|
||||
var sRow = -1
|
||||
var sLesson = constructLesson("", "", "", "", "")
|
||||
var sLesson = Lesson("", "", "", "", "")
|
||||
|
||||
// get each row with index, reflects 1 timeslot per day
|
||||
for ((rowIndex, row) in rows.withIndex()) {
|
||||
@ -90,11 +86,11 @@ sealed class TimetableParser<Lesson>(timetableURL: String? = null, htmlDoc: Docu
|
||||
|
||||
// adjust the following slot
|
||||
sDay++
|
||||
sLesson = constructLesson(
|
||||
sLesson = Lesson(
|
||||
"$day.$rowIndex.$lessonIndexDay",
|
||||
element.select("div.lesson-subject").text(),
|
||||
element.select("div.lesson-teacher").text(),
|
||||
element.select("div.$value4Class").text(),
|
||||
element.select("div.lesson-room").text(),
|
||||
element.select("div.lesson-remark").text()
|
||||
)
|
||||
|
||||
@ -105,11 +101,11 @@ sealed class TimetableParser<Lesson>(timetableURL: String? = null, htmlDoc: Docu
|
||||
|
||||
} else {
|
||||
timetableWeek.days[day].timeslots[rowIndex].add(
|
||||
constructLesson(
|
||||
Lesson(
|
||||
"$day.$rowIndex.$lessonIndexDay",
|
||||
element.select("div.lesson-subject").text(),
|
||||
element.select("div.lesson-teacher").text(),
|
||||
element.select("div.$value4Class").text(),
|
||||
element.select("div.lesson-room").text(),
|
||||
element.select("div.lesson-remark").text()
|
||||
)
|
||||
)
|
||||
@ -150,7 +146,7 @@ sealed class TimetableParser<Lesson>(timetableURL: String? = null, htmlDoc: Docu
|
||||
* print a timetable
|
||||
* @param timetable the timetable to print
|
||||
*/
|
||||
fun printTimetableWeek(timetable: TimetableWeek<LessonWithRoom>) {
|
||||
fun printTimetableWeek(timetable: TimetableWeek) {
|
||||
for (j in 0..5) print(days[j].padEnd(75, ' ') + " | ")
|
||||
println()
|
||||
for (j in 0..5) print("-".padEnd(76 + (j.toFloat().div(j).toInt()), '-') + "+")
|
||||
@ -194,17 +190,3 @@ sealed class TimetableParser<Lesson>(timetableURL: String? = null, htmlDoc: Docu
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
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"
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test
|
||||
import java.io.File
|
||||
|
||||
internal class MensaParserTest {
|
||||
private val mensaMenuURL = "https://www.swfr.de/essen/mensen-cafes-speiseplaene/mensa-offenburg"
|
||||
private val mensaMenuURL = "https://www.swfr.de/essen-trinken/speiseplaene/mensa-offenburg/"
|
||||
|
||||
@Test
|
||||
fun parseMensaMenuNormalWeek() {
|
||||
|
||||
@ -34,7 +34,7 @@ class TimetableParserTest {
|
||||
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 = CourseTimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
|
||||
val actualTimetable = TimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
|
||||
val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_normal-week.txt").readText().trim()
|
||||
|
||||
Assertions.assertEquals(expectedTimetable, actualTimetable)
|
||||
@ -44,7 +44,7 @@ class TimetableParserTest {
|
||||
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 = CourseTimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
|
||||
val actualTimetable = TimetableParser(htmlDoc = htmlDoc).parseTimeTable().toString().trim()
|
||||
val expectedTimetable = TimetableParserTest::class.java.getResource("/expected/Timetable_empty-week.txt").readText().trim()
|
||||
|
||||
Assertions.assertEquals(expectedTimetable, actualTimetable)
|
||||
@ -54,7 +54,7 @@ class TimetableParserTest {
|
||||
fun parseCalendarWeek() {
|
||||
val htmlFile = File(TimetableParserTest::class.java.getResource("/html/Timetable_normal-week.html").path)
|
||||
val htmlDoc = Jsoup.parse(htmlFile, "UTF-8", "https://www.hs-offenburg.de/")
|
||||
val actualCalendarWeek = CourseTimetableParser(htmlDoc = htmlDoc).parseCalendarWeek()
|
||||
val actualCalendarWeek = TimetableParser(htmlDoc = htmlDoc).parseCalendarWeek()
|
||||
|
||||
Assertions.assertEquals(CalendarWeek(42, 2019), actualCalendarWeek)
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
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=[])])
|
||||
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=[])])
|
||||
@ -1 +1 @@
|
||||
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=[])])
|
||||
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=[])])
|
||||
@ -1 +1 @@
|
||||
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=)]])])
|
||||
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=)]])])
|
||||
|
||||
@ -1,11 +1,71 @@
|
||||
<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 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&tx_swfrspeiseplan_pi1%5Baction%5D=show&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&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&tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&tx_swfrspeiseplan_pi1%5Bcolored%5D=1&tx_swfrspeiseplan_pi1%5Bort%5D=651&tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&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&tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&tx_swfrspeiseplan_pi1%5Bcolored%5D=0&tx_swfrspeiseplan_pi1%5Bort%5D=651&tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&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&tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&tx_swfrspeiseplan_pi1%5Bcolored%5D=1&tx_swfrspeiseplan_pi1%5Bort%5D=651&tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&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&tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&tx_swfrspeiseplan_pi1%5Bcolored%5D=0&tx_swfrspeiseplan_pi1%5Bort%5D=651&tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&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>
|
||||
@ -14,15 +74,9 @@
|
||||
<h4>heute keine Essensausgabe</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="tab-tue" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-tue" x-show="currentDay == 2">
|
||||
<h3>Dienstag 27.12.</h3>
|
||||
|
||||
|
||||
|
||||
|
||||
<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>
|
||||
@ -31,15 +85,9 @@
|
||||
<h4>heute keine Essensausgabe</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="tab-wed" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-wed" x-show="currentDay == 3">
|
||||
<h3>Mittwoch 28.12.</h3>
|
||||
|
||||
|
||||
|
||||
|
||||
<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>
|
||||
@ -48,15 +96,9 @@
|
||||
<h4>heute keine Essensausgabe</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="tab-thu" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-thu" x-show="currentDay == 4">
|
||||
<h3>Donnerstag 29.12.</h3>
|
||||
|
||||
|
||||
|
||||
|
||||
<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>
|
||||
@ -65,15 +107,9 @@
|
||||
<h4>heute keine Essensausgabe</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="tab-fri" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-fri" x-show="currentDay == 5">
|
||||
<h3>Freitag 30.12.</h3>
|
||||
|
||||
|
||||
|
||||
|
||||
<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>
|
||||
@ -82,15 +118,9 @@
|
||||
<h4>heute keine Essensausgabe</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="tab-sat" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-sat" x-show="currentDay == 6">
|
||||
<h3>Samstag 31.12.</h3>
|
||||
|
||||
|
||||
|
||||
|
||||
<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>
|
||||
@ -99,7 +129,6 @@
|
||||
<h4>heute keine Essensausgabe</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@ -1,467 +1,513 @@
|
||||
<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 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 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 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 id="tab-fri" class="menu-tagesplan" role="tabpanel" aria-labelledby="label-fri" x-show="currentDay == 5">
|
||||
<h3>Freitag 23.12.</h3>
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="speiseplan-tabs">
|
||||
<div id="tab-menu-container" class="row">
|
||||
<div class="col-md-1 col-xs-6">
|
||||
<a class="prev-week" title="eine Woche zurück" href="/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=0&tx_swfrspeiseplan_pi1%5Baction%5D=show&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&cHash=ad074b11cc01a680e4c0d0675dd1f91c"><img src="/fileadmin/templates/images/keil-grau-links.png" width="16" height="16" alt="" /><span class="d-inline d-sm-none">vorherige Woche</span></a>
|
||||
</div>
|
||||
<div class="col-md-10">
|
||||
<ul class="nav classic-tabs tabs-primary" role="tablist">
|
||||
<li class="col-md-2"><a href="#tab-mon" class="nav-link" data-toggle="tab" role="tab">Mo 09.03.</a></li>
|
||||
<li class="col-md-2"><a href="#tab-tue" class="nav-link active show" data-toggle="tab" role="tab">Di 10.03.</a></li>
|
||||
<li class="col-md-2"><a href="#tab-wed" class="nav-link" data-toggle="tab" role="tab">Mi 11.03.</a></li>
|
||||
<li class="col-md-2"><a href="#tab-thu" class="nav-link" data-toggle="tab" role="tab">Do 12.03.</a></li>
|
||||
<li class="col-md-2"><a href="#tab-fri" class="nav-link" data-toggle="tab" role="tab">Fr 13.03.</a></li>
|
||||
<li class="col-md-2"><a href="#tab-sat" class="nav-link" data-toggle="tab" role="tab">Sa 14.03.</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-md-1 col-xs-6 pull-right"><a class="next-week text-right" title="eine Woche weiter" href="/essen-trinken/speiseplaene/mensa-offenburg/?tx_swfrspeiseplan_pi1%5BweekToShow%5D=2&tx_swfrspeiseplan_pi1%5Baction%5D=show&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&cHash=3c3048ebdd7f42a104bd780a0a6a0fd1"><span class="d-inline d-sm-none">nächste Woche</span><img src="/fileadmin/templates/images/keil-grau-rechts.png" width="16" height="16" alt="" /></a></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-4">
|
||||
<table class="table legende">
|
||||
<tr>
|
||||
<td class="vegetarisch legend"></td>
|
||||
<td class="legend-info">vegetarisch</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="vegan legend"></td>
|
||||
<td class="legend-info">vegan</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="wunsch-vegan legend"></td>
|
||||
<td class="legend-info">auf Wunsch vegan</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-sm-4 pt-3">
|
||||
<div class="hide-with-allergenes">
|
||||
<p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/essen-trinken/speiseplaene/mensa-offenburg/?type=99&tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&tx_swfrspeiseplan_pi1%5Bcolored%5D=1&tx_swfrspeiseplan_pi1%5Bort%5D=651&tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&cHash=4de091579c564e42f79473da2701f179"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
|
||||
<p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/essen-trinken/speiseplaene/mensa-offenburg/?type=99&tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&tx_swfrspeiseplan_pi1%5Bcolored%5D=0&tx_swfrspeiseplan_pi1%5Bort%5D=651&tx_swfrspeiseplan_pi1%5Baction%5D=buildPdf&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&cHash=84edf4562bdc95f103b70ef99e4d7af6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
|
||||
</div>
|
||||
<div class="show-with-allergenes">
|
||||
<p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in Farbe herunterladen" target="_blank" href="/essen-trinken/speiseplaene/mensa-offenburg/?type=99&tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&tx_swfrspeiseplan_pi1%5Bcolored%5D=1&tx_swfrspeiseplan_pi1%5Bort%5D=651&tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&cHash=51f0f1e0083f9ef48038920dfb676eb6"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan farbig</a></p>
|
||||
<p><a download="Mensa_Offenburg_KW_11-2020.pdf" title="Wochenplan in schwarz-weiß herunterladen" target="_blank" href="/essen-trinken/speiseplaene/mensa-offenburg/?type=99&tx_swfrspeiseplan_pi1%5BweekToShow%5D=1&tx_swfrspeiseplan_pi1%5Bcolored%5D=0&tx_swfrspeiseplan_pi1%5Bort%5D=651&tx_swfrspeiseplan_pi1%5Baction%5D=buildPdfAllergenes&tx_swfrspeiseplan_pi1%5Bcontroller%5D=Speiseplan&cHash=c3a9d1eafce78d8f8d281c6060be989c"><i class="fas fa-file-download" aria-hidden="true"></i> Wochenplan s/w</a></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4 pt-3">
|
||||
<p class="hide-with-allergenes"><a href="#" data-toggle="modal" data-target="#allergenesModal"><i class="fas fa-redo-alt"></i> Allergiehinweise anzeigen</a></p>
|
||||
<p class="show-with-allergenes"><a href="#" class="btn-hide-allergenes"><i class="fas fa-undo-alt"></i> Allergiehinweise verbergen</a></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tab-content">
|
||||
<div id="tab-mon" class="menu-tagesplan tab-pane fade">
|
||||
<h3>Montag 09.03.</h3>
|
||||
<div class="row vegetarisch mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Kartoffel-Frischkäsebratling
|
||||
<br>Gemüseragout Toskana
|
||||
<br>Beilagensalat
|
||||
<br><span class="zusatzsstoffe show-with-allergenes">enthält Allergene: Se,Gl,GlW,ML</span></div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>3,05 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>4,00 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>5,40 €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row grey lighten-4 mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Schweineschnitzel Wiener Art
|
||||
<br>Bratensauce
|
||||
<br>Pommes frites
|
||||
<br>Mixsalat
|
||||
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch<br>enthält Allergene: Gl,GlW,GlG</span></div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>3,05 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>4,00 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>5,40 €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row grey lighten-4 mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Grill und Salatbar
|
||||
<br>Asiatisches aus dem Wok
|
||||
<br>Fleisch- und Fischspezialitäten
|
||||
<br>Pasta-, Reis und Kartoffelvariationen
|
||||
<br>Gemüse
|
||||
<br>
|
||||
</div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>0,90 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>1,10 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>1,30 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tab-tue" class="menu-tagesplan tab-pane fade in show active">
|
||||
<h3>Dienstag 10.03.</h3>
|
||||
<div class="row wunsch-vegan mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Tortellini mit Gemüsefüllung
|
||||
<br>Tomatensauce
|
||||
<br>Geriebener Hartkäse
|
||||
<br>Beilagensalat
|
||||
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 6</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 6<br>enthält Allergene: Ei,Se,Gl,GlW,ML</span></div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>3,05 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>4,00 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>5,40 €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row grey lighten-4 mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Frikadelle
|
||||
<br>Champignon-Rahmsauce
|
||||
<br>Bauernspätzle
|
||||
<br>Blattsalat
|
||||
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,ri</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,ri<br>enthält Allergene: Ei,Gl,GlW,GlG,ML</span></div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>3,05 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>4,00 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>5,40 €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row grey lighten-4 mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Grill und Salatbar
|
||||
<br>Asiatisches aus dem Wok
|
||||
<br>Fleisch- und Fischspezialitäten
|
||||
<br>Pasta-, Reis und Kartoffelvariationen
|
||||
<br>Gemüse
|
||||
<br>
|
||||
</div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>0,90 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>1,10 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>1,30 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tab-wed" class="menu-tagesplan tab-pane fade">
|
||||
<h3>Mittwoch 11.03.</h3>
|
||||
<div class="row wunsch-vegan mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Gebratener Gemüsereis Nasi Goreng
|
||||
<br>Raita
|
||||
<br>Mixsalat
|
||||
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5<br>enthält Allergene: So,Sn,Se,Gl,GlW,ML</span></div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>3,05 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>4,00 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>5,40 €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row grey lighten-4 mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Kalbsbratwurst
|
||||
<br>Bratensauce
|
||||
<br>Kartoffelbrei
|
||||
<br>Apfelrotkraut
|
||||
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,5,6,8,ri</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: sch,5,6,8,ri<br>enthält Allergene: Sn,Se,Sf,Gl,GlW,GlG,ML</span></div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>3,05 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>4,00 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>5,40 €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row grey lighten-4 mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Grill und Salatbar
|
||||
<br>Asiatisches aus dem Wok
|
||||
<br>Fleisch- und Fischspezialitäten
|
||||
<br>Pasta-, Reis und Kartoffelvariationen
|
||||
<br>Gemüse
|
||||
<br>
|
||||
</div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>0,90 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>1,10 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>1,30 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tab-thu" class="menu-tagesplan tab-pane fade">
|
||||
<h3>Donnerstag 12.03.</h3>
|
||||
<div class="row vegetarisch mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Spaghetti
|
||||
<br>Chinagemüse
|
||||
<br>Sauce süß-sauer
|
||||
<br>Geriebener Hartkäse
|
||||
<br>Mixsalat
|
||||
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5,6</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5,6<br>enthält Allergene: Ei,Sn,Se,Sf,Gl,GlW,GlG,ML</span></div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>3,05 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>4,00 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>5,40 €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row grey lighten-4 mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Paniertes Seelachsfilet
|
||||
<br>Sesam-Mayonnaise
|
||||
<br>Salzkartoffeln
|
||||
<br>Karottenmix mit Brokkoli und Bohnen
|
||||
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: nF</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: nF<br>enthält Allergene: Ei,Sn,Fi,Sa,Gl,GlW</span></div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>3,05 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>4,00 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>5,40 €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row grey lighten-4 mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Grill und Salatbar
|
||||
<br>Asiatisches aus dem Wok
|
||||
<br>Fleisch- und Fischspezialitäten
|
||||
<br>Pasta-, Reis und Kartoffelvariationen
|
||||
<br>Gemüse
|
||||
<br>
|
||||
</div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>0,90 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>1,10 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>1,30 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tab-fri" class="menu-tagesplan tab-pane fade">
|
||||
<h3>Freitag 13.03.</h3>
|
||||
<div class="row vegetarisch mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Essen 1</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Kartoffel-Gorgonzolagratin
|
||||
<br>Brokkoligemüse
|
||||
<br>Beilagensalat
|
||||
<br><span class="zusatzsstoffe show-with-allergenes">enthält Allergene: ML</span></div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>3,05 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>4,00 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>5,40 €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row grey lighten-4 mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Essen 2</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Hähnchenbrustfilet
|
||||
<br>Apfel-Rahmsauce
|
||||
<br>Mandelreis
|
||||
<br>Karottengemüse
|
||||
<br><span class="zusatzsstoffe hide-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5</span><span class="zusatzsstoffe show-with-allergenes">Kennzeichnungen/Zusatzstoffe: 5<br>enthält Allergene: Gl,GlW,GlG,Nu,NM,ML</span></div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>3,05 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>4,00 €</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>5,40 €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row grey lighten-4 mb-2">
|
||||
<h4 class="col-md-3 col-sm-3 menu-header">Buffet</h4>
|
||||
<div class="col-md-5 col-sm-5 menu-info {f:if(condition: menu.vegan, then: , else: 'bg-beige-hell')} ">
|
||||
Grill und Salatbar
|
||||
<br>Asiatisches aus dem Wok
|
||||
<br>Fleisch- und Fischspezialitäten
|
||||
<br>Pasta-, Reis und Kartoffelvariationen
|
||||
<br>Gemüse
|
||||
<br>
|
||||
</div>
|
||||
<div class="col-md-4 col-sm-4 menu-price">
|
||||
<table class="table-sm">
|
||||
<tr>
|
||||
<td class="price-studierende">Studierende, Schüler</td>
|
||||
<td>0,90 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-mitarbeiter">Mitarbeiter</td>
|
||||
<td>1,10 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="price-gaeste">Gäste</td>
|
||||
<td>1,30 €<span class="tara"> / 100g</span></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tab-sat" class="menu-tagesplan tab-pane fade">
|
||||
<h3>Samstag 14.03.</h3>
|
||||
<div class="row row-narrow row-buffer row-table">
|
||||
<div class="col-md-1 bg-beige-hell zusatzangaben">
|
||||
<i class="glyphicons glyphicons-circle-info"></i>
|
||||
</div>
|
||||
<div class="col-md-1 bg-beige-hell zusatzangaben"><i class="glyphicons glyphicons-circle-info"></i></div>
|
||||
<div class="col-md-11 border-beige-hell">
|
||||
<h4>heute keine Essensausgabe</h4>
|
||||
<h4>heute keine Essensausgabe</h4></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div 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 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">×</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>
|
||||
Loading…
Reference in New Issue
Block a user