Немного красивостей+исправление выборки

.appveyor.yml

@@ -2,7 +2,7 @@ version: 1.0.{build}
 image: Visual Studio 2017
 
 init:
-  - ps: >-
+- ps: >-
     if ($env:APPVEYOR_REPO_TAG -eq "true")
     {
       Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME"
@@ -28,7 +28,7 @@ artifacts:
 deploy:
 - provider: GitHub
   auth_token:
-    secure: vcrXfbGk400wdnU45LZqhuGCdnPJsYn5lSHjguHSRm1riRDiVMC20BzvfvDIjcI/
+    secure: Jg8vtDMtgadXE5uifFSr5y9KNrGAjvFntqnRHzyuVWkssitctTtVq086svS2zXAq
   artifact: JiraTimeBot.zip
   on:
     APPVEYOR_REPO_TAG: true

.semver.txt

@@ -1 +1 @@
-1.0.29
+1.0.67

.travis.yml

@@ -1,19 +0,0 @@
-language: csharp
-solution: src/JiraTimeBot.sln
-  
-before_deploy:
-  - "zip -j JiraTimeBot.zip src/JiraTimeBot/bin/Release/*"
-
-deploy:
-  provider: releases
-  api_key: $GITHUB_OAUTH_TOKEN
-  overwrite: true
-  file: JiraTimeBot.zip
-  skip_cleanup: true
-  on:
-    tags: true
-
-notifications:
-  email:
-    on_success: never
-    on_failure: always

README.md

@@ -1,5 +1,5 @@
-# JiraTimeBot [![Build Status](https://travis-ci.org/monster1025/JiraTimeBot.svg?branch=master)](https://travis-ci.org/monster1025/JiraTimeBot)
+# JiraTimeBot [![Build status](https://ci.appveyor.com/api/projects/status/anmhfvuj4oq84j1f/branch/master?svg=true)](https://ci.appveyor.com/project/monster1025/jiratimebot/branch/master)
-Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку.
+Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку. Возможна работа по JQL-запросу JIRA.
 
 # Ограничения
  - Предполагается что все Ваши репозитории находятся в одной папке (к которой вы указываете путь в настройках).
@@ -12,12 +12,14 @@
  - Путь до репо (Режим Mercurial) - путь до папки, в которую клонируются исходники.
  - Логин Jira - Логин в Jira (от этого пользователя будем выполнять запросы и вносить время).
  - Пароль Jira - шифруется через DPAPI.
- - Mercurial Name (Режим Mercurial) - обязателен к указанию для режима Mercurial - имя пользователя Mercurial, от которого проходят коммиты.
+ - Mercurial Name (Режим Mercurial) - обязателен к указанию для режима Mercurial - имя пользователя Mercurial, от которого проходят коммиты (именно UserName, не E-Mail).
  - Округление времени - Для красоты распределения времени тут устанавливается округление. По умолчанию - 15 минут, получим время 1:15, 0:30 итд. Остаток нераспределенного времени будет внесен в самую долгую задачу или же если это невозможно - количество рабочего времени будет увеличено или уменьшено.
  - JQL (Режим Jira) - можно задать свой JQL для поиска задач. Возможные замены: %USER% - Логин Jira, %DATE% дата на которую формируем список. Значнеие по умолчанию: status changed by '%USER%' during ("%DATE%","%DATE%")
- - Время запуска - время автоматического запуска бота. Если была установлена галочка "тестовый прогон" - она будет снята.
- - Добавлять описание (Режим Mercurial) - добавлять ли в описание CommitMessage, если не установлено - добавляются стандартные фразы программистов (типа "написание кода").
  - Задача "учёта времени" - задача, куда будет списываться по 30 минут в день на "затраты на учет времени". Должна содержать знак '-'.
-
+ - Время запуска - время автоматического запуска бота. Если была установлена галочка "тестовый прогон" - она будет снята.
+ - Минут в рабочем дне - количество распределяемых минут (оыбчно 8 * 60).
+ - Рандомных минут - если > 0, то будет прибавлено рандомное количество минут к рабочему времени (но кратное значению округления).
+ - Добавлять описание (Режим Mercurial) - добавлять ли в описание CommitMessage, если не установлено - описание не заполняются.
+ - Автозагрузка - загружать ли программу при старте ОС.
 # Скачать
 Скачать актуальную версию можно тут: https://github.com/monster1025/JiraTimeBot/releases/latest

src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs

@@ -17,10 +17,10 @@ namespace JiraTimeBot.Configuration
         {
             byte[] entropy = GetEntropy(address + username);
             byte[] pass = Encoding.UTF8.GetBytes(password);
-            byte[] crypted = ProtectedData.Protect(pass, entropy, DataProtectionScope.LocalMachine);
+            byte[] encrypted = ProtectedData.Protect(pass, entropy, DataProtectionScope.LocalMachine);
-            var cryptedBase64 = Convert.ToBase64String(crypted);
+            var encryptedBase64 = Convert.ToBase64String(encrypted);
 
-            return cryptedBase64;
+            return encryptedBase64;
         }
 
         public string Decrypt(string username, string password, string address)
@@ -32,7 +32,7 @@ namespace JiraTimeBot.Configuration
                 pass = ProtectedData.Unprotect(pass, entropy, DataProtectionScope.LocalMachine);
                 return Encoding.UTF8.GetString(pass);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 return "";
             }

src/JiraTimeBot/Configuration/Settings.cs

@@ -9,8 +9,8 @@ namespace JiraTimeBot.Configuration
 {
     public class Settings
     {
-        public int MinuterPerWorkDay = 8 * 60;
+        public int MinuterPerWorkDay { get; set; }
-        public int RountToMinutes { get; set; }
+        public int RoundToMinutes { get; set; }
 
         public string JiraUrl = "https://myteam.aeroclub.ru";
 
@@ -23,6 +23,7 @@ namespace JiraTimeBot.Configuration
         public WorkType WorkType { get; set; }
         public string JiraQuery { get; set; }
         public string TimeControlTask { get; set; }
+        public int RandomWorkMinutes { get; set; }
 
         public static Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter)
         {
@@ -60,7 +61,7 @@ namespace JiraTimeBot.Configuration
             var errors = new List<string>();
             message = null;
 
-            if (settings.RountToMinutes == default(int))
+            if (settings.RoundToMinutes == default(int))
             {
                 errors.Add("Укажите округление времени, например, 10 (минут)");
             }

src/JiraTimeBot/DI/ContainerBuilder.cs

@@ -9,6 +9,9 @@ using JiraTimeBot.TaskTime;
 using JiraTimeBot.UI.Tray;
 using System;
 using System.Windows.Forms;
+using JiraTimeBot.UI;
+using JiraTimeBot.UI.Startup;
+using JiraTimeBot.Update;
 
 namespace JiraTimeBot.DI
 {
@@ -36,12 +39,15 @@ namespace JiraTimeBot.DI
             _builder.Register(f => new TrayMenu()).As<ITrayMenu>().AsSelf();
             _builder.Register(c => new CommitSkipper()).As<ICommitSkipper>();
 
+            _builder.RegisterType<Updater>().As<IUpdater>();
+
             _builder.RegisterType<TechnicalInfoSkipper>().As<ITechnicalInfoSkipper>().AsSelf();
 
             _builder.RegisterType<MercurialLog>().As<IMercurialLog>().AsSelf();
             _builder.RegisterType<JiraCommitEmulator>().As<IMercurialLog>().AsSelf();
             _builder.RegisterAggregateService<IAllMercurialProviders>();
             
+            _builder.RegisterType<TaskTimeSpread>().As<ITaskTimeSpread>().AsSelf();
             _builder.RegisterType<TaskTimeByCommitsCalculator>().As<ITaskTimeCalculator>().AsSelf();
 
             _builder.RegisterType<WorkLogTasksProcessor>().AsSelf().As<ITasksProcessor>();
@@ -51,8 +57,13 @@ namespace JiraTimeBot.DI
             _builder.RegisterType<JiraDescriptionSource>().AsSelf().As<IJiraDescriptionSource>();
             _builder.RegisterType<JiraApi>().AsSelf().AsImplementedInterfaces();
 
+            _builder.RegisterType<JiraHistory>().AsSelf().As<IJiraHistory>();
+            
             _builder.Register(c => new Job(c.Resolve<IAllMercurialProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
 
+            _builder.RegisterType<AutoStartUp>().AsSelf().AsImplementedInterfaces();
+            _builder.RegisterType<frmSettings>().AsSelf().AsImplementedInterfaces();
+
             var container = _builder.Build();
             return container;
         }

src/JiraTimeBot/JiraIntegration/Comments/JiraDescriptionSource.cs

@@ -1,32 +1,13 @@
 using JiraTimeBot.Configuration;
 using JiraTimeBot.TaskTime.Objects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace JiraTimeBot.JiraIntegration.Comments
 {
     public class JiraDescriptionSource : IJiraDescriptionSource
     {
-        private readonly List<string> _dummyComments = new List<string>
-        {
-            "Написание кода", "написание кода", "программирование", "реализация задачи", "кодинг", "код + тесты", 
-            "кодинг", "написание кода и тестов"
-        };
-
         public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog, Settings settings)
         {
-            if (addCommentsToWorklog)
+            return addCommentsToWorklog ? taskTimeItem.Description : "";
-            {
-                return taskTimeItem.Description;
-            }
-
-            if (settings.WorkType == WorkType.Mercurial)
-            {
-                return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
-            }
-
-            return "";
         }
     }
 }

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -9,7 +9,15 @@ using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.JiraIntegration
 {
-    public class JiraApi
+    public interface IJiraApi
+    {
+        List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default);
+        string GetTaskName(string branch, Settings settings);
+        List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default);
+        void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default);
+    }
+
+    public class JiraApi : IJiraApi
     {
         private readonly ILog _log;
         private readonly IJiraDescriptionSource _descriptionSource;
@@ -51,8 +59,7 @@ namespace JiraTimeBot.JiraIntegration
 
             try
             {
-                List<Issue> affectedIssues =
+                List<Issue> affectedIssues = jira.Issues.GetIssuesFromJqlAsync(jql, 100, 0, cancellationToken).Result.ToList();
-                    jira.Issues.GetIssuesFromJqlAsync(jql, 100, 0, cancellationToken).Result.ToList();
                 return affectedIssues;
             }
             catch (Exception ex)
@@ -62,15 +69,44 @@ namespace JiraTimeBot.JiraIntegration
             }
         }
 
