Учитываем время на релизы.
This commit is contained in:
@@ -44,7 +44,8 @@ namespace JiraTimeBot.TaskTime
|
|||||||
Commits = taskGroup.Sum(f=>f.Commits),
|
Commits = taskGroup.Sum(f=>f.Commits),
|
||||||
Description = sb.ToString(),
|
Description = sb.ToString(),
|
||||||
StartTime = taskGroup.Min(f=>f.StartTime),
|
StartTime = taskGroup.Min(f=>f.StartTime),
|
||||||
FilesAffected = taskGroup.Sum(f=>f.FilesAffected)
|
FilesAffected = taskGroup.Sum(f=>f.FilesAffected),
|
||||||
|
Type = taskGroup.First().Type
|
||||||
};
|
};
|
||||||
|
|
||||||
newList.Add(taskTimeItem);
|
newList.Add(taskTimeItem);
|
||||||
|
|||||||
@@ -23,11 +23,19 @@ namespace JiraTimeBot.TasksProcessors
|
|||||||
{
|
{
|
||||||
_log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");
|
_log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");
|
||||||
|
|
||||||
foreach (var taskTime in taskTimes.OrderByDescending(f => f.TimeSpent))
|
foreach (var taskTime in taskTimes.Where(f=>f.Type == CommitType.Task).OrderByDescending(f => f.TimeSpent))
|
||||||
{
|
{
|
||||||
var taskName = _jiraApi.GetTaskName(taskTime.Branch, settings);
|
var taskName = _jiraApi.GetTaskName(taskTime.Branch, settings);
|
||||||
_log.Trace($" - [{taskTime.Branch}, коммитов {taskTime.Commits}]: {taskName} - {taskTime.TimeSpent}");
|
_log.Trace($" - [{taskTime.Branch}, коммитов {taskTime.Commits}]: {taskName} - {taskTime.TimeSpent}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var releases = taskTimes.Where(f => f.Type == CommitType.Release).GroupBy(f=>f.Description);
|
||||||
|
foreach (var release in releases)
|
||||||
|
{
|
||||||
|
var sum = release.Sum(f => (int) f.TimeSpent.TotalMinutes);
|
||||||
|
var description = release.First().Description.Replace(Environment.NewLine, "");
|
||||||
|
_log.Trace($" - [Release, задач {release.Count()}]: {description} - {TimeSpan.FromMinutes(sum)}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user