Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8c38726588 | ||
|
|
3ea3cbcce8 | ||
|
|
84ef070eb6 | ||
|
|
448a6ddb57 |
+1
-1
@@ -1 +1 @@
|
||||
1.0.42
|
||||
1.0.46
|
||||
|
||||
@@ -144,9 +144,17 @@ namespace JiraTimeBot.JiraIntegration
|
||||
_log.Trace($"Описание отличается, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
|
||||
}
|
||||
if (!dummy)
|
||||
{
|
||||
try
|
||||
{
|
||||
issue.DeleteWorklogAsync(workLog, token: cancellationToken);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_log.Error($"Не могу удалить Worklog по задаче {taskTimeItem.Branch}: {ex.Message}.");
|
||||
continue;
|
||||
}
|
||||
}
|
||||
hasTodayWorklog = false;
|
||||
}
|
||||
else
|
||||
@@ -162,9 +170,17 @@ namespace JiraTimeBot.JiraIntegration
|
||||
|
||||
Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment);
|
||||
if (!dummy)
|
||||
{
|
||||
try
|
||||
{
|
||||
workLogToAdd = issue.AddWorklogAsync(workLogToAdd, token: cancellationToken).Result;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_log.Error($"Не могу добавить Worklog по задаче {taskTimeItem.Branch}: {ex.Message}.");
|
||||
continue;
|
||||
}
|
||||
}
|
||||
_log.Trace($"Добавили Worklog для {taskTimeItem.Branch}: {workLogToAdd.Author} {workLogToAdd.CreateDate}: {workLogToAdd.TimeSpent}");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,6 +49,10 @@ namespace JiraTimeBot
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_log.Warn($"{realDate:dd.MM.yyyy} вы не сделали ничего полезного =) Использую предыдущий день.");
|
||||
daysDiff--;
|
||||
|
||||
@@ -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.42")]
|
||||
[assembly: AssemblyFileVersion("1.0.42")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.42")]
|
||||
[assembly: AssemblyVersion("1.0.46")]
|
||||
[assembly: AssemblyFileVersion("1.0.46")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.46")]
|
||||
|
||||
@@ -172,6 +172,7 @@ namespace JiraTimeBot.UI
|
||||
if (txtDummyMode.Checked)
|
||||
{
|
||||
_log.Info("Выключаем режим Тестового прогона");
|
||||
txtDummyMode.Checked = false;
|
||||
}
|
||||
|
||||
using (var tokenSource = GetTokenSource())
|
||||
|
||||
Reference in New Issue
Block a user