Отключил комментарии для режима Jira

This commit is contained in:
Danil Kislov
2019-03-19 12:27:09 +03:00
parent 2d8214e64f
commit 1f26264dca
36 changed files with 125 additions and 137 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.18
1.0.19
@@ -2,7 +2,7 @@
using System.Security.Cryptography;
using System.Text;
namespace JiraTimeBotForm.Configuration
namespace JiraTimeBot.Configuration
{
public class PasswordEncryptionClass
{
+1 -1
View File
@@ -5,7 +5,7 @@ using System.Linq;
using System.Windows.Forms;
using Newtonsoft.Json;
namespace JiraTimeBotForm.Configuration
namespace JiraTimeBot.Configuration
{
public class Settings
{
+8 -9
View File
@@ -1,16 +1,15 @@
using System.Windows.Forms;
using Autofac;
using Autofac.Extras.AggregateService;
using JiraTimeBotForm.JiraIntegration;
using JiraTimeBotForm.JiraIntegration.Comments;
using JiraTimeBotForm.Mercurial;
using JiraTimeBotForm.Mercurial.Modifiers;
using JiraTimeBotForm.TasksProcessors;
using JiraTimeBotForm.TaskTime;
using JiraTimeBotForm.UI;
using JiraTimeBotForm.UI.Tray;
using JiraTimeBot.JiraIntegration;
using JiraTimeBot.JiraIntegration.Comments;
using JiraTimeBot.Mercurial;
using JiraTimeBot.Mercurial.Modifiers;
using JiraTimeBot.TasksProcessors;
using JiraTimeBot.TaskTime;
using JiraTimeBot.UI.Tray;
namespace JiraTimeBotForm.DI
namespace JiraTimeBot.DI
{
public class Bootstrapper
{
@@ -1,9 +1,10 @@
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.JiraIntegration.Comments
namespace JiraTimeBot.JiraIntegration.Comments
{
public interface IJiraDescriptionSource
{
string GetDescription(TaskTimeItem item, bool addCommentsToWorklog);
string GetDescription(TaskTimeItem item, bool addCommentsToWorklog, Settings settings);
}
}
@@ -1,9 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.JiraIntegration.Comments
namespace JiraTimeBot.JiraIntegration.Comments
{
public class JiraDescriptionSource : IJiraDescriptionSource
{
@@ -13,14 +14,19 @@ namespace JiraTimeBotForm.JiraIntegration.Comments
"кодинг", "написание кода и тестов"
};
public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog)
public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog, Settings settings)
{
if (addCommentsToWorklog)
{
return taskTimeItem.Description;
}
return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
if (settings.WorkType == WorkType.Mercurial)
{
return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
}
return "";
}
}
}
+5 -5
View File
@@ -3,11 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Atlassian.Jira;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.JiraIntegration.Comments;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.JiraIntegration.Comments;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.JiraIntegration
namespace JiraTimeBot.JiraIntegration
{
public class JiraApi
{
@@ -119,7 +119,7 @@ namespace JiraTimeBotForm.JiraIntegration
{
var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m";
var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog);
var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment);
if (!dummy)
@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.Threading;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial;
using JiraTimeBot.Mercurial.Objects;
namespace JiraTimeBotForm.JiraIntegration
namespace JiraTimeBot.JiraIntegration
{
public class JiraCommitEmulator : IMercurialLog
{
+7 -7
View File
@@ -3,14 +3,14 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBotForm.TasksProcessors;
using JiraTimeBotForm.TaskTime;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial;
using JiraTimeBot.Mercurial.Objects;
using JiraTimeBot.TasksProcessors;
using JiraTimeBot.TaskTime;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm
namespace JiraTimeBot
{
class Job
{
+1 -1
View File
@@ -2,7 +2,7 @@
using System.ComponentModel;
using System.Windows.Forms;
namespace JiraTimeBotForm
namespace JiraTimeBot
{
public class Logger : ILog
{
@@ -1,11 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JiraTimeBotForm.JiraIntegration;
using JiraTimeBot.JiraIntegration;
namespace JiraTimeBotForm.Mercurial
namespace JiraTimeBot.Mercurial
{
public interface IAllMercurialProviders
{
+3 -3
View File
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.Threading;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial.Objects;
namespace JiraTimeBotForm.Mercurial
namespace JiraTimeBot.Mercurial
{
public interface IMercurialLog
{
+4 -4
View File
@@ -4,12 +4,12 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial.Modifiers;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial.Modifiers;
using JiraTimeBot.Mercurial.Objects;
using Mercurial;
namespace JiraTimeBotForm.Mercurial
namespace JiraTimeBot.Mercurial
{
public class MercurialLog: IMercurialLog
{
@@ -1,6 +1,6 @@
using System;
namespace JiraTimeBotForm.Mercurial.Modifiers
namespace JiraTimeBot.Mercurial.Modifiers
{
public class CommitSkipper : ICommitSkipper
{
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.Mercurial.Modifiers
namespace JiraTimeBot.Mercurial.Modifiers
{
public interface ICommitSkipper
{
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.Mercurial.Modifiers
namespace JiraTimeBot.Mercurial.Modifiers
{
public interface ITechnicalInfoSkipper
{
@@ -1,6 +1,6 @@
using System.Text;
namespace JiraTimeBotForm.Mercurial.Modifiers
namespace JiraTimeBot.Mercurial.Modifiers
{
public class TechnicalInfoSkipper : ITechnicalInfoSkipper
{
@@ -1,6 +1,6 @@
using System;
namespace JiraTimeBotForm.Mercurial.Objects
namespace JiraTimeBot.Mercurial.Objects
{
public class MercurialCommitItem
{
+2 -2
View File
@@ -1,9 +1,9 @@
using System;
using System.Diagnostics;
using System.Windows.Forms;
using JiraTimeBotForm.UI;
using JiraTimeBot.UI;
namespace JiraTimeBotForm
namespace JiraTimeBot
{
static class Program
{
+31 -31
View File
@@ -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.18")]
[assembly: AssemblyFileVersion("1.0.18")]
[assembly: AssemblyInformationalVersion("1.0.18")]
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.19")]
[assembly: AssemblyFileVersion("1.0.19")]
[assembly: AssemblyInformationalVersion("1.0.19")]
@@ -1,11 +1,10 @@
using System.Collections.Generic;
using System.Threading;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial.Objects;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TaskTime
namespace JiraTimeBot.TaskTime
{
public interface ITaskTimeCalculator
{
@@ -1,6 +1,6 @@
using System;
namespace JiraTimeBotForm.TaskTime.Objects
namespace JiraTimeBot.TaskTime.Objects
{
public class TaskTimeItem
{
@@ -3,12 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.Mercurial;
using JiraTimeBotForm.Mercurial.Objects;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.Mercurial.Objects;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TaskTime
namespace JiraTimeBot.TaskTime
{
public class TaskTimeByCommitsCalculator: ITaskTimeCalculator
{
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.TasksProcessors
namespace JiraTimeBot.TasksProcessors
{
public interface IAllTasksProcessors
{
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TasksProcessors
namespace JiraTimeBot.TasksProcessors
{
interface ITasksProcessor
{
@@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.JiraIntegration;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.JiraIntegration;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TasksProcessors
namespace JiraTimeBot.TasksProcessors
{
public class MeetingProcessor : ITasksProcessor
{
@@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.JiraIntegration;
using JiraTimeBotForm.TaskTime;
using JiraTimeBotForm.TaskTime.Objects;
using JiraTimeBot.Configuration;
using JiraTimeBot.JiraIntegration;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBotForm.TasksProcessors
namespace JiraTimeBot.TasksProcessors
{
public class WorkLogTasksProcessor : ITasksProcessor
{
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Windows.Forms;
namespace JiraTimeBotForm.UI.Tray
namespace JiraTimeBot.UI.Tray
{
public interface ITrayMenu
{
+1 -1
View File
@@ -2,7 +2,7 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
namespace JiraTimeBotForm.UI.Tray
namespace JiraTimeBot.UI.Tray
{
public static class RestoreFromTray {
[DllImport( "user32.dll" )]
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
namespace JiraTimeBotForm.UI.Tray
namespace JiraTimeBot.UI.Tray
{
public class TrayMenu: ITrayMenu
{
+1 -1
View File
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.UI
namespace JiraTimeBot.UI
{
partial class frmMain
{
+6 -7
View File
@@ -1,22 +1,21 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using Autofac;
using JiraTimeBotForm.Configuration;
using JiraTimeBotForm.DI;
using JiraTimeBotForm.TasksProcessors;
using JiraTimeBotForm.UI.Tray;
using JiraTimeBotForm.Update;
using JiraTimeBot.Configuration;
using JiraTimeBot.DI;
using JiraTimeBot.TasksProcessors;
using JiraTimeBot.UI.Tray;
using JiraTimeBot.Update;
// This is the code for your desktop app.
// Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.
namespace JiraTimeBotForm.UI
namespace JiraTimeBot.UI
{
public partial class frmMain : Form
{
+1 -1
View File
@@ -1,4 +1,4 @@
namespace JiraTimeBotForm.UI
namespace JiraTimeBot.UI
{
partial class frmSettings
{
+2 -2
View File
@@ -1,8 +1,8 @@
using System;
using System.Windows.Forms;
using JiraTimeBotForm.Configuration;
using JiraTimeBot.Configuration;
namespace JiraTimeBotForm.UI
namespace JiraTimeBot.UI
{
public partial class frmSettings : Form
{
+1 -7
View File
@@ -1,13 +1,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace JiraTimeBotForm.Update
namespace JiraTimeBot.Update
{
public partial class GitHubReleaseResponse
{
+1 -4
View File
@@ -1,13 +1,10 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;
namespace JiraTimeBotForm.Update
namespace JiraTimeBot.Update
{
class UpdateChecker
{