-        public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false)
+        public List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
         {
+            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))
+        {
+            var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
+            foreach (var issue in alreadyLoggedToday)
+            {
+                if (!taskTimeItems.Any(f => f.Branch.Equals(issue.Key.Value, StringComparison.InvariantCulture)))
+                {
+                    var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
+                    var userWorklogs = workLogs.Where(w =>
+                        w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
+                            StringComparison.InvariantCultureIgnoreCase)).ToList();
+                    foreach (var userWorklog in userWorklogs)
+                    {
+                        _log.Trace($"Удаляю добавленный руками WorkLog для задачи {issue.Key.Value}: {userWorklog.TimeSpent}, {userWorklog.Comment}.");
+
+                        if (!dummy)
+                        {
+                            issue.DeleteWorklogAsync(userWorklog, token: cancellationToken);
+                        }
+                    }
+                }
+            }
+        }
+
+        public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            date = date.GetValueOrDefault(DateTime.Now.Date).Date;
             var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
 
-            if (date == null)
+            //Удаляем добавленные вручную пользователем данные.
-            {
+            RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
-                date = DateTime.Now.Date;
-            }
-            date = date.Value.Date;
 
             foreach (TaskTimeItem taskTimeItem in taskTimeItems)
             {
@@ -79,9 +115,9 @@ namespace JiraTimeBot.JiraIntegration
                 {
                     issue = jira.Issues.Queryable.FirstOrDefault(f => f.Key == taskTimeItem.Branch);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-
+                    _log.Error($"Ошибка получения задачи из JIRA: {ex.Message} - {ex.InnerException?.Message}");
                 }
                 if (issue == null)
                 {
@@ -90,28 +126,41 @@ namespace JiraTimeBot.JiraIntegration
                 }
 
                 var hasTodayWorklog = false;
-                var workLogs = issue.GetWorklogsAsync().Result;
+                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();
+                var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
 
                 foreach (var workLog in userWorklogs)
                 {
                     var timeSpent = TimeSpan.FromSeconds(workLog.TimeSpentInSeconds);
-                    var timeDiff = Math.Abs((timeSpent - taskTimeItem.Time).TotalMinutes);
+                    var timeDiff = Math.Abs((timeSpent - taskTimeItem.TimeSpent).TotalMinutes);
-                    if (timeDiff > 1 || userWorklogs.Count > 1)
+                    if (timeDiff > 1 || userWorklogs.Count > 1 || userWorklogs.First().Comment != comment)
                     {
                         if (timeDiff > 1)
                         {
                             _log.Trace($"Время отличается на {timeDiff} минут, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
                         }
-                        else
+                        else if (userWorklogs.Count > 1)
                         {
                             _log.Trace($"Найдено более одного ворклога на задачу, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
                         }
+                        else
+                        {
+                            _log.Trace($"Описание отличается, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
+                        }
                         if (!dummy)
                         {
-                            issue.DeleteWorklogAsync(workLog);
+                            try
+                            {
+                                issue.DeleteWorklogAsync(workLog, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken);
+                            }
+                            catch (Exception ex)
+                            {
+                                _log.Error($"Не могу удалить Worklog по задаче {taskTimeItem.Branch}: {ex.Message}.");
+                                continue;
+                            }
                         }
                         hasTodayWorklog = false;
                     }
@@ -124,14 +173,20 @@ namespace JiraTimeBot.JiraIntegration
 
                 if (!hasTodayWorklog)
                 {
-                    var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m";
+                    var timeSpentJira = $"{taskTimeItem.TimeSpent.TotalMinutes}m";
-
-                    var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
 
                     Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment);
                     if (!dummy)
                     {
-                        workLogToAdd = issue.AddWorklogAsync(workLogToAdd).Result;
+                        try
+                        {
+                            workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken).Result;
+                        }
+                        catch (Exception ex)
+                        {
+                            _log.Error($"Не могу добавить Worklog по задаче {taskTimeItem.Branch}: {ex.Message} ({ex.InnerException?.Message}).");
+                            continue;
+                        }
                     }
                     _log.Trace($"Добавили Worklog для {taskTimeItem.Branch}: {workLogToAdd.Author} {workLogToAdd.CreateDate}: {workLogToAdd.TimeSpent}");
                 }

src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs

@@ -5,7 +5,8 @@ using System.Threading;
 using Atlassian.Jira;
 using JiraTimeBot.Configuration;
 using JiraTimeBot.Mercurial;
-using JiraTimeBot.Mercurial.Objects;
+using JiraTimeBot.TaskTime.Objects;
+
 
 namespace JiraTimeBot.JiraIntegration
 {
@@ -20,48 +21,55 @@ namespace JiraTimeBot.JiraIntegration
             _jiraApi = jiraApi;
         }
 
-        public List<MercurialCommitItem> GetMercurialLog(Settings settings,
+        public List<TaskTimeItem> GetMercurialLog(Settings settings,
                                     DateTime? date = null,
                                     CancellationToken cancellationToken = default(CancellationToken))
         {
             date = date.GetValueOrDefault(DateTime.Now.Date);
-            var workTasks = new List<MercurialCommitItem>();
+            var workTasks = new List<TaskTimeItem>();
             var issues = _jiraApi.GetIssuesByJQL(settings.JiraQuery, settings, date, cancellationToken);
 
             foreach (var issue in issues)
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
-                    return new List<MercurialCommitItem>();
+                    return new List<TaskTimeItem>();
                 }
                 var comments = issue.GetCommentsAsync(cancellationToken).Result?.ToList() ?? new List<Comment>();
 
                 var user = settings.JiraUserName;
+                //user = "Zoya.Aleksandridi";
                 var userComments = comments.Where(f => f.Author.Equals(user, StringComparison.InvariantCultureIgnoreCase)).ToList();
                 _log.Trace($"Получены комментарии по задаче {issue.Key} ({issue.Type?.Name}): {userComments.Count}.");
 
                 if (userComments.Any())
                 {
-                    foreach (var comment in userComments)
+                    foreach (var comment in userComments.OrderBy(f=>f.CreatedDate))
                     {
-                        workTasks.Add(new MercurialCommitItem
+                        var item = new TaskTimeItem(issue.Key.Value,
-                        {
+                            issue.Summary,
-                            Description = issue.Summary,
+                            issue.Project,
-                            Time = issue.Updated.GetValueOrDefault(date.Value),
+                            issue.Updated.GetValueOrDefault(date.Value),
-                            Branch = issue.Key.Value,
+                            TimeSpan.Zero,
-                            FilesAffected = 1
+                            1,
-                        });
+                            1,
+                            "",
+                            CommitType.Task);
+                        workTasks.Add(item);
                     }
                 }
                 else
                 {
-                    workTasks.Add(new MercurialCommitItem
+                    var item = new TaskTimeItem(issue.Key.Value,
-                    {
+                        issue.Summary,
-                        Description = issue.Summary,
+                        issue.Project,
-                        Time = issue.Updated.GetValueOrDefault(date.Value),
+                        issue.Updated.GetValueOrDefault(date.Value),
-                        Branch = issue.Key.Value,
+                        TimeSpan.Zero,
-                        FilesAffected = 1
+                        1,
-                    });
+                        1,
+                        "",
+                        CommitType.Task);
+                    workTasks.Add(item);
                 }
             }
 

src/JiraTimeBot/JiraIntegration/JiraHistory.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using JiraTimeBot.Configuration;
+using JiraTimeBot.TaskTime.Objects;
+
+namespace JiraTimeBot.JiraIntegration
+{
+    public interface IJiraHistory
+    {
+        List<TaskTimeItem> GetDayWorklogs(DateTime date,
+                                          Settings settings,
+                                          CancellationToken cancellationToken = default(CancellationToken));
+    }
+
+    public class JiraHistory: IJiraHistory
+    {
+        private readonly IJiraApi _jiraApi;
+
+        public JiraHistory(IJiraApi jiraApi)
+        {
+            _jiraApi = jiraApi;
+        }
+
+        public List<TaskTimeItem> GetDayWorklogs(DateTime date,
+                                                 Settings settings,
+                                                 CancellationToken cancellationToken = default(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.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(user,
+                        StringComparison.InvariantCultureIgnoreCase)).ToList();
+                if (!userWorklogs.Any())
+                {
+                    continue;
+                }
+
+                var firstWorklog = userWorklogs.First();
+
+                var description = string.Join("\r\n", 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("Подготовка и публикация"))
+                {
+                    taskType = CommitType.Release;
+                }
+
+                resultItems.Add(new TaskTimeItem(issue.Key.Value, description, issue.Project, startDate, totalTime, commits, 1, "", taskType));   
+            }
+
+            return resultItems;
+        }
+    }
+}

src/JiraTimeBot/JiraTimeBot.csproj

@@ -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>
@@ -81,6 +82,7 @@
     <Compile Include="DI\ContainerBuilder.cs" />
     <Compile Include="JiraIntegration\Comments\IJiraDescriptionSource.cs" />
     <Compile Include="JiraIntegration\Comments\JiraDescriptionSource.cs" />
+    <Compile Include="JiraIntegration\JiraHistory.cs" />
     <Compile Include="Job.cs" />
     <Compile Include="Logger.cs" />
     <Compile Include="Configuration\Settings.cs" />
@@ -92,6 +94,8 @@
     <Compile Include="Mercurial\IMercurialLog.cs" />
     <Compile Include="Mercurial\Modifiers\TechnicalInfoSkipper.cs" />
     <Compile Include="TasksProcessors\IAllTasksProcessors.cs" />
+    <Compile Include="TaskTime\Objects\CommitType.cs" />
+    <Compile Include="TaskTime\TaskTimeSpread.cs" />
     <Compile Include="UI\frmMain.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -99,7 +103,6 @@
       <DependentUpon>frmMain.cs</DependentUpon>
     </Compile>
     <Compile Include="JiraIntegration\JiraApi.cs" />
-    <Compile Include="Mercurial\Objects\MercurialCommitItem.cs" />
     <Compile Include="Mercurial\MercurialLog.cs" />
     <Compile Include="Configuration\PasswordEncryptionClass.cs" />
     <Compile Include="Program.cs" />
@@ -116,11 +119,14 @@
     <Compile Include="UI\frmSettings.Designer.cs">
       <DependentUpon>frmSettings.cs</DependentUpon>
     </Compile>
+    <Compile Include="UI\Startup\AutoStartUp.cs" />
+    <Compile Include="UI\Tray\SingleInstance.cs" />
     <Compile Include="UI\Tray\ITrayMenu.cs" />
     <Compile Include="UI\Tray\RestoreFromTray.cs" />
     <Compile Include="UI\Tray\TrayMenu.cs" />
     <Compile Include="Update\GitHubDataObjects.cs" />
-    <Compile Include="Update\UpdateChecker.cs" />
+    <Compile Include="Update\IUpdater.cs" />
+    <Compile Include="Update\Updater.cs" />
     <EmbeddedResource Include="UI\frmMain.resx">
       <DependentUpon>frmMain.cs</DependentUpon>
     </EmbeddedResource>

src/JiraTimeBot/Job.cs

@@ -5,7 +5,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using JiraTimeBot.Configuration;
 using JiraTimeBot.Mercurial;
-using JiraTimeBot.Mercurial.Objects;
 using JiraTimeBot.TasksProcessors;
 using JiraTimeBot.TaskTime;
 using JiraTimeBot.TaskTime.Objects;
@@ -40,43 +39,72 @@ namespace JiraTimeBot
                 daysDiff = -1;
             }
 
+            var setForDate = DateTime.Now.Date;
             while (true)
             {
-                DateTime date = DateTime.Now.Date.AddDays(daysDiff);
+                DateTime realDate = DateTime.Now.Date.AddDays(daysDiff);
 
-                IMercurialLog mercurial = _mercurialProviders.MercurialLog;
+                if (SetTaskTimesForDateImpl(setForDate, realDate, settings, tasksProcessor, dummyMode, cancellationToken))
-                if (settings.WorkType == WorkType.JiraLogs)
                 {
-                    _log.Info("Использую Jira как источник информации.");
+                    return;
-                    mercurial = _mercurialProviders.JiraCommitEmulator;
                 }
-                List<MercurialCommitItem> commits = mercurial.GetMercurialLog(settings, date, cancellationToken);
-                List<TaskTimeItem> taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
-
                 if (cancellationToken.IsCancellationRequested)
                 {
                     return;
                 }
 
-                if (!taskTimes.Any())
+                _log.Warn($"{realDate:dd.MM.yyyy} вы не сделали ничего полезного =) Использую предыдущий день.");
+                daysDiff--;
+                if (daysDiff < -7)
                 {
-                    _log.Warn($"{date:dd.MM.yyyy} вы не сделали ничего полезного =) Использую предыдущий день.");
+                    _log.Error("Не нашли ни одного коммита за предыдущие 7 дней. Возможно вы в отпуске? Выхожу.");
-                    daysDiff--;
+                    return;
-                    if (daysDiff < -7)
-                    {
-                        _log.Error("Не нашли ни одного коммита за предыдущие 7 дней. Возможно вы в отпуске? Выхожу.");
-                        return;
-                    }
-
-                    continue;
                 }
-
-                tasksProcessor.Process(date, taskTimes, settings, dummyMode);
-
-                _log.Info("Готово.");
-                return;
             }
         }
 
