Исправлены мелкие неточности.

This commit is contained in:
Danil Kislov
2019-09-13 09:36:38 +03:00
parent 61e53c3698
commit 4e8fa0b801
6 changed files with 45 additions and 39 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.62 1.0.63
+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.62")] [assembly: AssemblyVersion("1.0.63")]
[assembly: AssemblyFileVersion("1.0.62")] [assembly: AssemblyFileVersion("1.0.63")]
[assembly: AssemblyInformationalVersion("1.0.62")] [assembly: AssemblyInformationalVersion("1.0.63")]
@@ -25,5 +25,13 @@ namespace JiraTimeBot.TaskTime.Objects
FilesAffected = filesAffected; FilesAffected = filesAffected;
Type = type; Type = type;
} }
public void MergeWith(TaskTimeItem toMerge)
{
Commits += toMerge.Commits;
TimeSpent += toMerge.TimeSpent;
Description += "\r\n" + toMerge.Description;
Type |= toMerge.Type;
}
} }
} }
@@ -20,7 +20,7 @@ namespace JiraTimeBot.TaskTime
_spreadHelper = spreadHelper; _spreadHelper = spreadHelper;
} }
public List<TaskTimeItem> CalculateTaskTime(List<TaskTimeItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken)) public List<TaskTimeItem> CalculateTaskTime(List<TaskTimeItem> commits, Settings settings, CancellationToken cancellationToken = default)
{ {
int minutesPerWorkDay = settings.MinuterPerWorkDay + GetRandomMinutes(settings); int minutesPerWorkDay = settings.MinuterPerWorkDay + GetRandomMinutes(settings);
int workHours = (settings.MinuterPerWorkDay / 60); int workHours = (settings.MinuterPerWorkDay / 60);
@@ -59,12 +59,10 @@ namespace JiraTimeBot.TaskTime
var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes); var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
foreach (var workTask in workTasks) foreach (var workTask in workTasks)
{ {
var existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch); TaskTimeItem existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
if (existingItem != null) if (existingItem != null)
{ {
existingItem.TimeSpent += workTask.TimeSpent; existingItem.MergeWith(workTask);
existingItem.Description += "\r\n" + workTask.Description;
existingItem.Type |= CommitType.Task;
continue; continue;
} }
+1 -1
View File
@@ -26,7 +26,7 @@ namespace JiraTimeBot.TaskTime
{ {
int currentTaskCommits = taskGroup.Count(); int currentTaskCommits = taskGroup.Count();
int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, roundUp); int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, roundUp);
remainMinutes = remainMinutes - currentTaskTime; remainMinutes -= currentTaskTime;
var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray(); var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@@ -19,7 +19,7 @@ namespace JiraTimeBot.TasksProcessors
_jiraApi = jiraApi; _jiraApi = jiraApi;
} }
public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken)) public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default)
{ {
_log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:"); _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");