Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Danil Kislov
|
6f6f7c3424 |
+1
-1
@@ -1 +1 @@
|
|||||||
1.0.60
|
1.0.61
|
||||||
|
|||||||
@@ -48,9 +48,10 @@ namespace JiraTimeBot.JiraIntegration
|
|||||||
{
|
{
|
||||||
var item = new TaskTimeItem(issue.Key.Value,
|
var item = new TaskTimeItem(issue.Key.Value,
|
||||||
issue.Summary,
|
issue.Summary,
|
||||||
1,
|
issue.Project,
|
||||||
TimeSpan.Zero,
|
|
||||||
issue.Updated.GetValueOrDefault(date.Value),
|
issue.Updated.GetValueOrDefault(date.Value),
|
||||||
|
TimeSpan.Zero,
|
||||||
|
1,
|
||||||
1,
|
1,
|
||||||
CommitType.Task);
|
CommitType.Task);
|
||||||
workTasks.Add(item);
|
workTasks.Add(item);
|
||||||
@@ -60,9 +61,10 @@ namespace JiraTimeBot.JiraIntegration
|
|||||||
{
|
{
|
||||||
var item = new TaskTimeItem(issue.Key.Value,
|
var item = new TaskTimeItem(issue.Key.Value,
|
||||||
issue.Summary,
|
issue.Summary,
|
||||||
1,
|
issue.Project,
|
||||||
TimeSpan.Zero,
|
|
||||||
issue.Updated.GetValueOrDefault(date.Value),
|
issue.Updated.GetValueOrDefault(date.Value),
|
||||||
|
TimeSpan.Zero,
|
||||||
|
1,
|
||||||
1,
|
1,
|
||||||
CommitType.Task);
|
CommitType.Task);
|
||||||
workTasks.Add(item);
|
workTasks.Add(item);
|
||||||
|
|||||||
@@ -48,6 +48,8 @@ namespace JiraTimeBot.Mercurial
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var directoryInfo = new DirectoryInfo(repoDirectory);
|
||||||
|
|
||||||
var repo = new Repository(repoDirectory);
|
var repo = new Repository(repoDirectory);
|
||||||
var logCommand = new LogCommand
|
var logCommand = new LogCommand
|
||||||
{
|
{
|
||||||
@@ -74,9 +76,10 @@ namespace JiraTimeBot.Mercurial
|
|||||||
|
|
||||||
var task = new TaskTimeItem(changeset.Branch,
|
var task = new TaskTimeItem(changeset.Branch,
|
||||||
commitMessage,
|
commitMessage,
|
||||||
1,
|
directoryInfo.Name,
|
||||||
TimeSpan.Zero,
|
|
||||||
changeset.Timestamp,
|
changeset.Timestamp,
|
||||||
|
TimeSpan.Zero,
|
||||||
|
1,
|
||||||
changeset.PathActions.Count,
|
changeset.PathActions.Count,
|
||||||
GetCommitType(changeset.Branch));
|
GetCommitType(changeset.Branch));
|
||||||
|
|
||||||
@@ -91,7 +94,7 @@ namespace JiraTimeBot.Mercurial
|
|||||||
var release = task.Branch.Replace("release", "");
|
var release = task.Branch.Replace("release", "");
|
||||||
|
|
||||||
task.Branch = branch;
|
task.Branch = branch;
|
||||||
task.Description = $"Подготовка и публикация версии {release}.";
|
task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
|
||||||
}
|
}
|
||||||
workTasks.Add(task);
|
workTasks.Add(task);
|
||||||
_log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
|
_log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
|
||||||
|
|||||||
@@ -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.60")]
|
[assembly: AssemblyVersion("1.0.61")]
|
||||||
[assembly: AssemblyFileVersion("1.0.60")]
|
[assembly: AssemblyFileVersion("1.0.61")]
|
||||||
[assembly: AssemblyInformationalVersion("1.0.60")]
|
[assembly: AssemblyInformationalVersion("1.0.61")]
|
||||||
|
|||||||
@@ -11,12 +11,14 @@ namespace JiraTimeBot.TaskTime.Objects
|
|||||||
public int Commits { get; set; }
|
public int Commits { get; set; }
|
||||||
public int FilesAffected { get; set; }
|
public int FilesAffected { get; set; }
|
||||||
public CommitType Type { get; set; }
|
public CommitType Type { get; set; }
|
||||||
|
public string Project { get; set; }
|
||||||
|
|
||||||
public TaskTimeItem(string branch, string description, int commits, TimeSpan timeSpent, DateTime startTime,
|
public TaskTimeItem(string branch, string description, string project, DateTime startTime, TimeSpan timeSpent, int commits,
|
||||||
int filesAffected, CommitType type)
|
int filesAffected = 1, CommitType type = CommitType.Task)
|
||||||
{
|
{
|
||||||
Branch = branch;
|
Branch = branch;
|
||||||
Description = description;
|
Description = description;
|
||||||
|
Project = project;
|
||||||
Commits = commits;
|
Commits = commits;
|
||||||
TimeSpent = timeSpent;
|
TimeSpent = timeSpent;
|
||||||
StartTime = startTime;
|
StartTime = startTime;
|
||||||
|
|||||||
@@ -95,9 +95,10 @@ namespace JiraTimeBot.TaskTime
|
|||||||
{
|
{
|
||||||
return new TaskTimeItem(timeControlTask,
|
return new TaskTimeItem(timeControlTask,
|
||||||
"Ведение учета времени",
|
"Ведение учета времени",
|
||||||
1,
|
"Service",
|
||||||
TimeSpan.FromMinutes(minutes),
|
|
||||||
DateTime.Now,
|
DateTime.Now,
|
||||||
|
TimeSpan.FromMinutes(minutes),
|
||||||
|
1,
|
||||||
1,
|
1,
|
||||||
CommitType.Task);
|
CommitType.Task);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,9 +43,10 @@ namespace JiraTimeBot.TaskTime
|
|||||||
var taskTimeItem = new TaskTimeItem(
|
var taskTimeItem = new TaskTimeItem(
|
||||||
taskGroup.Key,
|
taskGroup.Key,
|
||||||
sb.ToString(),
|
sb.ToString(),
|
||||||
taskGroup.Sum(f => f.Commits),
|
taskGroup.First().Project,
|
||||||
timeSpent,
|
|
||||||
taskGroup.Min(f => f.StartTime),
|
taskGroup.Min(f => f.StartTime),
|
||||||
|
timeSpent,
|
||||||
|
taskGroup.Sum(f => f.Commits),
|
||||||
taskGroup.Sum(f => f.FilesAffected),
|
taskGroup.Sum(f => f.FilesAffected),
|
||||||
taskGroup.First().Type);
|
taskGroup.First().Type);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user