From 2116336723bd52e42ee37d8ce51ac3f3768432c8 Mon Sep 17 00:00:00 2001
From: Danil Kislov <Kislov@aeroclub.ru>
Date: Thu, 14 Mar 2019 11:48:27 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BC=D0=B5=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskTime/TaskTimeDiscoverer.cs            | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs
index 5fc2219..0328147 100644
--- a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs
+++ b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs
@@ -54,33 +54,42 @@ namespace JiraTimeBotForm.TaskTime
                     Application.DoEvents();
                 }
             }
+            if (!workTasks.Any())
+            {
+                return new List<TaskTimeItem>();
+            }
 
             int remainMinutes = settings.MinuterPerWorkDay;
-            float fifteenMinIntervals = settings.MinuterPerWorkDay / 15;
-            float intervalPerCommit = fifteenMinIntervals / workTasks.Count;
 
             //Нам нужно раскидать 480 минут в день.
             var workTimeItems = new List<TaskTimeItem>();
             foreach (var taskGroup in workTasks.GroupBy(f=>f))
             {
-                int currentIntervalsCount = (int)(intervalPerCommit * taskGroup.Count());
-                var minutesForCurrentTaskGroup = currentIntervalsCount  * 15;
-                remainMinutes = remainMinutes - minutesForCurrentTaskGroup;
+                int currentTaskCommits = taskGroup.Count();
+                int currentTaskTime = (int)RoundTo15(settings.MinuterPerWorkDay / workTasks.Count * currentTaskCommits);
+                remainMinutes = remainMinutes - currentTaskTime;
 
                 workTimeItems.Add(new TaskTimeItem
                 {
                     Branch = taskGroup.Key,
-                    Time = TimeSpan.FromMinutes(minutesForCurrentTaskGroup),
+                    Time = TimeSpan.FromMinutes(currentTaskTime),
                     Commits = taskGroup.Count(),
                 });
             }
-
-            if (workTimeItems.Any())
-            {
-                workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
-            }
+            workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
 
             return workTimeItems;
         }
+
+        private decimal RoundTo15(decimal value, bool up = true)
+        {
+            if ((value % 15) == 0)
+                return value;
+            if (up)
+                return (value - (value % 15) + 15);
+
+            return (value - (value % 15));
+        }
+
     }
 }