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