try to solve (Try: 005)

maxmielchen · Mar 12, 2023 · 3fb4f55 · 3fb4f55
1 parent 40a8fcc
commit 3fb4f55
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /app
 RUN mvn clean package
 
 FROM amazoncorretto:17-alpine
-ENV OFFSET="Z"
+ENV TIMEZONE="Europe/Berlin"
 ENV ROOM="Room"
 ENV TEACHER="Teacher"
 ENV SUMMARY="School"

diff --git a/app/src/main/java/com/velocitypackage/untiscalendar/app/Config.kt b/app/src/main/java/com/velocitypackage/untiscalendar/app/Config.kt
@@ -2,7 +2,7 @@ package com.velocitypackage.untiscalendar.app
 
 object Config
 {
-    var offset : String = System.getenv("OFFSET")
+    var timezone : String = System.getenv("TIMEZONE")
     var defaultRoomAlias : String = System.getenv("ROOM")
     var defaultTeacherAlias : String = System.getenv("TEACHER")
     var defaultSummary : String = System.getenv("SUMMARY")

diff --git a/app/src/main/java/com/velocitypackage/untiscalendar/app/iCalModel.kt b/app/src/main/java/com/velocitypackage/untiscalendar/app/iCalModel.kt
@@ -20,6 +20,7 @@ fun Timetable.getCalender() : Calendar
     calendar.properties.add(ProdId("-//VelocityPackage//UntisCalender 1.0//EN"))
     calendar.properties.add(Version.VERSION_2_0)
     calendar.properties.add(CalScale.GREGORIAN)
+    calendar.components.add(TimeZoneRegistryFactory.getInstance().createRegistry().getTimeZone(Config.timezone).vTimeZone)
     for (lesson in this)
     {
         if (lesson.code == UntisUtils.LessonCode.CANCELLED) continue
@@ -29,12 +30,8 @@ fun Timetable.getCalender() : Calendar
             name = lesson.subjects.longNames[0]
         } catch (_ : Exception) { }
         val event = VEvent(
-            DateTime(
-                lesson.startTime.atDate(lesson.date).toInstant(ZoneOffset.of(Config.offset)).toEpochMilli()
-            ),
-            DateTime(
-                lesson.endTime.atDate(lesson.date).toInstant(ZoneOffset.of(Config.offset)).toEpochMilli()
-            ),
+            Date(Date.from(lesson.startTime.atDate(lesson.date).atZone(ZoneId.of(Config.timezone)).toInstant())),
+            Date(Date.from(lesson.endTime.atDate(lesson.date).atZone(ZoneId.of(Config.timezone)).toInstant())),
             name
         )
         try