From 3a3efbd59f916d8019918a2825900adce9ea7726 Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Fri, 13 Apr 2018 13:50:12 -0700 Subject: [PATCH] Flexible 1on1 lookup (need to move this sort of thing into Config) --- gcal/widget.go | 6 +++++- jira/widget.go | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gcal/widget.go b/gcal/widget.go index b5718954..d94a0fd6 100644 --- a/gcal/widget.go +++ b/gcal/widget.go @@ -158,11 +158,15 @@ func (widget *Widget) hasConflict(event *calendar.Event, events *calendar.Events return conflict } +func (widget *Widget) isOneOnOne(event *calendar.Event) bool { + return strings.Contains(event.Summary, "1on1") || strings.Contains(event.Summary, "1/1") +} + func (widget *Widget) titleColor(event *calendar.Event) string { ts, _ := time.Parse(time.RFC3339, event.Start.DateTime) color := "red" - if strings.Contains(event.Summary, "1on1") { + if widget.isOneOnOne(event) { color = "green" } diff --git a/jira/widget.go b/jira/widget.go index 32c8de2e..fb487893 100644 --- a/jira/widget.go +++ b/jira/widget.go @@ -18,7 +18,7 @@ type Widget struct { func NewWidget() *Widget { widget := Widget{ - TextWidget: wtf.NewTextWidget(" JIRA ", "jira"), + TextWidget: wtf.NewTextWidget("JIRA", "jira"), } widget.addView() @@ -47,10 +47,9 @@ func (widget *Widget) Refresh() { widget.View.SetWrap(false) widget.View.SetTitle( fmt.Sprintf( - " %s: [green]%s[white] (%d)", + " %s: [green]%s[white] ", widget.Name, Config.UString("wtf.mods.jira.project"), - len(searchResult.Issues), ), ) fmt.Fprintf(widget.View, "%s", widget.contentFrom(searchResult))