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-07-02 18:09:22 +03:00
parent 72f9ccfd5e
commit c95f228ef0
3 changed files with 44 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.58 1.0.59
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.58")] [assembly: AssemblyVersion("1.0.59")]
[assembly: AssemblyFileVersion("1.0.58")] [assembly: AssemblyFileVersion("1.0.59")]
[assembly: AssemblyInformationalVersion("1.0.58")] [assembly: AssemblyInformationalVersion("1.0.59")]
src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs
+12 -1
View File
@@ -57,7 +57,18 @@ namespace JiraTimeBot.TaskTime
} }
var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes); var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
workTimeItems.AddRange(workTasks); foreach (var workTask in workTasks)
{
var existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
if (existingItem != null)
{
existingItem.TimeSpent += workTask.TimeSpent;
existingItem.Description += "\r\n" + workTask.Description;
continue;
}
workTimeItems.Add(workTask);
}
workTimeItems = workTimeItems.OrderByDescending(f => f.TimeSpent).ToList(); workTimeItems = workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();
remainMinutes = minutesPerWorkDay - (int) workTimeItems.Sum(f => f.TimeSpent.TotalMinutes); remainMinutes = minutesPerWorkDay - (int) workTimeItems.Sum(f => f.TimeSpent.TotalMinutes);