fix task sorting and individual task deadline issues on front page.

2021-12-04 12:00:12 +01:00
parent 27c2c85b89
commit 531ae46f5b
11 changed files with 164 additions and 12 deletions
@@ -41,7 +41,21 @@ func (r *taskRepository) ListWithLinks(ctx context.Context, filter models.TaskFi
 	sq := squirrel.Select("task.*", "tl.project_id as tl_project_id", "p.icon").From("task").PlaceholderFormat(squirrel.Dollar)
 	sq = sq.Where(squirrel.Eq{"task.user_id": filter.UserID})
 	if filter.Active != nil {
-		sq = sq.Where(squirrel.Eq{"task.active": *filter.Active})
+		if *filter.Active {
+			sq = sq.Where(squirrel.Or{
+				squirrel.Eq{"task.active": true},
+				squirrel.Eq{"task.status_tag": []string{
+					"on hold", "to do",
+				}},
+			})
+		} else {
+			sq = sq.Where(squirrel.And{
+				squirrel.Eq{"task.active": false},
+				squirrel.Eq{"task.status_tag": []string{
+					"failed", "completed", "declined",
+				}},
+			})
+		}
 	}
 	if filter.Expiring != nil {
 		if *filter.Expiring {