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-09-13 09:36:38 +03:00
parent 61e53c3698
commit 6e4e34f44c
6 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.semver.txt
+1 -1
View File
@@ -1 +1 @@
1.0.62 1.0.63
src/JiraTimeBot/Properties/AssemblyInfo.cs
+31 -31
View File
@@ -1,31 +1,31 @@
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("JiraTimeBot")] [assembly: AssemblyTitle("JiraTimeBot")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JiraTimeBot")] [assembly: AssemblyProduct("JiraTimeBot")]
[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible // 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 // to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type. // COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] [assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
// Minor Version // Minor Version
// Build Number // Build Number
// Revision // Revision
// //
// 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")]
src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs
+8
View File
@@ -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;
}
} }
} }
src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs
+3 -5
View File
@@ -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;
} }
src/JiraTimeBot/TaskTime/TaskTimeSpread.cs
+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();
src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs
+1 -1
View File
@@ -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} распределение по задачам:");