Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Danil Kislov
|
6f6f7c3424 | ||
|
Danil Kislov
|
364b23dbca |
+1
-1
@@ -1 +1 @@
|
||||
1.0.59
|
||||
1.0.61
|
||||
|
||||
@@ -46,28 +46,28 @@ namespace JiraTimeBot.JiraIntegration
|
||||
{
|
||||
foreach (var comment in userComments.OrderBy(f=>f.CreatedDate))
|
||||
{
|
||||
workTasks.Add(new TaskTimeItem
|
||||
{
|
||||
StartTime = issue.Updated.GetValueOrDefault(date.Value),
|
||||
Description = issue.Summary,
|
||||
Branch = issue.Key.Value,
|
||||
FilesAffected = 1,
|
||||
Commits = 1,
|
||||
Type = CommitType.Task
|
||||
});
|
||||
var item = new TaskTimeItem(issue.Key.Value,
|
||||
issue.Summary,
|
||||
issue.Project,
|
||||
issue.Updated.GetValueOrDefault(date.Value),
|
||||
TimeSpan.Zero,
|
||||
1,
|
||||
1,
|
||||
CommitType.Task);
|
||||
workTasks.Add(item);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
workTasks.Add(new TaskTimeItem
|
||||
{
|
||||
StartTime = issue.Updated.GetValueOrDefault(date.Value),
|
||||
Description = issue.Summary,
|
||||
Branch = issue.Key.Value,
|
||||
FilesAffected = 1,
|
||||
Commits = 1,
|
||||
Type = CommitType.Task
|
||||
});
|
||||
var item = new TaskTimeItem(issue.Key.Value,
|
||||
issue.Summary,
|
||||
issue.Project,
|
||||
issue.Updated.GetValueOrDefault(date.Value),
|
||||
TimeSpan.Zero,
|
||||
1,
|
||||
1,
|
||||
CommitType.Task);
|
||||
workTasks.Add(item);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -92,6 +92,7 @@
|
||||
<Compile Include="Mercurial\IMercurialLog.cs" />
|
||||
<Compile Include="Mercurial\Modifiers\TechnicalInfoSkipper.cs" />
|
||||
<Compile Include="TasksProcessors\IAllTasksProcessors.cs" />
|
||||
<Compile Include="TaskTime\Objects\CommitType.cs" />
|
||||
<Compile Include="TaskTime\TaskTimeSpread.cs" />
|
||||
<Compile Include="UI\frmMain.cs">
|
||||
<SubType>Form</SubType>
|
||||
|
||||
@@ -48,6 +48,8 @@ namespace JiraTimeBot.Mercurial
|
||||
continue;
|
||||
}
|
||||
|
||||
var directoryInfo = new DirectoryInfo(repoDirectory);
|
||||
|
||||
var repo = new Repository(repoDirectory);
|
||||
var logCommand = new LogCommand
|
||||
{
|
||||
@@ -72,16 +74,14 @@ namespace JiraTimeBot.Mercurial
|
||||
}
|
||||
commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
|
||||
|
||||
var task = new TaskTimeItem
|
||||
{
|
||||
StartTime = changeset.Timestamp,
|
||||
Description = commitMessage,
|
||||
Branch = changeset.Branch,
|
||||
FilesAffected = changeset.PathActions.Count,
|
||||
Commits = 1,
|
||||
TimeSpent = TimeSpan.Zero,
|
||||
Type = GetCommitType(changeset.Branch)
|
||||
};
|
||||
var task = new TaskTimeItem(changeset.Branch,
|
||||
commitMessage,
|
||||
directoryInfo.Name,
|
||||
changeset.Timestamp,
|
||||
TimeSpan.Zero,
|
||||
1,
|
||||
changeset.PathActions.Count,
|
||||
GetCommitType(changeset.Branch));
|
||||
|
||||
if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
|
||||
{
|
||||
@@ -94,7 +94,7 @@ namespace JiraTimeBot.Mercurial
|
||||
var release = task.Branch.Replace("release", "");
|
||||
|
||||
task.Branch = branch;
|
||||
task.Description = $"Подготовка и публикация версии {release}.";
|
||||
task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
|
||||
}
|
||||
workTasks.Add(task);
|
||||
_log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("JiraTimeBot")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("JiraTimeBot")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2019")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
// 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
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// 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.59")]
|
||||
[assembly: AssemblyFileVersion("1.0.59")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.59")]
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("JiraTimeBot")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("JiraTimeBot")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2019")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
// 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
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// 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.61")]
|
||||
[assembly: AssemblyFileVersion("1.0.61")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.61")]
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
namespace JiraTimeBot.TaskTime.Objects
|
||||
{
|
||||
public enum CommitType {
|
||||
Task = 0,
|
||||
Release = 1
|
||||
}
|
||||
}
|
||||
@@ -11,10 +11,19 @@ namespace JiraTimeBot.TaskTime.Objects
|
||||
public int Commits { get; set; }
|
||||
public int FilesAffected { get; set; }
|
||||
public CommitType Type { get; set; }
|
||||
}
|
||||
public string Project { get; set; }
|
||||
|
||||
public enum CommitType {
|
||||
Task = 0,
|
||||
Release = 1
|
||||
public TaskTimeItem(string branch, string description, string project, DateTime startTime, TimeSpan timeSpent, int commits,
|
||||
int filesAffected = 1, CommitType type = CommitType.Task)
|
||||
{
|
||||
Branch = branch;
|
||||
Description = description;
|
||||
Project = project;
|
||||
Commits = commits;
|
||||
TimeSpent = timeSpent;
|
||||
StartTime = startTime;
|
||||
FilesAffected = filesAffected;
|
||||
Type = type;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,13 +93,14 @@ namespace JiraTimeBot.TaskTime
|
||||
//Если указана задача контроля времени - то спишем туда 30 минут и вычеркнем их из общего рабочего времени.
|
||||
if (!string.IsNullOrEmpty(timeControlTask))
|
||||
{
|
||||
return new TaskTimeItem
|
||||
{
|
||||
TimeSpent = TimeSpan.FromMinutes(minutes),
|
||||
Branch = timeControlTask,
|
||||
Commits = 1,
|
||||
Description = "Ведение учета времени"
|
||||
};
|
||||
return new TaskTimeItem(timeControlTask,
|
||||
"Ведение учета времени",
|
||||
"Service",
|
||||
DateTime.Now,
|
||||
TimeSpan.FromMinutes(minutes),
|
||||
1,
|
||||
1,
|
||||
CommitType.Task);
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
@@ -34,19 +34,21 @@ namespace JiraTimeBot.TaskTime
|
||||
{
|
||||
sb.AppendLine($"- {task.Description}");
|
||||
}
|
||||
var taskTimeItem = new TaskTimeItem
|
||||
{
|
||||
Branch = taskGroup.Key,
|
||||
TimeSpent = appendTime ?
|
||||
TimeSpan.FromMinutes(taskGroup.Sum(f=>f.TimeSpent.TotalMinutes)) + TimeSpan.FromMinutes(currentTaskTime):
|
||||
TimeSpan.FromMinutes(currentTaskTime)
|
||||
,
|
||||
Commits = taskGroup.Sum(f=>f.Commits),
|
||||
Description = sb.ToString(),
|
||||
StartTime = taskGroup.Min(f=>f.StartTime),
|
||||
FilesAffected = taskGroup.Sum(f=>f.FilesAffected),
|
||||
Type = taskGroup.First().Type
|
||||
};
|
||||
|
||||
var timeSpent = appendTime
|
||||
? TimeSpan.FromMinutes(taskGroup.Sum(f => f.TimeSpent.TotalMinutes)) +
|
||||
TimeSpan.FromMinutes(currentTaskTime)
|
||||
: TimeSpan.FromMinutes(currentTaskTime);
|
||||
|
||||
var taskTimeItem = new TaskTimeItem(
|
||||
taskGroup.Key,
|
||||
sb.ToString(),
|
||||
taskGroup.First().Project,
|
||||
taskGroup.Min(f => f.StartTime),
|
||||
timeSpent,
|
||||
taskGroup.Sum(f => f.Commits),
|
||||
taskGroup.Sum(f => f.FilesAffected),
|
||||
taskGroup.First().Type);
|
||||
|
||||
newList.Add(taskTimeItem);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user