From f63b44169108aa7195477d912c82e638adb9e693 Mon Sep 17 00:00:00 2001
From: Danil Kislov <Kislov@aeroclub.ru>
Date: Thu, 27 Jun 2019 13:13:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BF=D0=BE=D0=B4=D1=81=D1=87=D0=B5=D1=82=20=D0=B2?=
 =?UTF-8?q?=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

---
 .semver.txt                                   |  2 +-
 src/JiraTimeBot/Properties/AssemblyInfo.cs    | 62 +++++++++----------
 .../TaskTime/TaskTimeByCommitsCalculator.cs   |  4 +-
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/.semver.txt b/.semver.txt
index 46354d7..b649b91 100644
--- a/.semver.txt
+++ b/.semver.txt
@@ -1 +1 @@
-1.0.52
+1.0.53
diff --git a/src/JiraTimeBot/Properties/AssemblyInfo.cs b/src/JiraTimeBot/Properties/AssemblyInfo.cs
index 708fcd9..6428717 100644
--- a/src/JiraTimeBot/Properties/AssemblyInfo.cs
+++ b/src/JiraTimeBot/Properties/AssemblyInfo.cs
@@ -1,31 +1,31 @@
-using System.Reflection;                                           
-using System.Runtime.InteropServices;                                           
-// General Information about an assembly is controlled through the following                                           
-// set of attributes. Change these attribute values to modify the information                                           
-// associated with an assembly.                                           
-[assembly: AssemblyTitle("JiraTimeBot")]                                           
-[assembly: AssemblyDescription("")]                                           
-[assembly: AssemblyConfiguration("")]                                           
-[assembly: AssemblyCompany("")]                                           
-[assembly: AssemblyProduct("JiraTimeBot")]                                           
-[assembly: AssemblyCopyright("Copyright © 2019")]                                           
-[assembly: AssemblyTrademark("")]                                           
-[assembly: AssemblyCulture("")]                                           
-// Setting ComVisible to false makes the types in this assembly not visible                                           
-// to COM components.  If you need to access a type in this assembly from                                           
-// COM, set the ComVisible attribute to true on that type.                                           
-[assembly: ComVisible(false)]                                           
-// The following GUID is for the ID of the typelib if this project is exposed to COM                                           
-[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]                                           
-// Version information for an assembly consists of the following four values:                                           
-//                                           
-//      Major Version                                           
-//      Minor Version                                           
-//      Build Number                                           
-//      Revision                                           
-//                                           
-// You can specify all the values or you can default the Build and Revision Numbers                                           
-// by using the '*' as shown below:                                           
-[assembly: AssemblyVersion("1.0.52")] 
-[assembly: AssemblyFileVersion("1.0.52")] 
-[assembly: AssemblyInformationalVersion("1.0.52")] 
+using System.Reflection;                                            
+using System.Runtime.InteropServices;                                            
+// General Information about an assembly is controlled through the following                                            
+// set of attributes. Change these attribute values to modify the information                                            
+// associated with an assembly.                                            
+[assembly: AssemblyTitle("JiraTimeBot")]                                            
+[assembly: AssemblyDescription("")]                                            
+[assembly: AssemblyConfiguration("")]                                            
+[assembly: AssemblyCompany("")]                                            
+[assembly: AssemblyProduct("JiraTimeBot")]                                            
+[assembly: AssemblyCopyright("Copyright © 2019")]                                            
+[assembly: AssemblyTrademark("")]                                            
+[assembly: AssemblyCulture("")]                                            
+// Setting ComVisible to false makes the types in this assembly not visible                                            
+// to COM components.  If you need to access a type in this assembly from                                            
+// COM, set the ComVisible attribute to true on that type.                                            
+[assembly: ComVisible(false)]                                            
+// The following GUID is for the ID of the typelib if this project is exposed to COM                                            
+[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]                                            
+// Version information for an assembly consists of the following four values:                                            
+//                                            
+//      Major Version                                            
+//      Minor Version                                            
+//      Build Number                                            
+//      Revision                                            
+//                                            
+// You can specify all the values or you can default the Build and Revision Numbers                                            
+// by using the '*' as shown below:                                            
+[assembly: AssemblyVersion("1.0.53")] 
+[assembly: AssemblyFileVersion("1.0.53")] 
+[assembly: AssemblyInformationalVersion("1.0.53")] 
diff --git a/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs b/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs
index ed697a7..f517aa1 100644
--- a/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs
+++ b/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs
@@ -65,7 +65,7 @@ namespace JiraTimeBot.TaskTime
                 }
 
                 int currentTaskCommits = taskGroup.Count();
-                int currentTaskTime = (int)RoundTo(minutesPerWorkDay / totalCommitsCount * currentTaskCommits, settings.RoundToMinutes);
+                int currentTaskTime = (int)RoundTo(minutesPerWorkDay / totalCommitsCount * currentTaskCommits, settings.RoundToMinutes, false);
                 remainMinutes = remainMinutes - currentTaskTime;
 
                 var orderedTasks = taskGroup.OrderBy(f => f.Time).ToArray();
@@ -99,7 +99,7 @@ namespace JiraTimeBot.TaskTime
                 _log.Trace($"Погрешность распределения времени: {remainMinutes}. Добавляю к первой задаче.");
             }
 
-            if (workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0)
+            if ((workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0) || remainMinutes > 0)
             {
                 //если переборщили или не достаточно добавили до 8 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
                 workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);