From e19e1cbffd49a131684baa9b27ec0051a31c33a3 Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Thu, 14 Mar 2019 11:15:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs index 49d4e07..5fc2219 100644 --- a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs +++ b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs @@ -55,12 +55,17 @@ namespace JiraTimeBotForm.TaskTime } } + int remainMinutes = settings.MinuterPerWorkDay; + float fifteenMinIntervals = settings.MinuterPerWorkDay / 15; + float intervalPerCommit = fifteenMinIntervals / workTasks.Count; + //Нам нужно раскидать 480 минут в день. var workTimeItems = new List(); foreach (var taskGroup in workTasks.GroupBy(f=>f)) { - var minutesPerTime = settings.MinuterPerWorkDay / workTasks.Count; - var minutesForCurrentTaskGroup = minutesPerTime * taskGroup.Count(); + int currentIntervalsCount = (int)(intervalPerCommit * taskGroup.Count()); + var minutesForCurrentTaskGroup = currentIntervalsCount * 15; + remainMinutes = remainMinutes - minutesForCurrentTaskGroup; workTimeItems.Add(new TaskTimeItem { @@ -70,6 +75,11 @@ namespace JiraTimeBotForm.TaskTime }); } + if (workTimeItems.Any()) + { + workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes); + } + return workTimeItems; } }