taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Better calendar event collision detection

Browse Source
This commit is contained in:
Chris Cummer 2018-04-19 09:58:26 -07:00
parent 6fab7c0668
commit e90b62e2e5
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gcal/widget.go
View File

@ -51,7 +51,7 @@ func (widget *Widget) contentFrom(events *calendar.Events) string {
str := "" str := ""
for _, event := range events.Items { for _, event := range events.Items {
conflict := widget.hasConflict(event, events) conflict := widget.conflicts(event, events)
str = str + fmt.Sprintf( str = str + fmt.Sprintf(
"%s [%s]%s[white]\n [%s]%s %s[white]\n\n", "%s [%s]%s[white]\n [%s]%s %s[white]\n\n",
@ -124,9 +124,8 @@ func (widget *Widget) eventIsNow(event *calendar.Event) bool {
return time.Now().After(startTime) && time.Now().Before(endTime) return time.Now().After(startTime) && time.Now().Before(endTime)
} }
// hasConflict returns TRUE if this event conflicts with another, FALSE if it does not // conflicts returns TRUE if this event conflicts with another, FALSE if it does not
// Very basic implementation. Should really operate on ranges func (widget *Widget) conflicts(event *calendar.Event, events *calendar.Events) bool {
func (widget *Widget) hasConflict(event *calendar.Event, events *calendar.Events) bool {
conflict := false conflict := false
for _, otherEvent := range events.Items { for _, otherEvent := range events.Items {
@ -134,7 +133,13 @@ func (widget *Widget) hasConflict(event *calendar.Event, events *calendar.Events
continue continue
} }
if event.Start.DateTime == otherEvent.Start.DateTime { eventStart, _ := time.Parse(time.RFC3339, event.Start.DateTime)
eventEnd, _ := time.Parse(time.RFC3339, event.End.DateTime)
otherEnd, _ := time.Parse(time.RFC3339, otherEvent.End.DateTime)
otherStart, _ := time.Parse(time.RFC3339, otherEvent.Start.DateTime)
if eventStart.Before(otherEnd) && eventEnd.After(otherStart) {
conflict = true conflict = true
break break
} }