+        public Task SetTaskTimesForDate(DateTime setForDate, DateTime realDate, Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
+        {
+            _log.Info("Начинаем работу");
+
+            return Task.Run(() => SetTaskTimesForDateImpl(setForDate, realDate, settings, tasksProcessor, dummyMode, cancellationToken), cancellationToken);
+        }
+
+        private bool SetTaskTimesForDateImpl(DateTime setForDate, DateTime realDate, Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
+        {
+            IMercurialLog mercurial = _mercurialProviders.MercurialLog;
+            if (settings.WorkType == WorkType.JiraLogs)
+            {
+                _log.Info("Использую Jira как источник информации.");
+                mercurial = _mercurialProviders.JiraCommitEmulator;
+            }
+
+            List<TaskTimeItem> taskTimes = null;
+            if (!(tasksProcessor is MeetingProcessor))
+            {
+                List<TaskTimeItem> commits = mercurial.GetMercurialLog(settings, realDate, cancellationToken);
+                taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
+            }
+            else
+            {
+                var provider = _mercurialProviders.JiraHistory;
+                taskTimes = provider.GetDayWorklogs(realDate, settings, cancellationToken);
+            }
+
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return false;
+            }
+
+            if (!taskTimes.Any())
+            {
+                return false;
+            }
+
+            tasksProcessor.Process(setForDate, realDate, taskTimes, settings, dummyMode, cancellationToken);
+
+            _log.Info("Готово.");
+            return true;
+        }
     }
 }

src/JiraTimeBot/Mercurial/IAllMercurialProviders.cs

@@ -6,5 +6,6 @@ namespace JiraTimeBot.Mercurial
     {
         MercurialLog MercurialLog { get; }
         JiraCommitEmulator JiraCommitEmulator { get; }
+        IJiraHistory JiraHistory { get; }
     }
 }

src/JiraTimeBot/Mercurial/IMercurialLog.cs

@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Threading;
 using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Objects;
+using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.Mercurial
 {
     public interface IMercurialLog
     {
-        List<MercurialCommitItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken));
+        List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading;
 using JiraTimeBot.Configuration;
 using JiraTimeBot.Mercurial.Modifiers;
-using JiraTimeBot.Mercurial.Objects;
+using JiraTimeBot.TaskTime.Objects;
 using Mercurial;
 
 namespace JiraTimeBot.Mercurial
@@ -24,22 +24,22 @@ namespace JiraTimeBot.Mercurial
             _technicalInfoSkipper = technicalInfoSkipper;
         }
         
-        public List<MercurialCommitItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
             {
                 _log.Error("Папка с репо не сушествует.");
-                return new List<MercurialCommitItem>();
+                return new List<TaskTimeItem>();
             }
 
             date = date.GetValueOrDefault(DateTime.Now.Date);
 
-            var workTasks = new List<MercurialCommitItem>();
+            var workTasks = new List<TaskTimeItem>();
             foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath))
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
-                    return new List<MercurialCommitItem>();
+                    return new List<TaskTimeItem>();
                 }
 
                 //var project = new DirectoryInfo(repoDirectory).Name;
@@ -48,6 +48,8 @@ namespace JiraTimeBot.Mercurial
                     continue;
                 }
 
+                var directoryInfo = new DirectoryInfo(repoDirectory);
+
                 var repo = new Repository(repoDirectory);
                 var logCommand = new LogCommand
                 {
@@ -62,7 +64,7 @@ namespace JiraTimeBot.Mercurial
                 {
                     if (cancellationToken.IsCancellationRequested)
                     {
-                        return new List<MercurialCommitItem>();
+                        return new List<TaskTimeItem>();
                     }
 
                     var commitMessage = FixEncoding(changeset.CommitMessage);
@@ -72,24 +74,46 @@ namespace JiraTimeBot.Mercurial
                     }
                     commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
 
-                    workTasks.Add(new MercurialCommitItem
+                    var task = new TaskTimeItem(changeset.Branch,
+                        commitMessage,
+                        directoryInfo.Name,
+                        changeset.Timestamp,
+                        TimeSpan.Zero,
+                        1,
+                        changeset.PathActions.Count, 
+                        "",
+                        GetCommitType(changeset.Branch));
+
+                    if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
                     {
-                        Description = commitMessage,
+                        var description = task.Description;
-                        Branch = changeset.Branch,
+                        if (description.Contains("\n"))
-                        Time = changeset.Timestamp,
+                        {
-                        FilesAffected = changeset.PathActions.Count
+                            description = description.Split('\n')[0];
-                    });
+                        }
+                        var branch = description.Replace("Merge with", "").Replace(" ", "");
+                        var release = task.Branch.Replace("release", "");
+
+                        task.Branch = branch;
+                        task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
+                        task.ReleaseVersion = release;
+                    }
+                    workTasks.Add(task);
                     _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
                 }
             }
             if (!workTasks.Any())
             {
-                return new List<MercurialCommitItem>();
+                return new List<TaskTimeItem>();
             }
 
             return workTasks;
         }
 
+        private CommitType GetCommitType(string branch)
+        {
+            return branch.StartsWith("release") ? CommitType.Release : CommitType.Task;
+        }
 
         private string FixEncoding(string source)
         {

src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs

@@ -6,14 +6,18 @@ namespace JiraTimeBot.Mercurial.Modifiers
     {
         public bool IsNeedToSkip(string branch, string commitMessage)
         {
+            if (branch.StartsWith("release") && commitMessage.StartsWith("Merge with", StringComparison.InvariantCultureIgnoreCase))
+            {
+                return false;
+            }
             if (!branch.Contains("-"))
             {
                 return true;
             }
 
             //Пропускаем Close и Merge коммиты
-            if (commitMessage.StartsWith($"Close {branch} ", StringComparison.InvariantCultureIgnoreCase) ||
+            if (commitMessage.StartsWith($"Close {branch}", StringComparison.InvariantCultureIgnoreCase) ||
-                commitMessage.StartsWith($"Merge with ", StringComparison.InvariantCultureIgnoreCase))
+                commitMessage.StartsWith($"Merge with", StringComparison.InvariantCultureIgnoreCase))
             {
                 return true;
             }

src/JiraTimeBot/Mercurial/Objects/MercurialCommitItem.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace JiraTimeBot.Mercurial.Objects
-{
-    public class MercurialCommitItem
-    {
-        public string Description { get; set; }
-        public string Branch { get; set; }
-        public DateTime Time { get; set; }
-        public int FilesAffected { get; set; }
-    }
-}

src/JiraTimeBot/Program.cs

@@ -1,9 +1,8 @@
 using JiraTimeBot.UI;
 using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
+using JiraTimeBot.UI.Tray;
 
 namespace JiraTimeBot
 {
@@ -25,7 +24,7 @@ namespace JiraTimeBot
             }
             else
             {
-                MessageBox.Show("Another instance of the app is already running.");
+                SingleInstance.ShowFirstInstance();
             }
         }
     }

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -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.29")] 
+[assembly: AssemblyVersion("1.0.67")] 
-[assembly: AssemblyFileVersion("1.0.29")] 
+[assembly: AssemblyFileVersion("1.0.67")] 
-[assembly: AssemblyInformationalVersion("1.0.29")] 
+[assembly: AssemblyInformationalVersion("1.0.67")] 

src/JiraTimeBot/TaskTime/ITaskTimeCalculator.cs

@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using System.Threading;
 using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Objects;
+
 using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.TaskTime
 {
     public interface ITaskTimeCalculator
     {
-        List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commitItems, Settings settings, CancellationToken cancellationToken = default(CancellationToken));
+        List<TaskTimeItem> CalculateTaskTime(List<TaskTimeItem> commitItems, Settings settings, CancellationToken cancellationToken = default(CancellationToken));
     }
 }

