From c8e0782c3a248a43e6cde7b07373a18a1fc79d7a Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Thu, 27 Jun 2019 18:41:59 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20-=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85?= =?UTF-8?q?=D0=BE=D0=B4=20=D0=BD=D0=B0=20=D0=BE=D0=B4=D0=B8=D0=BD=20=D0=BA?= =?UTF-8?q?=D0=BB=D0=B0=D1=81=D1=81=20=D1=81=20=D0=B2=D1=80=D0=B5=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs b/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs index de1558b..239a1c9 100644 --- a/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs +++ b/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs @@ -18,7 +18,7 @@ namespace JiraTimeBot.TaskTime _log = log; } - private List SpreadTime(List source, int minutes, int roundToMinutes, bool up = false) + private List SpreadTime(List source, int minutes, int roundToMinutes, bool roundUp = false, bool appendTime = true) { if (source == null || !source.Any()) { @@ -32,7 +32,7 @@ namespace JiraTimeBot.TaskTime foreach (var taskGroup in source.GroupBy(f => f.Branch).OrderByDescending(f => f.Count())) { int currentTaskCommits = taskGroup.Count(); - int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, up); + int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, roundUp); remainMinutes = remainMinutes - currentTaskTime; var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray(); @@ -44,7 +44,10 @@ namespace JiraTimeBot.TaskTime var taskTimeItem = new TaskTimeItem { Branch = taskGroup.Key, - TimeSpent = TimeSpan.FromMinutes(taskGroup.Sum(f=>f.TimeSpent.TotalMinutes)) + TimeSpan.FromMinutes(currentTaskTime), + TimeSpent = appendTime ? + TimeSpan.FromMinutes(taskGroup.Sum(f=>f.TimeSpent.TotalMinutes)) + TimeSpan.FromMinutes(currentTaskTime): + TimeSpan.FromMinutes(currentTaskTime) + , Commits = taskGroup.Sum(f=>f.Commits), Description = sb.ToString(), StartTime = taskGroup.Min(f=>f.StartTime),