Skip to content

Commit 629f96d

Browse files
committed
feat: calendar component shall render time interval in start time sequence view as point instead of interval if to and from are equal
1 parent bc4fe82 commit 629f96d

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

presentation/ui/calendar/start_time_sequence.go

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,28 @@ func renderStartTimeSequence(c TCalendar, ctx core.RenderContext) core.RenderNod
7373
func startTimeSeqPill(c TCalendar, evt Event, timeOnly bool) core.View {
7474
colors := c.colors
7575

76+
isTimePoint := evt.To.At.Equal(evt.From.At)
77+
7678
var timeStr string
77-
if timeOnly {
78-
timeStr = evt.From.At.Format("15:04") + " - " + evt.To.At.Format("15:04")
79+
if isTimePoint {
80+
if timeOnly {
81+
timeStr = evt.From.At.Format("15:04")
82+
} else {
83+
if evt.To.At.Hour() == 0 && evt.To.At.Minute() == 0 && evt.From.At.Hour() == 0 && evt.To.At.Minute() == 0 {
84+
timeStr = evt.From.At.Format(xtime.GermanDate)
85+
} else {
86+
timeStr = evt.From.At.Format(xtime.GermanDateTime)
87+
}
88+
}
7989
} else {
80-
if evt.To.At.Hour() == 0 && evt.To.At.Minute() == 0 && evt.From.At.Hour() == 0 && evt.To.At.Minute() == 0 {
81-
timeStr = evt.From.At.Format(xtime.GermanDate) + " - " + evt.To.At.Format(xtime.GermanDate)
90+
if timeOnly {
91+
timeStr = evt.From.At.Format("15:04") + " - " + evt.To.At.Format("15:04")
8292
} else {
83-
timeStr = evt.From.At.Format(xtime.GermanDateTime) + " - " + evt.To.At.Format(xtime.GermanDateTime)
93+
if evt.To.At.Hour() == 0 && evt.To.At.Minute() == 0 && evt.From.At.Hour() == 0 && evt.To.At.Minute() == 0 {
94+
timeStr = evt.From.At.Format(xtime.GermanDate) + " - " + evt.To.At.Format(xtime.GermanDate)
95+
} else {
96+
timeStr = evt.From.At.Format(xtime.GermanDateTime) + " - " + evt.To.At.Format(xtime.GermanDateTime)
97+
}
8498
}
8599
}
86100

0 commit comments

Comments
 (0)