HTWK/htwkalender
1
1
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git synced 2025-08-03 02:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat:#11 fix docker and event type in notes

Browse Source
This commit is contained in:
survellow
2023-10-25 18:51:55 +02:00
parent 51938b48c8
commit 13df0f1c20
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM golang:1.20.5-alpine FROM golang:1.21.3-alpine
# Set the Current Working Directory inside the container # Set the Current Working Directory inside the container
WORKDIR /app WORKDIR /app

2
backend/service/db/dbEvents.go
View File

@@ -3,8 +3,6 @@ package db
import ( import (
"htwkalender/model" "htwkalender/model"
"htwkalender/model"
"github.com/pocketbase/dbx" "github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase"
) )

4
backend/service/ical/icalFileGeneration.go
View File

@@ -35,7 +35,7 @@ func (icalModel IcalModel) EmitICal() goics.Componenter {
s.AddProperty(k, v) s.AddProperty(k, v)
k, v = goics.FormatDateTime("DTSTART;TZID=Europe/Berlin", timeStart) k, v = goics.FormatDateTime("DTSTART;TZID=Europe/Berlin", timeStart)
s.AddProperty(k, v) 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("DESCRIPTION", generateDescription(event))
s.AddProperty("LOCATION", event.Rooms) s.AddProperty("LOCATION", event.Rooms)
c.AddComponent(s) c.AddComponent(s)
@@ -65,7 +65,7 @@ func generateDescription(event model.Event) string {
description += "Gruppe: " + event.Course + "\n" description += "Gruppe: " + event.Course + "\n"
} }
if !functions.OnlyWhitespace(event.EventType) { if !functions.OnlyWhitespace(event.EventType) {
description += "Typ: " + event.EventType + "\n" description += "Typ: " + event.EventType + event.Compulsory + "\n"
} }
return description return description