src/JiraTimeBot/TaskTime/Objects/CommitType.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace JiraTimeBot.TaskTime.Objects
+{
+    [Flags]
+    public enum CommitType {
+        Task = 1,
+        Release = 2
+    }
+}

src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs

@@ -6,10 +6,34 @@ namespace JiraTimeBot.TaskTime.Objects
     {
         public string Description { get; set; }
         public string Branch { get; set; }
-        public TimeSpan Time { get; set; }
-        public int Commits { get; set; }
-
         public DateTime StartTime { get; set; }
-        public DateTime EndTime { get; set; }
+        public TimeSpan TimeSpent { get; set; }
+        public int Commits { get; set; }
+        public int FilesAffected { get; set; }
+        public CommitType Type { get; set; }
+        public string Project { get; set; }
+        public string ReleaseVersion { get; set; }
+
+        public TaskTimeItem(string branch, string description, string project, DateTime startTime, TimeSpan timeSpent, int commits, 
+                            int filesAffected = 1, string releaseVersion = "", CommitType type = CommitType.Task)
+        {
+            Branch = branch;
+            Description = description;
+            Project = project;
+            Commits = commits;
+            TimeSpent = timeSpent;
+            StartTime = startTime;
+            FilesAffected = filesAffected;
+            ReleaseVersion = releaseVersion;
+            Type = type;
+        }
+
+        public void MergeWith(TaskTimeItem toMerge)
+        {
+            Commits += toMerge.Commits;
+            TimeSpent += toMerge.TimeSpent;
+            Description += "\r\n" + toMerge.Description;
+            Type |= toMerge.Type;
+        }
     }
 }

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Web.UI.WebControls.WebParts;
 using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Objects;
+
 using JiraTimeBot.TaskTime.Objects;
 
 namespace JiraTimeBot.TaskTime
@@ -13,102 +12,133 @@ namespace JiraTimeBot.TaskTime
     public class TaskTimeByCommitsCalculator: ITaskTimeCalculator
     {
         private readonly ILog _log;
+        private readonly ITaskTimeSpread _spreadHelper;
 
-        public TaskTimeByCommitsCalculator(ILog log)
+        public TaskTimeByCommitsCalculator(ILog log, ITaskTimeSpread spreadHelper)
         {
             _log = log;
+            _spreadHelper = spreadHelper;
         }
 
-        public List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken))
+        public List<TaskTimeItem> CalculateTaskTime(List<TaskTimeItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken))
         {
-            int minutesPerWorkDay = settings.MinuterPerWorkDay;
+            int minutesPerWorkDay = settings.MinuterPerWorkDay + GetRandomMinutes(settings);
-            int remainMinutes = settings.MinuterPerWorkDay;
+            int workHours = (settings.MinuterPerWorkDay / 60);
             int totalCommitsCount = commits.Count;
+            var taskCommits = commits.Where(f => f.Type == CommitType.Task).ToList();
+            var releaseCommits = commits.Where(f => f.Type == CommitType.Release).ToList();
 
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return new List<TaskTimeItem>();
+            }
             if (!commits.Any())
             {
                 return new List<TaskTimeItem>();
             }
 
-            //если кол-во коммитов более чем кол-во интервалов - то уменьшим интервал вдвое.
+            FixTooBigInterval(settings, workHours, totalCommitsCount);
-            while (totalCommitsCount > (8 * (60.0 / settings.RountToMinutes)))
+
+            int remainMinutes = minutesPerWorkDay;
+
+            var workTimeItems = new List<TaskTimeItem>();
+            var timeControlTask = GetTimeControlTask(settings.TimeControlTask);
+            if (timeControlTask != null)
             {
-                settings.RountToMinutes = (int)RoundTo((decimal)(settings.RountToMinutes / 2.0), 5);
+                workTimeItems.Add(timeControlTask);
-                _log.Info($"Слишком много задач - уменьшаю интервал до {settings.RountToMinutes}.");
+                remainMinutes -= (int)timeControlTask.TimeSpent.TotalMinutes;
-                if (settings.RountToMinutes == 5)
-                {
-                    break;
-                }
             }
 
-            List<TaskTimeItem> workTimeItems = new List<TaskTimeItem>();
+            if (releaseCommits.Any())
-            //Если указана задача контроля времени - то спишем туда 30 минут и вычеркнем их из общего рабочего времени.
-            if (!string.IsNullOrEmpty(settings.TimeControlTask))
             {
-                minutesPerWorkDay = minutesPerWorkDay - 30;
+                var releaseTasks = _spreadHelper.SpreadTime(releaseCommits, 30, 1);
-                workTimeItems.Add(new TaskTimeItem
+                workTimeItems.AddRange(releaseTasks);
-                {
+                remainMinutes -= releaseTasks.Sum(f=>(int)f.TimeSpent.TotalMinutes);
-                    Time = TimeSpan.FromMinutes(30),
-                    Branch = settings.TimeControlTask,
-                    Commits = 1,
-                    Description = "Время на учет задач",
-                    StartTime = DateTime.Now.Date
-                });
             }
 
-            //Нам нужно раскидать 480 минут в день.
+            var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
-            foreach (var taskGroup in commits.GroupBy(f => f.Branch).OrderByDescending(f=>f.Count()))
+            foreach (var workTask in workTasks)
             {
-                if (cancellationToken.IsCancellationRequested)
+                TaskTimeItem existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
+                if (existingItem != null)
                 {
-                    return new List<TaskTimeItem>();
+                    existingItem.MergeWith(workTask);
+                    continue;
                 }
 
-                int currentTaskCommits = taskGroup.Count();
+                workTimeItems.Add(workTask);
-                int currentTaskTime = (int)RoundTo(minutesPerWorkDay / totalCommitsCount * currentTaskCommits, settings.RountToMinutes);
-                remainMinutes = remainMinutes - currentTaskTime;
-
-                var orderedTasks = taskGroup.OrderBy(f => f.Time).ToArray();
-                StringBuilder sb = new StringBuilder();
-                foreach (var task in orderedTasks)
-                {
-                    sb.AppendLine($"- {task.Description}");
-                }
-
-                var taskTimeItem = new TaskTimeItem
-                {
-                    Branch = taskGroup.Key,
-                    Time = TimeSpan.FromMinutes(currentTaskTime),
-                    Commits = taskGroup.Count(),
-                    Description = sb.ToString(),
-
-                    StartTime = orderedTasks.First().Time,
-                    EndTime = orderedTasks.Last().Time
-                };
-
-                workTimeItems.Add(taskTimeItem);
             }
-            if (!workTimeItems.Any())
+            workTimeItems = workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();
-            {
-                return new List<TaskTimeItem>();
-            }
-            workTimeItems = workTimeItems.OrderByDescending(f => f.Time).ToList();
 
+            remainMinutes = minutesPerWorkDay - (int) workTimeItems.Sum(f => f.TimeSpent.TotalMinutes);
             if (remainMinutes != 0)
             {
                 _log.Trace($"Погрешность распределения времени: {remainMinutes}. Добавляю к первой задаче.");
             }
-
+            if ((workTimeItems.First().TimeSpent.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0) || remainMinutes > 0)
-            if (workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0)
             {
                 //если переборщили или не достаточно добавили до 8 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
-                workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
+                workTimeItems.First().TimeSpent += TimeSpan.FromMinutes(remainMinutes);
             }
 
-            return workTimeItems;
+            PrintTotal(workTimeItems);
+
+            return workTimeItems.OrderByDescending(f=>f.TimeSpent).ToList();
         }
 
 
