ComputerSurge/vikunja
3
0
Fork 0
Code Issues 1 Pull Requests 10 Activity

fix: task overdue at the same time as the notification

Browse Source 
If a task is overdue at the same time the notification is sent, it would contain a message like "overdue since" without a time. This now shows "overdue now" instead.
This commit is contained in:
kolaente
2024-12-03 08:26:23 +01:00
parent e57f04ec23
commit 8d8406df05
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/models/notifications.go
View File

@@ -207,6 +207,15 @@ func (n *TeamMemberAddedNotification) Name() string {
return "team.member.added" return "team.member.added"
} }
func getOverdueSinceString(until time.Duration) (overdueSince string) {
overdueSince = `overdue since ` + utils.HumanizeDuration(until)
if until == 0 {
overdueSince = `overdue now`
}
return
}
// UndoneTaskOverdueNotification represents a UndoneTaskOverdueNotification notification // UndoneTaskOverdueNotification represents a UndoneTaskOverdueNotification notification
type UndoneTaskOverdueNotification struct { type UndoneTaskOverdueNotification struct {
User *user.User User *user.User
@@ -220,7 +229,7 @@ func (n *UndoneTaskOverdueNotification) ToMail() *notifications.Mail {
return notifications.NewMail(). return notifications.NewMail().
Subject(`Task "`+n.Task.Title+`" (`+n.Project.Title+`) is overdue`). Subject(`Task "`+n.Task.Title+`" (`+n.Project.Title+`) is overdue`).
Greeting("Hi "+n.User.GetName()+","). Greeting("Hi "+n.User.GetName()+",").
Line(`This is a friendly reminder of the task "`+n.Task.Title+`" (`+n.Project.Title+`) which is overdue since `+utils.HumanizeDuration(until)+` and not yet done.`). Line(`This is a friendly reminder of the task "`+n.Task.Title+`" (`+n.Project.Title+`) which is `+getOverdueSinceString(until)+` and not yet done.`).
Action("Open Task", config.ServicePublicURL.GetString()+"tasks/"+strconv.FormatInt(n.Task.ID, 10)). Action("Open Task", config.ServicePublicURL.GetString()+"tasks/"+strconv.FormatInt(n.Task.ID, 10)).
Line("Have a nice day!") Line("Have a nice day!")
} }
@@ -257,7 +266,7 @@ func (n *UndoneTasksOverdueNotification) ToMail() *notifications.Mail {
overdueLine := "" overdueLine := ""
for _, task := range sortedTasks { for _, task := range sortedTasks {
until := time.Until(task.DueDate).Round(1*time.Hour) * -1 until := time.Until(task.DueDate).Round(1*time.Hour) * -1
overdueLine += `* [` + task.Title + `](` + config.ServicePublicURL.GetString() + "tasks/" + strconv.FormatInt(task.ID, 10) + `) (` + n.Projects[task.ProjectID].Title + `), overdue since ` + utils.HumanizeDuration(until) + "\n" overdueLine += `* [` + task.Title + `](` + config.ServicePublicURL.GetString() + "tasks/" + strconv.FormatInt(task.ID, 10) + `) (` + n.Projects[task.ProjectID].Title + `), ` + getOverdueSinceString(until) + "\n"
} }
return notifications.NewMail(). return notifications.NewMail().