Исправлены мелкие неточности.
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
||||
1.0.62
|
||||
1.0.63
|
||||
|
||||
@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
|
||||
//
|
||||
// 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.62")]
|
||||
[assembly: AssemblyFileVersion("1.0.62")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.62")]
|
||||
[assembly: AssemblyVersion("1.0.63")]
|
||||
[assembly: AssemblyFileVersion("1.0.63")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.63")]
|
||||
|
||||
@@ -25,5 +25,13 @@ namespace JiraTimeBot.TaskTime.Objects
|
||||
FilesAffected = filesAffected;
|
||||
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;
|
||||
}
|
||||
|
||||
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 workHours = (settings.MinuterPerWorkDay / 60);
|
||||
@@ -59,12 +59,10 @@ namespace JiraTimeBot.TaskTime
|
||||
var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
|
||||
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)
|
||||
{
|
||||
existingItem.TimeSpent += workTask.TimeSpent;
|
||||
existingItem.Description += "\r\n" + workTask.Description;
|
||||
existingItem.Type |= CommitType.Task;
|
||||
existingItem.MergeWith(workTask);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ namespace JiraTimeBot.TaskTime
|
||||
{
|
||||
int currentTaskCommits = taskGroup.Count();
|
||||
int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, roundUp);
|
||||
remainMinutes = remainMinutes - currentTaskTime;
|
||||
remainMinutes -= currentTaskTime;
|
||||
|
||||
var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray();
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace JiraTimeBot.TasksProcessors
|
||||
_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} распределение по задачам:");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user