+        private TaskTimeItem GetTimeControlTask(string timeControlTask, int minutes = 30)
+        {
+            //Если указана задача контроля времени - то спишем туда 30 минут и вычеркнем их из общего рабочего времени.
+            if (!string.IsNullOrEmpty(timeControlTask))
+            {
+                return new TaskTimeItem(timeControlTask,
+                    "Ведение учета времени",
+                    "Service",
+                    DateTime.Now,
+                    TimeSpan.FromMinutes(minutes),
+                    1,
+                    1,
+                    "",
+                    CommitType.Task);
+            }
+
+            return null;
+        }
+
+        private void FixTooBigInterval(Settings settings, int workHours, int totalCommitsCount)
+        {
+            //если кол-во коммитов более чем кол-во интервалов - то уменьшим интервал вдвое.
+            while (totalCommitsCount > (workHours * (60.0 / settings.RoundToMinutes)))
+            {
+                settings.RoundToMinutes = (int) RoundTo((decimal) (settings.RoundToMinutes / 2.0), 5);
+                _log.Info($"Слишком много задач - уменьшаю интервал до {settings.RoundToMinutes}.");
+                if (settings.RoundToMinutes == 5)
+                {
+                    break;
+                }
+            }
+        }
+
+        private int GetRandomMinutes(Settings settings)
+        {
+            var rand = new Random();
+            int randomIntervals = settings.RandomWorkMinutes / settings.RoundToMinutes;
+            int randomMinutes = rand.Next(0, randomIntervals + 1) * settings.RoundToMinutes;
+            return randomMinutes;
+        }
+
+        private void PrintTotal(List<TaskTimeItem> workTimeItems)
+        {
+            var totalTime = TimeSpan.Zero;
+            foreach (var workTimeItem in workTimeItems)
+            {
+                totalTime += workTimeItem.TimeSpent;
+            }
+
+            _log.Trace($"Итоговое реально проставляемое время: {totalTime}");
+        }
+
 
         private decimal RoundTo(decimal value, decimal to = 15, bool up = true)
         {

src/JiraTimeBot/TaskTime/TaskTimeSpread.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using JiraTimeBot.TaskTime.Objects;
+
+namespace JiraTimeBot.TaskTime
+{
+    public interface ITaskTimeSpread
+    {
+        List<TaskTimeItem> SpreadTime(List<TaskTimeItem> source,
+                                      int minutes,
+                                      int roundToMinutes,
+                                      bool roundUp = false,
+                                      bool appendTime = true);
+    }
+    public class TaskTimeSpread: ITaskTimeSpread
+    {
+        public List<TaskTimeItem> SpreadTime(List<TaskTimeItem> source, int minutes, int roundToMinutes, bool roundUp = false, bool appendTime = true)
+        {
+            List<TaskTimeItem> newList = new List<TaskTimeItem>();
+
+            //Нам нужно раскидать 480 минут в день.
+            foreach (var taskGroup in source.GroupBy(f => f.Branch).OrderByDescending(f => f.Count()))
+            {
+                int currentTaskCommits = taskGroup.Count();
+                int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, roundUp);
+
+                var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray();
+                StringBuilder sb = new StringBuilder();
+                foreach (var taskDescription in orderedTasks.Select(f=>f.Description).Distinct())
+                {
+                    sb.AppendLine($"- {taskDescription}");
+                }
+
+                var timeSpent = appendTime
+                    ? TimeSpan.FromMinutes(taskGroup.Sum(f => f.TimeSpent.TotalMinutes)) +
+                      TimeSpan.FromMinutes(currentTaskTime)
+                    : TimeSpan.FromMinutes(currentTaskTime);
+
+                var taskTimeItem = new TaskTimeItem(
+                    taskGroup.Key,
+                    sb.ToString(),
+                    taskGroup.First().Project,
+                    taskGroup.Min(f => f.StartTime),
+                    timeSpent,
+                    taskGroup.Sum(f => f.Commits),
+                    taskGroup.Sum(f => f.FilesAffected),
+                    taskGroup.First().ReleaseVersion,
+                    taskGroup.First().Type);
+
+                newList.Add(taskTimeItem);
+            }
+
+            return newList;
+        }
+
+        private decimal RoundTo(decimal value, decimal to = 15, bool up = true)
+        {
+            if ((value % to) == 0)
+                return value;
+            if (up)
+                return (value - (value % to) + to);
+
+            return (value - (value % to));
+        }
+    }
+}

src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using JiraTimeBot.Configuration;
 using JiraTimeBot.TaskTime.Objects;
 
@@ -7,6 +8,6 @@ namespace JiraTimeBot.TasksProcessors
 {
     interface ITasksProcessor
     {
-        void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode);
+        void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken));
     }
 }

src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using JiraTimeBot.Configuration;
 using JiraTimeBot.JiraIntegration;
 using JiraTimeBot.TaskTime.Objects;
@@ -18,14 +19,23 @@ namespace JiraTimeBot.TasksProcessors
             _jiraApi = jiraApi;
         }
 
-        public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode)
+        public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
         {
-            _log.Trace($"На реальную дату {date: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.OrderByDescending(f => f.Time))
+            foreach (var taskTime in taskTimes.Where(f=>f.Type.HasFlag(CommitType.Task)).OrderByDescending(f => f.TimeSpent))
             {
                 var taskName = _jiraApi.GetTaskName(taskTime.Branch, settings);
-                _log.Trace($" - [{taskTime.Branch}, коммитов {taskTime.Commits}]: {taskName} - {taskTime.Time}");
+                _log.Trace($" - [{taskTime.Branch}, коммитов {taskTime.Commits}]: {taskName} - {taskTime.TimeSpent}");
+            }
+
+            var releases = taskTimes.Where(f => f.Type.HasFlag(CommitType.Release)).GroupBy(f=>f.Description);
+            foreach (var release in releases)
+            {
+                var sum = release.Sum(f => (int) f.TimeSpent.TotalMinutes);
+                var description = release.First().Description.Replace(Environment.NewLine, "");
+                _log.Trace($" - [Release, задач {release.Count()}]: {description} - {TimeSpan.FromMinutes(sum)}");
             }
         }
     }

src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using JiraTimeBot.Configuration;
 using JiraTimeBot.JiraIntegration;
 using JiraTimeBot.TaskTime.Objects;
@@ -17,15 +18,15 @@ namespace JiraTimeBot.TasksProcessors
             _jiraApi = jiraApi;
         }
 
-        public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode)
+        public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
         {
-            _log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:");
+            _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");
             foreach (var taskTime in taskTimes)
             {
-                _log.Trace($"- {taskTime.Branch} (коммитов {taskTime.Commits}): {taskTime.Time}");
+                _log.Trace($"- {taskTime.Branch} (коммитов {taskTime.Commits}): {taskTime.TimeSpent}");
             }
 
-            _jiraApi.SetTodayWorklog(taskTimes, settings, dummy: dummyMode, addCommentsToWorklog: settings.AddCommentsToWorklog);
+            _jiraApi.SetTodayWorklog(taskTimes, settings, date: setForDate, dummy: dummyMode, addCommentsToWorklog: settings.AddCommentsToWorklog, cancellationToken: cancellationToken);
         }
     }
 }

src/JiraTimeBot/UI/Startup/AutoStartUp.cs

@@ -0,0 +1,27 @@
+using System.Windows.Forms;
+using Microsoft.Win32;
+
+namespace JiraTimeBot.UI.Startup
+{
+    public class AutoStartUp
+    {
+        readonly RegistryKey _rkApp = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
+
+        public bool Get()
+        {
+            return _rkApp.GetValue(Application.ProductName) != null;
+        }
+
+        public void Set(bool autoStart)
+        {
+            if (autoStart)
+            {
+                _rkApp.SetValue(Application.ProductName, Application.ExecutablePath);
+            }
+            else
+            {
+                _rkApp.DeleteValue(Application.ProductName, false);
+            }
+        }
+    }
+}

src/JiraTimeBot/UI/Tray/SingleInstance.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace JiraTimeBot.UI.Tray
+{
+    static class SingleInstance
+    {
+        public static readonly int WM_SHOWFIRSTINSTANCE = RegisterWindowMessage($"WM_SHOWFIRSTINSTANCE|{AssemblyGuid}");
+        
+        public static void ShowFirstInstance()
+        {
+            const int HWND_BROADCAST = 0xffff;
+            PostMessage((IntPtr)HWND_BROADCAST, WM_SHOWFIRSTINSTANCE, IntPtr.Zero, IntPtr.Zero);
+        }
+        
+        public static string AssemblyGuid
+        {
+            get
+            {
+                object[] attributes = Assembly.GetEntryAssembly().GetCustomAttributes(typeof(System.Runtime.InteropServices.GuidAttribute), false);
+                if (attributes.Length == 0) {
+                    return string.Empty;
+                }
+                return ((GuidAttribute)attributes[0]).Value;
+            }
+        }
+        
+        [DllImport("user32")]
+        public static extern int RegisterWindowMessage(string message);
+	
+        [DllImport("user32")]
+        public static extern bool PostMessage(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam);
+    }
+}

src/JiraTimeBot/UI/frmMain.Designer.cs

@@ -30,37 +30,25 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
-            this.txtLog = new System.Windows.Forms.TextBox();
-            this.btnStart = new System.Windows.Forms.Button();
             this.ntfyIcon = new System.Windows.Forms.NotifyIcon(this.components);
             this.tmrStart = new System.Windows.Forms.Timer(this.components);
-            this.txtDummyMode = new System.Windows.Forms.CheckBox();
-            this.btnMeeting = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.btnSettings = new System.Windows.Forms.Button();
             this.tmrUpdate = new System.Windows.Forms.Timer(this.components);
+            this.tlpControls = new System.Windows.Forms.TableLayoutPanel();
+            this.txtLog = new System.Windows.Forms.TextBox();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnMeeting = new System.Windows.Forms.Button();
+            this.txtDummyMode = new System.Windows.Forms.CheckBox();
+            this.btnStart = new System.Windows.Forms.Button();
+            this.pnlTopControls = new System.Windows.Forms.Panel();
+            this.btnDoForDate = new System.Windows.Forms.Button();
+            this.dteForDay = new System.Windows.Forms.DateTimePicker();
+            this.btnSettings = new System.Windows.Forms.Button();
+            this.tlpControls.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.pnlTopControls.SuspendLayout();
             this.SuspendLayout();
             // 
-            // txtLog
-            // 
-            this.txtLog.Location = new System.Drawing.Point(132, 16);
-            this.txtLog.Multiline = true;
-            this.txtLog.Name = "txtLog";
-            this.txtLog.ReadOnly = true;
-            this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.txtLog.Size = new System.Drawing.Size(596, 294);
-            this.txtLog.TabIndex = 11;
-            // 
-            // btnStart
-            // 
-            this.btnStart.Location = new System.Drawing.Point(12, 229);
-            this.btnStart.Name = "btnStart";
-            this.btnStart.Size = new System.Drawing.Size(114, 23);
-            this.btnStart.TabIndex = 12;
-            this.btnStart.Text = "Проставить время";
-            this.btnStart.UseVisualStyleBackColor = true;
-            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
-            // 
             // ntfyIcon
             // 
             this.ntfyIcon.Text = "notifyIcon1";
@@ -71,86 +59,175 @@
             this.tmrStart.Interval = 1500;
             this.tmrStart.Tick += new System.EventHandler(this.tmrStart_Tick);
             // 
