Compare commits

...
3 Commits
4 changed files with 35 additions and 36 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.47
1.0.49
+2 -3
View File
@@ -51,8 +51,7 @@ namespace JiraTimeBot.JiraIntegration
try
{
List<Issue> affectedIssues =
jira.Issues.GetIssuesFromJqlAsync(jql, 100, 0, cancellationToken).Result.ToList();
List<Issue> affectedIssues = jira.Issues.GetIssuesFromJqlAsync(jql, 100, 0, cancellationToken).Result.ToList();
return affectedIssues;
}
catch (Exception ex)
@@ -177,7 +176,7 @@ namespace JiraTimeBot.JiraIntegration
}
catch (Exception ex)
{
_log.Error($"Не могу добавить Worklog по задаче {taskTimeItem.Branch}: {ex.Message}.");
_log.Error($"Не могу добавить Worklog по задаче {taskTimeItem.Branch}: {ex.Message} ({ex.InnerException?.Message}).");
continue;
}
}
+3 -3
View File
@@ -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.47")]
[assembly: AssemblyFileVersion("1.0.47")]
[assembly: AssemblyInformationalVersion("1.0.47")]
[assembly: AssemblyVersion("1.0.49")]
[assembly: AssemblyFileVersion("1.0.49")]
[assembly: AssemblyInformationalVersion("1.0.49")]
@@ -21,7 +21,6 @@ namespace JiraTimeBot.TaskTime
public List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken))
{
int minutesPerWorkDay = settings.MinuterPerWorkDay;
int remainMinutes = settings.MinuterPerWorkDay;
int workHours = (settings.MinuterPerWorkDay / 60);
int totalCommitsCount = commits.Count;
@@ -56,6 +55,7 @@ namespace JiraTimeBot.TaskTime
});
}
int remainMinutes = minutesPerWorkDay;
//Нам нужно раскидать 480 минут в день.
foreach (var taskGroup in commits.GroupBy(f => f.Branch).OrderByDescending(f=>f.Count()))
{