Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MM-340]: Improved the handling of all day event while rendering events #439

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −7
Open

[MM-340]: Improved the handling of all day event while rendering events #439

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions calendar/engine/views/calendar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,22 @@ func MarkdownToHTMLEntities(input string) string {
}

func renderEvent(event *remote.Event, asRow bool, timeZone string) (string, error) {
link, err := url.QueryUnescape(event.Weblink)
if err != nil {
return "", err
}

subject := EnsureSubject(event.Subject)

if event.IsAllDay {
format := "(All day event) [%s](%s)"
if asRow {
format = "| All day event | [%s](%s) |"
}

return fmt.Sprintf(format, MarkdownToHTMLEntities(subject), link), nil
}

start := event.Start.In(timeZone).Time().Format(time.Kitchen)
end := event.End.In(timeZone).Time().Format(time.Kitchen)

Expand All @@ -159,13 +175,6 @@ func renderEvent(event *remote.Event, asRow bool, timeZone string) (string, erro
format = "| %s - %s | [%s](%s) |"
}

link, err := url.QueryUnescape(event.Weblink)
if err != nil {
return "", err
}

subject := EnsureSubject(event.Subject)

return fmt.Sprintf(format, start, end, MarkdownToHTMLEntities(subject), link), nil
}

Expand Down
Loading