-            // txtDummyMode
-            // 
-            this.txtDummyMode.AutoSize = true;
-            this.txtDummyMode.Location = new System.Drawing.Point(12, 206);
-            this.txtDummyMode.Name = "txtDummyMode";
-            this.txtDummyMode.Size = new System.Drawing.Size(114, 17);
-            this.txtDummyMode.TabIndex = 13;
-            this.txtDummyMode.Text = "Тестовый прогон";
-            this.txtDummyMode.UseVisualStyleBackColor = true;
-            // 
-            // btnMeeting
-            // 
-            this.btnMeeting.Location = new System.Drawing.Point(12, 258);
-            this.btnMeeting.Name = "btnMeeting";
-            this.btnMeeting.Size = new System.Drawing.Size(114, 23);
-            this.btnMeeting.TabIndex = 14;
-            this.btnMeeting.Text = "Митинг";
-            this.btnMeeting.UseVisualStyleBackColor = true;
-            this.btnMeeting.Click += new System.EventHandler(this.btnMeeting_Click);
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Enabled = false;
-            this.btnCancel.Location = new System.Drawing.Point(12, 287);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(114, 23);
-            this.btnCancel.TabIndex = 15;
-            this.btnCancel.Text = "Отменить операцию";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            // 
-            // btnSettings
-            // 
-            this.btnSettings.Location = new System.Drawing.Point(12, 16);
-            this.btnSettings.Name = "btnSettings";
-            this.btnSettings.Size = new System.Drawing.Size(114, 23);
-            this.btnSettings.TabIndex = 16;
-            this.btnSettings.Text = "Настройки";
-            this.btnSettings.UseVisualStyleBackColor = true;
-            this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
-            // 
             // tmrUpdate
             // 
             this.tmrUpdate.Interval = 1000;
             this.tmrUpdate.Tick += new System.EventHandler(this.tmrUpdate_Tick);
             // 
+            // tlpControls
+            // 
+            this.tlpControls.ColumnCount = 2;
+            this.tlpControls.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150F));
+            this.tlpControls.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tlpControls.Controls.Add(this.txtLog, 2, 0);
+            this.tlpControls.Controls.Add(this.panel2, 0, 1);
+            this.tlpControls.Controls.Add(this.pnlTopControls, 0, 0);
+            this.tlpControls.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tlpControls.Location = new System.Drawing.Point(0, 0);
+            this.tlpControls.Name = "tlpControls";
+            this.tlpControls.RowCount = 2;
+            this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 200F));
+            this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tlpControls.Size = new System.Drawing.Size(759, 416);
+            this.tlpControls.TabIndex = 19;
+            // 
+            // txtLog
+            // 
+            this.txtLog.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtLog.Location = new System.Drawing.Point(153, 3);
+            this.txtLog.Multiline = true;
+            this.txtLog.Name = "txtLog";
+            this.txtLog.ReadOnly = true;
+            this.tlpControls.SetRowSpan(this.txtLog, 2);
+            this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.txtLog.Size = new System.Drawing.Size(603, 410);
+            this.txtLog.TabIndex = 27;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.btnCancel);
+            this.panel2.Controls.Add(this.btnMeeting);
+            this.panel2.Controls.Add(this.txtDummyMode);
+            this.panel2.Controls.Add(this.btnStart);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel2.Location = new System.Drawing.Point(3, 288);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(144, 125);
+            this.panel2.TabIndex = 25;
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Enabled = false;
+            this.btnCancel.Location = new System.Drawing.Point(15, 91);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(114, 23);
+            this.btnCancel.TabIndex = 19;
+            this.btnCancel.Text = "Отменить операцию";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnMeeting
+            // 
+            this.btnMeeting.Location = new System.Drawing.Point(15, 62);
+            this.btnMeeting.Name = "btnMeeting";
+            this.btnMeeting.Size = new System.Drawing.Size(114, 23);
+            this.btnMeeting.TabIndex = 18;
+            this.btnMeeting.Text = "Митинг";
+            this.btnMeeting.UseVisualStyleBackColor = true;
+            this.btnMeeting.Click += new System.EventHandler(this.btnMeeting_Click);
+            // 
+            // txtDummyMode
+            // 
+            this.txtDummyMode.AutoSize = true;
+            this.txtDummyMode.Location = new System.Drawing.Point(15, 10);
+            this.txtDummyMode.Name = "txtDummyMode";
+            this.txtDummyMode.Size = new System.Drawing.Size(114, 17);
+            this.txtDummyMode.TabIndex = 17;
+            this.txtDummyMode.Text = "Тестовый прогон";
+            this.txtDummyMode.UseVisualStyleBackColor = true;
+            // 
+            // btnStart
+            // 
+            this.btnStart.Location = new System.Drawing.Point(15, 33);
+            this.btnStart.Name = "btnStart";
+            this.btnStart.Size = new System.Drawing.Size(114, 23);
+            this.btnStart.TabIndex = 16;
+            this.btnStart.Text = "Проставить время";
+            this.btnStart.UseVisualStyleBackColor = true;
+            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
+            // 
+            // pnlTopControls
+            // 
+            this.pnlTopControls.Controls.Add(this.btnDoForDate);
+            this.pnlTopControls.Controls.Add(this.dteForDay);
+            this.pnlTopControls.Controls.Add(this.btnSettings);
+            this.pnlTopControls.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlTopControls.Location = new System.Drawing.Point(3, 3);
+            this.pnlTopControls.Name = "pnlTopControls";
+            this.pnlTopControls.Size = new System.Drawing.Size(144, 125);
+            this.pnlTopControls.TabIndex = 24;
+            // 
+            // btnDoForDate
+            // 
+            this.btnDoForDate.Location = new System.Drawing.Point(15, 84);
+            this.btnDoForDate.Name = "btnDoForDate";
+            this.btnDoForDate.Size = new System.Drawing.Size(114, 36);
+            this.btnDoForDate.TabIndex = 25;
+            this.btnDoForDate.Text = "Проставить на дату";
+            this.btnDoForDate.UseVisualStyleBackColor = true;
+            this.btnDoForDate.Click += new System.EventHandler(this.btnDoForDate_Click);
+            // 
+            // dteForDay
+            // 
+            this.dteForDay.CustomFormat = "dd.MM.yyyy";
+            this.dteForDay.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+            this.dteForDay.Location = new System.Drawing.Point(15, 57);
+            this.dteForDay.MinDate = new System.DateTime(2019, 1, 1, 0, 0, 0, 0);
+            this.dteForDay.Name = "dteForDay";
+            this.dteForDay.ShowUpDown = true;
+            this.dteForDay.Size = new System.Drawing.Size(114, 20);
+            this.dteForDay.TabIndex = 24;
+            // 
+            // btnSettings
+            // 
+            this.btnSettings.Location = new System.Drawing.Point(15, 4);
+            this.btnSettings.Name = "btnSettings";
+            this.btnSettings.Size = new System.Drawing.Size(114, 23);
+            this.btnSettings.TabIndex = 23;
+            this.btnSettings.Text = "Настройки";
+            this.btnSettings.UseVisualStyleBackColor = true;
+            this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
+            // 
             // frmMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(740, 320);
+            this.ClientSize = new System.Drawing.Size(759, 416);
-            this.Controls.Add(this.btnSettings);
+            this.Controls.Add(this.tlpControls);
-            this.Controls.Add(this.btnCancel);
-            this.Controls.Add(this.btnMeeting);
-            this.Controls.Add(this.txtDummyMode);
-            this.Controls.Add(this.btnStart);
-            this.Controls.Add(this.txtLog);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(2);
+            this.MinimumSize = new System.Drawing.Size(775, 455);
             this.Name = "frmMain";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Бот логирования времени";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing);
             this.Load += new System.EventHandler(this.Form1_Load);
             this.Resize += new System.EventHandler(this.frmMain_Resize);
+            this.tlpControls.ResumeLayout(false);
+            this.tlpControls.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            this.pnlTopControls.ResumeLayout(false);
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
         #endregion
-        private System.Windows.Forms.TextBox txtLog;
-        private System.Windows.Forms.Button btnStart;
         private System.Windows.Forms.NotifyIcon ntfyIcon;
         private System.Windows.Forms.Timer tmrStart;
-        private System.Windows.Forms.CheckBox txtDummyMode;
-        private System.Windows.Forms.Button btnMeeting;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.Button btnSettings;
         private System.Windows.Forms.Timer tmrUpdate;
+        private System.Windows.Forms.TableLayoutPanel tlpControls;
+        private System.Windows.Forms.Panel pnlTopControls;
+        private System.Windows.Forms.Button btnDoForDate;
+        private System.Windows.Forms.DateTimePicker dteForDay;
+        private System.Windows.Forms.Button btnSettings;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnMeeting;
+        private System.Windows.Forms.CheckBox txtDummyMode;
+        private System.Windows.Forms.Button btnStart;
+        private System.Windows.Forms.TextBox txtLog;
     }
 }
 

src/JiraTimeBot/UI/frmMain.cs

@@ -11,6 +11,7 @@ using System.IO.Compression;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using JiraTimeBot.UI.Startup;
 
 // This is the code for your desktop app.
 // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.
@@ -31,6 +32,16 @@ namespace JiraTimeBot.UI
         private readonly Action<string> _settingsErrorReporter;
         private bool _updateChecked;
 
+        protected override void WndProc(ref Message message)
+        {
+            if (message.Msg == SingleInstance.WM_SHOWFIRSTINSTANCE) {
+                this.Show();
+                this.WindowState = FormWindowState.Normal;
+                _trayIcon.Hide();
+            }
+            base.WndProc(ref message);
+        }
+
         private CancellationTokenSource GetTokenSource()
         {
             var tokenSource = new CancellationTokenSource();
@@ -55,11 +66,11 @@ namespace JiraTimeBot.UI
             _log = _container.Resolve<ILog>();
             _tasksProcessors = _container.Resolve<IAllTasksProcessors>();
 
-            _controls = new Control[] { txtDummyMode, btnStart, btnMeeting, btnSettings };
+            _controls = new Control[] { txtDummyMode, btnStart, btnMeeting, btnSettings, dteForDay, btnDoForDate };
 
             _settingsWindowShow = () =>
             {
-                var frmSettings = new frmSettings();
+                var frmSettings = new frmSettings(_container.Resolve<AutoStartUp>());
                 frmSettings.ShowDialog(this);
             };
             _settingsErrorReporter = msg => MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);;
