From 13df0f1c206773492b7c4643234f5c2cc01964a6 Mon Sep 17 00:00:00 2001 From: survellow <59056368+survellow@users.noreply.github.com> Date: Wed, 25 Oct 2023 18:51:55 +0200 Subject: [PATCH] feat:#11 fix docker and event type in notes --- backend/Dockerfile | 2 +- backend/service/db/dbEvents.go | 2 -- backend/service/ical/icalFileGeneration.go | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 77f2aca..67a9d42 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.5-alpine +FROM golang:1.21.3-alpine # Set the Current Working Directory inside the container WORKDIR /app diff --git a/backend/service/db/dbEvents.go b/backend/service/db/dbEvents.go index 77de78f..5789e39 100644 --- a/backend/service/db/dbEvents.go +++ b/backend/service/db/dbEvents.go @@ -3,8 +3,6 @@ package db import ( "htwkalender/model" - "htwkalender/model" - "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase" ) diff --git a/backend/service/ical/icalFileGeneration.go b/backend/service/ical/icalFileGeneration.go index 9f202e2..775f909 100644 --- a/backend/service/ical/icalFileGeneration.go +++ b/backend/service/ical/icalFileGeneration.go @@ -35,7 +35,7 @@ func (icalModel IcalModel) EmitICal() goics.Componenter { s.AddProperty(k, v) k, v = goics.FormatDateTime("DTSTART;TZID=Europe/Berlin", timeStart) s.AddProperty(k, v) - s.AddProperty("SUMMARY", replaceNameIfUserDefined(event, icalModel.Mapping)) + s.AddProperty("SUMMARY", replaceNameIfUserDefined(&event, icalModel.Mapping)) s.AddProperty("DESCRIPTION", generateDescription(event)) s.AddProperty("LOCATION", event.Rooms) c.AddComponent(s) @@ -65,7 +65,7 @@ func generateDescription(event model.Event) string { description += "Gruppe: " + event.Course + "\n" } if !functions.OnlyWhitespace(event.EventType) { - description += "Typ: " + event.EventType + "\n" + description += "Typ: " + event.EventType + event.Compulsory + "\n" } return description