monster/JiraTimeBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Исправление бага с +/- минутами

Browse Source
This commit is contained in:
Danil Kislov
2019-06-25 20:49:05 +03:00
parent 63b74263bd
commit f009fb1dc6
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.semver.txt
+1 -1
View File
@@ -1 +1 @@
1.0.47 1.0.48
src/JiraTimeBot/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.47")] [assembly: AssemblyVersion("1.0.48")]
[assembly: AssemblyFileVersion("1.0.47")] [assembly: AssemblyFileVersion("1.0.48")]
[assembly: AssemblyInformationalVersion("1.0.47")] [assembly: AssemblyInformationalVersion("1.0.48")]
src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs
+1 -1
View File
@@ -21,7 +21,6 @@ namespace JiraTimeBot.TaskTime
public List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken)) public List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken))
{ {
int minutesPerWorkDay = settings.MinuterPerWorkDay; int minutesPerWorkDay = settings.MinuterPerWorkDay;
int remainMinutes = settings.MinuterPerWorkDay;
int workHours = (settings.MinuterPerWorkDay / 60); int workHours = (settings.MinuterPerWorkDay / 60);
int totalCommitsCount = commits.Count; int totalCommitsCount = commits.Count;
@@ -56,6 +55,7 @@ namespace JiraTimeBot.TaskTime
}); });
} }
int remainMinutes = minutesPerWorkDay;
//Нам нужно раскидать 480 минут в день. //Нам нужно раскидать 480 минут в день.
foreach (var taskGroup in commits.GroupBy(f => f.Branch).OrderByDescending(f=>f.Count())) foreach (var taskGroup in commits.GroupBy(f => f.Branch).OrderByDescending(f=>f.Count()))
{ {