clean up task modal and add non-segmented progress bars.
continuous-integration/drone/push Build is passing

This commit is contained in:
2021-01-10 13:11:52 +01:00
parent ad34116598
commit 98c7a66fd0
13 changed files with 186 additions and 246 deletions
+18
View File
@@ -329,6 +329,7 @@ func (l *Loader) FindTask(ctx context.Context, id string) (*models.TaskResult, e
result := &models.TaskResult{Task: *task}
result.Item, _ = l.DB.Items().Find(ctx, task.ItemID)
result.Project, _ = l.DB.Projects().Find(ctx, task.ProjectID)
result.Logs, err = l.DB.Logs().List(ctx, models.LogFilter{
UserID: task.UserID,
IDs: []string{task.ID},
@@ -354,9 +355,11 @@ func (l *Loader) ListTasks(ctx context.Context, filter models.TaskFilter) ([]*mo
taskIDs := make([]string, 0, len(tasks))
itemIDs := stringset.New()
projectIDs := stringset.New()
for _, task := range tasks {
taskIDs = append(taskIDs, task.ID)
itemIDs.Add(task.ItemID)
projectIDs.Add(task.ProjectID)
}
logs, err := l.DB.Logs().List(ctx, models.LogFilter{
@@ -375,6 +378,14 @@ func (l *Loader) ListTasks(ctx context.Context, filter models.TaskFilter) ([]*mo
return nil, err
}
projects, err := l.DB.Projects().List(ctx, models.ProjectFilter{
UserID: auth.UserID(ctx),
IDs: projectIDs.Strings(),
})
if err != nil {
return nil, err
}
results := make([]*models.TaskResult, 0, len(tasks))
for _, task := range tasks {
result := &models.TaskResult{
@@ -395,6 +406,13 @@ func (l *Loader) ListTasks(ctx context.Context, filter models.TaskFilter) ([]*mo
}
}
for _, project := range projects {
if project.ID == task.ProjectID {
result.Project = project
break
}
}
result.CompletedAmount = len(result.Logs)
results = append(results, result)