@@ -92,7 +103,7 @@ namespace JiraTimeBot.UI
 
         private void Form1_Load(object sender, EventArgs e)
         {
-            this.Text = this.Text + " v." + Application.ProductVersion;
+            this.Text = this.Text + " v" + Application.ProductVersion;
 
             PrintStartMessage();
             tmrStart.Enabled = true;
@@ -100,6 +111,7 @@ namespace JiraTimeBot.UI
             if (System.Diagnostics.Debugger.IsAttached)
             {
                 _log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
+                //tmrUpdate.Enabled = true;
             }
             else
             {
@@ -160,6 +172,7 @@ namespace JiraTimeBot.UI
                 if (txtDummyMode.Checked)
                 {
                     _log.Info("Выключаем режим Тестового прогона");
+                    txtDummyMode.Checked = false;
                 }
 
                 using (var tokenSource = GetTokenSource())
@@ -190,7 +203,7 @@ namespace JiraTimeBot.UI
 
         private void btnSettings_Click(object sender, EventArgs e)
         {
-            var frm = new frmSettings();
+            var frm = _container.Resolve<frmSettings>();
             frm.ShowDialog();
 
             PrintStartMessage();
@@ -204,38 +217,19 @@ namespace JiraTimeBot.UI
                 _updateChecked = true;
                 tmrUpdate.Interval = 1 * 60 * 60 * 1000;
 
-                var checker = new UpdateChecker();
+                var updater = _container.Resolve<IUpdater>();
-                var release = checker.GetRelease();
+                if (updater.UpdateToNewVersion(firstTime))
-                if (release == null)
                 {
-                    return;
+                    //если обновились - отключаем до рестарта
-                }
+                    tmrUpdate.Enabled = false;
-
+                    var result = MessageBox.Show($"Приложение обновлено до новой версии. Перезапустить сейчас?",
-                var gitVersionStr = checker.GetLatestVersion(release);
+                        "Обновление",
-                var gitVersion = new Version(gitVersionStr);
+                        MessageBoxButtons.YesNo,
-                var appVersion = new Version(Application.ProductVersion);
+                        MessageBoxIcon.Warning);
-
+                    if (result == DialogResult.Yes)
-                if (gitVersion > appVersion)
-                {
-                    var downloadUrl = checker.GetDownloadUrl(release);
-                    _log.Info($"Доступна новая версия: {gitVersion} {downloadUrl}");
-
-                    var success = checker.DownloadFile(downloadUrl, "update.zip");
-                    if (!success)
                     {
-                        return;
+                        updater.SelfRestart();
                     }
-
-                    var result = InstallUpdate(gitVersion, "update.zip");
-                    if (result)
-                    {
-                        //если обновились - отключаем до рестарта
-                        tmrUpdate.Enabled = false;
-                    }
-                }
-                else if (firstTime)
-                {
-                    _log.Info($"Вы используете актуальную версию.");
                 }
             }
             catch (Exception ex)
@@ -245,46 +239,17 @@ namespace JiraTimeBot.UI
             }
         }
 
-        private bool InstallUpdate(Version gitVersion, string updateFile)
+        private async void btnDoForDate_Click(object sender, EventArgs e)
         {
-            try
+            var settings = ReadSettingsAndLock();
+
+            using (_tokenSource = GetTokenSource())
             {
-                _log.Info($"Устанавливаю обновление до версии {gitVersion}.");
+                await _job.SetTaskTimesForDate(dteForDay.Value, dteForDay.Value, settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token);
-                //Rename he executing file
-                System.IO.FileInfo appFile = new System.IO.FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
-                var bkpDir = Path.Combine(appFile.DirectoryName, "bkp");
-                if (!Directory.Exists(bkpDir))
-                {
-                    Directory.CreateDirectory(bkpDir);
-                }
-
-                using (ZipArchive archive = ZipFile.OpenRead(Path.Combine(appFile.DirectoryName, updateFile)))
-                {
-                    foreach (ZipArchiveEntry entry in archive.Entries)
-                    {
-                        var zipEntryPath = Path.Combine(appFile.DirectoryName, entry.FullName);
-                        if (File.Exists(zipEntryPath))
-                        {
-                            System.IO.FileInfo zipEntryFile = new System.IO.FileInfo(zipEntryPath);
-                            if (File.Exists(bkpDir + "\\" + zipEntryFile.Name))
-                            {
-                                File.Delete(bkpDir + "\\" + zipEntryFile.Name);
-                            }
-                            System.IO.File.Move(zipEntryFile.FullName, bkpDir + "\\" + zipEntryFile.Name);
-                        }
-
-                        entry.ExtractToFile(zipEntryPath);
-                    }
-                }
-
-                _log.Info("Обновление установлено. Перезапустите программу для применения изменений.");
-                return true;
-            }
-            catch (Exception)
-            {
-                _log.Error($"Что-то пошло не так при обновлении.");
-                return false;
             }
+
+            LockUnlock(true);
+
         }
     }
 }

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -48,6 +48,11 @@
             this.txtJQL = new System.Windows.Forms.TextBox();
             this.label8 = new System.Windows.Forms.Label();
             this.txtTimeControlTask = new System.Windows.Forms.TextBox();
+            this.chkAutostart = new System.Windows.Forms.CheckBox();
+            this.lblWorkDay = new System.Windows.Forms.Label();
+            this.txtWorkDayDuration = new System.Windows.Forms.TextBox();
+            this.label9 = new System.Windows.Forms.Label();
+            this.txtRandomMinutes = new System.Windows.Forms.TextBox();
             this.SuspendLayout();
             // 
             // label5
@@ -75,6 +80,7 @@
             this.label4.Size = new System.Drawing.Size(76, 13);
             this.label4.TabIndex = 26;
             this.label4.Text = "Путь до репо:";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.TopRight;
             // 
             // txtRepoPath
             // 
@@ -91,6 +97,7 @@
             this.label2.Size = new System.Drawing.Size(82, 13);
             this.label2.TabIndex = 24;
             this.label2.Text = "Mercurial name:";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight;
             // 
             // txtMercurialEmail
             // 
@@ -152,7 +159,7 @@
             // chkAddComments
             // 
             this.chkAddComments.AutoSize = true;
-            this.chkAddComments.Location = new System.Drawing.Point(56, 267);
+            this.chkAddComments.Location = new System.Drawing.Point(65, 336);
             this.chkAddComments.Name = "chkAddComments";
             this.chkAddComments.Size = new System.Drawing.Size(133, 17);
             this.chkAddComments.TabIndex = 31;
@@ -161,7 +168,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(72, 299);
+            this.btnSave.Location = new System.Drawing.Point(86, 359);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 32;
@@ -223,11 +230,58 @@
             this.txtTimeControlTask.Size = new System.Drawing.Size(99, 20);
             this.txtTimeControlTask.TabIndex = 38;
             // 
+            // chkAutostart
+            // 
+            this.chkAutostart.AutoSize = true;
+            this.chkAutostart.Location = new System.Drawing.Point(65, 313);
+            this.chkAutostart.Name = "chkAutostart";
+            this.chkAutostart.Size = new System.Drawing.Size(96, 17);
+            this.chkAutostart.TabIndex = 40;
+            this.chkAutostart.Text = "Автозагрузка";
+            this.chkAutostart.UseVisualStyleBackColor = true;
+            // 
+            // lblWorkDay
+            // 
+            this.lblWorkDay.AutoSize = true;
+            this.lblWorkDay.Location = new System.Drawing.Point(15, 258);
+            this.lblWorkDay.Name = "lblWorkDay";
+            this.lblWorkDay.Size = new System.Drawing.Size(117, 13);
+            this.lblWorkDay.TabIndex = 42;
+            this.lblWorkDay.Text = "Минут в рабочем дне:";
+            // 
+            // txtWorkDayDuration
+            // 
+            this.txtWorkDayDuration.Location = new System.Drawing.Point(133, 254);
+            this.txtWorkDayDuration.Name = "txtWorkDayDuration";
+            this.txtWorkDayDuration.Size = new System.Drawing.Size(99, 20);
+            this.txtWorkDayDuration.TabIndex = 41;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(30, 284);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(101, 13);
+            this.label9.TabIndex = 44;
+            this.label9.Text = "Рандомных минут:";
+            // 
+            // txtRandomMinutes
+            // 
+            this.txtRandomMinutes.Location = new System.Drawing.Point(133, 280);
+            this.txtRandomMinutes.Name = "txtRandomMinutes";
+            this.txtRandomMinutes.Size = new System.Drawing.Size(99, 20);
+            this.txtRandomMinutes.TabIndex = 43;
+            // 
             // frmSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(243, 334);
+            this.ClientSize = new System.Drawing.Size(243, 391);
+            this.Controls.Add(this.label9);
+            this.Controls.Add(this.txtRandomMinutes);
+            this.Controls.Add(this.lblWorkDay);
+            this.Controls.Add(this.txtWorkDayDuration);
+            this.Controls.Add(this.chkAutostart);
             this.Controls.Add(this.label8);
             this.Controls.Add(this.txtTimeControlTask);
             this.Controls.Add(this.label7);
@@ -281,5 +335,10 @@
         private System.Windows.Forms.TextBox txtJQL;
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.TextBox txtTimeControlTask;
+        private System.Windows.Forms.CheckBox chkAutostart;
+        private System.Windows.Forms.Label lblWorkDay;
+        private System.Windows.Forms.TextBox txtWorkDayDuration;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.TextBox txtRandomMinutes;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -1,13 +1,17 @@
 using System;
 using System.Windows.Forms;
 using JiraTimeBot.Configuration;
