Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Danil Kislov
|
e26ef9d7f4 | ||
|
Danil Kislov
|
d8de5aba1c | ||
|
Danil Kislov
|
1e40f0a07c |
+1
-1
@@ -1 +1 @@
|
||||
1.0.65
|
||||
1.0.68
|
||||
|
||||
@@ -61,7 +61,7 @@ namespace JiraTimeBot.Configuration
|
||||
var errors = new List<string>();
|
||||
message = null;
|
||||
|
||||
if (settings.RoundToMinutes == default(int))
|
||||
if (settings.RoundToMinutes == default)
|
||||
{
|
||||
errors.Add("Укажите округление времени, например, 10 (минут)");
|
||||
}
|
||||
@@ -137,7 +137,7 @@ namespace JiraTimeBot.Configuration
|
||||
File.WriteAllText(settingsPath, settingsString);
|
||||
}
|
||||
|
||||
private static string _settingsFileName = "settings.json";
|
||||
private static readonly string _settingsFileName = "settings.json";
|
||||
}
|
||||
|
||||
public enum WorkType
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace JiraTimeBot.JiraIntegration
|
||||
}
|
||||
}
|
||||
|
||||
public List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
|
||||
public List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
|
||||
date = date.GetValueOrDefault(DateTime.Now.Date);
|
||||
@@ -69,14 +69,14 @@ namespace JiraTimeBot.JiraIntegration
|
||||
}
|
||||
}
|
||||
|
||||
public List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
|
||||
public List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
|
||||
{
|
||||
date = date.GetValueOrDefault(DateTime.Now.Date);
|
||||
var jql = "issueFunction in workLogged(\"on %DATE% by '%USER%'\")";
|
||||
return GetIssuesByJQL(jql, settings, date, cancellationToken);
|
||||
}
|
||||
|
||||
private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default(CancellationToken))
|
||||
private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default)
|
||||
{
|
||||
var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
|
||||
foreach (var issue in alreadyLoggedToday)
|
||||
@@ -85,7 +85,7 @@ namespace JiraTimeBot.JiraIntegration
|
||||
{
|
||||
var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
|
||||
var userWorklogs = workLogs.Where(w =>
|
||||
w.CreateDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
|
||||
w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
|
||||
StringComparison.InvariantCultureIgnoreCase)).ToList();
|
||||
foreach (var userWorklog in userWorklogs)
|
||||
{
|
||||
@@ -100,7 +100,7 @@ namespace JiraTimeBot.JiraIntegration
|
||||
}
|
||||
}
|
||||
|
||||
public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default(CancellationToken))
|
||||
public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default)
|
||||
{
|
||||
date = date.GetValueOrDefault(DateTime.Now.Date).Date;
|
||||
var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
|
||||
|
||||
@@ -13,7 +13,7 @@ namespace JiraTimeBot.JiraIntegration
|
||||
{
|
||||
List<TaskTimeItem> GetDayWorklogs(DateTime date,
|
||||
Settings settings,
|
||||
CancellationToken cancellationToken = default(CancellationToken));
|
||||
CancellationToken cancellationToken = default);
|
||||
}
|
||||
|
||||
public class JiraHistory: IJiraHistory
|
||||
@@ -27,17 +27,16 @@ namespace JiraTimeBot.JiraIntegration
|
||||
|
||||
public List<TaskTimeItem> GetDayWorklogs(DateTime date,
|
||||
Settings settings,
|
||||
CancellationToken cancellationToken = default(CancellationToken))
|
||||
CancellationToken cancellationToken = default)
|
||||
{
|
||||
var tasks = _jiraApi.GetIssuesByJQL("status changed by '%USER%' during (\"%DATE%\",\"%DATE%\")", settings, date, cancellationToken);
|
||||
var tasks = _jiraApi.GetIssuesByJQL("worklogDate = \"%DATE%\" and worklogAuthor='%USER%'", settings, date, cancellationToken);
|
||||
List<TaskTimeItem> resultItems = new List<TaskTimeItem>();
|
||||
foreach (var issue in tasks)
|
||||
{
|
||||
var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
|
||||
var user = settings.JiraUserName;
|
||||
//user = "Zoya.Aleksandridi";
|
||||
var userWorklogs = workLogs.Where(w =>
|
||||
w.CreateDate.GetValueOrDefault().Date == date && w.Author.Equals(user,
|
||||
w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(user,
|
||||
StringComparison.InvariantCultureIgnoreCase)).ToList();
|
||||
if (!userWorklogs.Any())
|
||||
{
|
||||
@@ -46,10 +45,14 @@ namespace JiraTimeBot.JiraIntegration
|
||||
|
||||
var firstWorklog = userWorklogs.First();
|
||||
|
||||
var description = string.Join("\r\n", userWorklogs.Select(f => f.Comment).Distinct());
|
||||
var description = string.Join(Environment.NewLine, userWorklogs.Select(f => f.Comment).Distinct());
|
||||
var totalTime = TimeSpan.FromSeconds(userWorklogs.Sum(f => f.TimeSpentInSeconds));
|
||||
var startDate = firstWorklog?.CreateDate ?? date;
|
||||
var commits = userWorklogs.Sum(f => f.Comment.Count(c => c == '\n'));
|
||||
if (commits == 0)
|
||||
{
|
||||
commits = 1;
|
||||
}
|
||||
var taskType = CommitType.Task;
|
||||
if (description.Contains("Подготовка и публикация"))
|
||||
{
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<LangVersion>7.1</LangVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
|
||||
@@ -79,7 +79,7 @@ namespace JiraTimeBot
|
||||
mercurial = _mercurialProviders.JiraCommitEmulator;
|
||||
}
|
||||
|
||||
List<TaskTimeItem> taskTimes = null;
|
||||
List<TaskTimeItem> taskTimes;
|
||||
if (!(tasksProcessor is MeetingProcessor))
|
||||
{
|
||||
List<TaskTimeItem> commits = mercurial.GetMercurialLog(settings, realDate, cancellationToken);
|
||||
|
||||
@@ -24,7 +24,7 @@ namespace JiraTimeBot.Mercurial
|
||||
_technicalInfoSkipper = technicalInfoSkipper;
|
||||
}
|
||||
|
||||
public List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
|
||||
public List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
|
||||
{
|
||||
if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
|
||||
{
|
||||
|
||||
@@ -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.65")]
|
||||
[assembly: AssemblyFileVersion("1.0.65")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.65")]
|
||||
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.68")]
|
||||
[assembly: AssemblyFileVersion("1.0.68")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.68")]
|
||||
|
||||
@@ -21,7 +21,8 @@ namespace JiraTimeBot.TasksProcessors
|
||||
|
||||
public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
|
||||
{
|
||||
_log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");
|
||||
var totalTime = TimeSpan.FromSeconds(taskTimes.Sum(f => f.TimeSpent.TotalSeconds));
|
||||
_log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам ({totalTime:hh':'mm':'ss}):");
|
||||
|
||||
foreach (var taskTime in taskTimes.Where(f=>f.Type.HasFlag(CommitType.Task)).OrderByDescending(f => f.TimeSpent))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user