+using JiraTimeBot.UI.Startup;
 
 namespace JiraTimeBot.UI
 {
     public partial class frmSettings : Form
     {
-        public frmSettings()
+        private readonly AutoStartUp _autoStart;
+
+        public frmSettings(AutoStartUp autoStart)
         {
+            _autoStart = autoStart;
             InitializeComponent();
         }
 
@@ -18,6 +22,8 @@ namespace JiraTimeBot.UI
             {
                 SetSettings(settings);
             }
+
+            chkAutostart.Checked = _autoStart.Get();
         }
 
         private void SetSettings(Settings settings)
@@ -27,13 +33,15 @@ namespace JiraTimeBot.UI
             txtMercurialEmail.Text = settings.MercurialAuthorEmail;
             txtRepoPath.Text = settings.RepositoryPath;
             actTime.Text = settings.ActivationTime.ToString("hh\\:mm\\:ss");
-            //txtDummyMode.Checked = settings.DummyMode;
             chkAddComments.Checked = settings.AddCommentsToWorklog;
-            txtRoundTo.Text = settings.RountToMinutes.ToString();
+            txtRoundTo.Text = settings.RoundToMinutes.ToString();
             cboWorkType.SelectedIndex = (int) settings.WorkType;
             txtTimeControlTask.Text = settings.TimeControlTask;
             txtJQL.Text = settings.JiraQuery;
-            txtJQL.Enabled = settings.WorkType == WorkType.JiraLogs;
+            txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
+            txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString();
+
+            cboWorkType_SelectedIndexChanged(null, null);
         }
 
         public Settings ReadSettingsAndLock()
@@ -42,6 +50,14 @@ namespace JiraTimeBot.UI
             {
                 roundTo = 15;
             }
+            if (!int.TryParse(txtWorkDayDuration.Text, out var minuterPerWorkDay))
+            {
+                minuterPerWorkDay = 8 * 60;
+            }
+            if (!int.TryParse(txtRandomMinutes.Text, out var randomWorkMinutes))
+            {
+                randomWorkMinutes = 0;
+            }
 
             var settings = new Settings
             {
@@ -50,12 +66,13 @@ namespace JiraTimeBot.UI
                 MercurialAuthorEmail = txtMercurialEmail.Text,
                 ActivationTime = TimeSpan.Parse(actTime.Text),
                 RepositoryPath = txtRepoPath.Text,
-                //DummyMode = txtDummyMode.Checked,
                 AddCommentsToWorklog = chkAddComments.Checked,
-                RountToMinutes = roundTo,
+                RoundToMinutes = roundTo,
                 WorkType = (WorkType) cboWorkType.SelectedIndex,
                 JiraQuery = txtJQL.Text,
-                TimeControlTask = txtTimeControlTask.Text
+                TimeControlTask = txtTimeControlTask.Text,
+                MinuterPerWorkDay = minuterPerWorkDay,
+                RandomWorkMinutes = randomWorkMinutes
             };
 
             //LockUnlock(false);
@@ -67,6 +84,7 @@ namespace JiraTimeBot.UI
         {
             var settings = ReadSettingsAndLock();
             settings.Save();
+             _autoStart.Set(chkAutostart.Checked);
 
             MessageBox.Show("Настройки сохранены.");
 
@@ -82,6 +100,7 @@ namespace JiraTimeBot.UI
         private void cboWorkType_SelectedIndexChanged(object sender, EventArgs e)
         {
             txtJQL.Enabled = (cboWorkType.SelectedIndex == 1);
+            txtRepoPath.Enabled = (cboWorkType.SelectedIndex == 0);
         }
     }
 }

src/JiraTimeBot/Update/IUpdater.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace JiraTimeBot.Update
+{
+    internal interface IUpdater
+    {
+        bool UpdateToNewVersion(bool firstTime);
+        void SelfRestart();
+    }
+}

src/JiraTimeBot/Update/UpdateChecker.cs

@@ -1,78 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using Newtonsoft.Json;
-
-namespace JiraTimeBot.Update
-{
-    class UpdateChecker
-    {
-        private const string GithubUser = "monster1025";
-        private const string GithubRepo = "JiraTimeBot";
-
-        public string GetLatestVersion(GitHubReleaseResponse release)
-        {
-            var version = release?.TagName?.TrimStart('v');
-            return version;
-        }
-
-        public string GetDownloadUrl(GitHubReleaseResponse release)
-        {
-            var downloadUrl = release?.Assets?.FirstOrDefault()?.BrowserDownloadUrl?.ToString();
-            return downloadUrl ?? "";
-        }
-
-        public GitHubReleaseResponse GetRelease()
-        {
-            var latestReleasePage = Get($"https://api.github.com/repos/{GithubUser}/{GithubRepo}/releases/latest");
-            if (string.IsNullOrEmpty(latestReleasePage))
-            {
-                return null;
-            }
-
-            var release = JsonConvert.DeserializeObject<GitHubReleaseResponse>(latestReleasePage);
-            return release;
-        }
-
-        public bool DownloadFile(string url, string to)
-        {
-            try
-            {
-
-                using (var client = new WebClient())
-                {
-                    client.Headers.Add("User-Agent",
-                        "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0");
-                    client.DownloadFile(url, to);
-                    return true;
-                }
-            }
-            catch (Exception)
-            {
-                return false;
-            }
-        }
-
-        private string Get(string uri)
-        {
-            try
-            {
-                HttpWebRequest request = (HttpWebRequest) WebRequest.Create(uri);
-                request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-                request.UserAgent = "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0";
-
-                using (HttpWebResponse response = (HttpWebResponse) request.GetResponse())
-                using (Stream stream = response.GetResponseStream())
-                using (StreamReader reader = new StreamReader(stream))
-                {
-                    return reader.ReadToEnd();
-                }
-            }
-            catch (Exception ex)
-            {
-                return "";
-            }
-        }
-    }
-}

src/JiraTimeBot/Update/Updater.cs

@@ -0,0 +1,182 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Net;
+using System.Windows.Forms;
+using Newtonsoft.Json;
+
+namespace JiraTimeBot.Update
+{
+    public class Updater : IUpdater
+    {
+        private readonly ILog _log;
+
+        public Updater(ILog log)
+        {
+            _log = log;
+        }
+
+        private const string GithubUser = "monster1025";
+        private const string GithubRepo = "JiraTimeBot";
+
+        public string GetLatestVersion(GitHubReleaseResponse release)
+        {
+            var version = release?.TagName?.TrimStart('v');
+            return version;
+        }
+
+        public string GetDownloadUrl(GitHubReleaseResponse release)
+        {
+            var downloadUrl = release?.Assets?.FirstOrDefault()?.BrowserDownloadUrl?.ToString();
+            return downloadUrl ?? "";
+        }
+
+        public GitHubReleaseResponse GetRelease()
+        {
+            var latestReleasePage = Get($"https://api.github.com/repos/{GithubUser}/{GithubRepo}/releases/latest");
+            if (string.IsNullOrEmpty(latestReleasePage))
+            {
+                return null;
+            }
+
+            var release = JsonConvert.DeserializeObject<GitHubReleaseResponse>(latestReleasePage);
+            return release;
+        }
+
+        public bool UpdateToNewVersion(bool firstTime)
+        {
+            var release = GetRelease();
+            if (release == null)
+            {
+                return false;
+            }
+
+            var gitVersionStr = GetLatestVersion(release);
+            var gitVersion = new Version(gitVersionStr);
+            var appVersion = new Version(Application.ProductVersion);
+
+            if (gitVersion > appVersion)
+            {
+                var downloadUrl = GetDownloadUrl(release);
+                _log.Info($"Доступна новая версия: {gitVersion} {downloadUrl}");
+
+                var success = DownloadFile(downloadUrl, "update.zip");
+                if (!success)
+                {
+                    return false;
+                }
+
+                var result = InstallUpdate(gitVersion, "update.zip");
+                if (result)
+                {
+                    return true;
+                }
+
+                return false;
+            }
+
+            if (firstTime)
+            {
+                _log.Info($"Вы используете актуальную версию.");
+            }
+            return false;
+        }
+
+        public bool InstallUpdate(Version gitVersion, string updateFile)
+        {
+            try
+            {
+                _log.Info($"Устанавливаю обновление до версии {gitVersion}.");
+                //Rename he executing file
+                System.IO.FileInfo appFile = new System.IO.FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location);
+                var bkpDir = Path.Combine(appFile.DirectoryName, "bkp");
+                if (!Directory.Exists(bkpDir))
+                {
+                    Directory.CreateDirectory(bkpDir);
+                }
+
+                using (ZipArchive archive = ZipFile.OpenRead(Path.Combine(appFile.DirectoryName, updateFile)))
+                {
+                    foreach (ZipArchiveEntry entry in archive.Entries)
+                    {
+                        var zipEntryPath = Path.Combine(appFile.DirectoryName, entry.FullName);
+                        if (File.Exists(zipEntryPath))
+                        {
+                            System.IO.FileInfo zipEntryFile = new System.IO.FileInfo(zipEntryPath);
+                            if (File.Exists(bkpDir + "\\" + zipEntryFile.Name))
+                            {
+                                File.Delete(bkpDir + "\\" + zipEntryFile.Name);
+                            }
+                            System.IO.File.Move(zipEntryFile.FullName, bkpDir + "\\" + zipEntryFile.Name);
+                        }
+
+                        entry.ExtractToFile(zipEntryPath);
+                    }
+                }
+
+                _log.Info("Обновление установлено. Перезапустите программу для применения изменений.");
+                return true;
+            }
+            catch (Exception)
+            {
+                _log.Error($"Что-то пошло не так при обновлении.");
+                return false;
+            }
+        }
+        public void SelfRestart()
+        {
+            var name = Application.ExecutablePath;
+            ProcessStartInfo startInfo = new ProcessStartInfo {
+                Arguments = "/C choice /C Y /N /D Y /T 1 & \"" + name + "\"",
+                WindowStyle = ProcessWindowStyle.Hidden,
+                CreateNoWindow = true,
+                FileName = "cmd.exe"
+            };
+            Process.Start(startInfo);
+            Application.Exit();
+        }
+
+
+        private bool DownloadFile(string url, string to)
+        {
+            try
+            {
+
+                using (var client = new WebClient())
+                {
+                    client.Headers.Add("User-Agent",
+                        "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0");
+                    client.DownloadFile(url, to);
+                    return true;
+                }
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+
+        private string Get(string uri)
+        {
+            try
+            {
+                HttpWebRequest request = (HttpWebRequest) WebRequest.Create(uri);
+                request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+                request.UserAgent = "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0";
+
+                using (HttpWebResponse response = (HttpWebResponse) request.GetResponse())
+                using (Stream stream = response.GetResponseStream())
+                using (StreamReader reader = new StreamReader(stream))
+                {
+                    return reader.ReadToEnd();
+                }
+            }
+            catch (Exception)
+            {
+                return "";
+            }
+        }
+    }
+}