Убрана настройка замены времени за день - заменяем всегда

.semver.txt

@@ -1 +1 @@
-1.0.35
+1.0.36

README.md

@@ -18,7 +18,6 @@
  - Задача "учёта времени" - задача, куда будет списываться по 30 минут в день на "затраты на учет времени". Должна содержать знак '-'.
  - Время запуска - время автоматического запуска бота. Если была установлена галочка "тестовый прогон" - она будет снята.
  - Добавлять описание (Режим Mercurial) - добавлять ли в описание CommitMessage, если не установлено - добавляются стандартные фразы программистов (типа "написание кода").
- - Заменять время за день - если галочка установлена, то время внесенное пользователем за день будет удалено и заменено на добавленное ботом.
 
 # Скачать
 Скачать актуальную версию можно тут: https://github.com/monster1025/JiraTimeBot/releases/latest

src/JiraTimeBot/Configuration/Settings.cs

@@ -23,7 +23,6 @@ namespace JiraTimeBot.Configuration
         public WorkType WorkType { get; set; }
         public string JiraQuery { get; set; }
         public string TimeControlTask { get; set; }
-        public bool RemoveWorklogsAddedByUser { get; set; }
 
         public static Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter)
         {

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -76,13 +76,14 @@ namespace JiraTimeBot.JiraIntegration
             {
                 if (!taskTimeItems.Any(f => f.Branch.Equals(issue.Key.Value, StringComparison.InvariantCulture)))
                 {
-                    _log.Trace($"Удаляю добавленный руками WorkLog для задачи {issue.Key.Value}.");
                     var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
                     var userWorklogs = workLogs.Where(w =>
                         w.CreateDate.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);
@@ -103,10 +104,7 @@ namespace JiraTimeBot.JiraIntegration
             date = date.Value.Date;
 
             //Удаляем добавленные вручную пользователем данные.
-            if (settings.AddCommentsToWorklog)
+            RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
-            {
-                RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
-            }
 
             foreach (TaskTimeItem taskTimeItem in taskTimeItems)
             {

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -1,31 +1,31 @@
-using System.Reflection;                          
+using System.Reflection;                           
-using System.Runtime.InteropServices;                          
+using System.Runtime.InteropServices;                           
-// General Information about an assembly is controlled through the following                          
+// General Information about an assembly is controlled through the following                           
-// set of attributes. Change these attribute values to modify the information                          
+// set of attributes. Change these attribute values to modify the information                           
-// associated with an assembly.                          
+// associated with an assembly.                           
-[assembly: AssemblyTitle("JiraTimeBot")]                          
+[assembly: AssemblyTitle("JiraTimeBot")]                           
-[assembly: AssemblyDescription("")]                          
+[assembly: AssemblyDescription("")]                           
-[assembly: AssemblyConfiguration("")]                          
+[assembly: AssemblyConfiguration("")]                           
-[assembly: AssemblyCompany("")]                          
+[assembly: AssemblyCompany("")]                           
-[assembly: AssemblyProduct("JiraTimeBot")]                          
+[assembly: AssemblyProduct("JiraTimeBot")]                           
-[assembly: AssemblyCopyright("Copyright © 2019")]                          
+[assembly: AssemblyCopyright("Copyright © 2019")]                           
-[assembly: AssemblyTrademark("")]                          
+[assembly: AssemblyTrademark("")]                           
-[assembly: AssemblyCulture("")]                          
+[assembly: AssemblyCulture("")]                           
-// Setting ComVisible to false makes the types in this assembly not visible                          
+// Setting ComVisible to false makes the types in this assembly not visible                           
-// to COM components.  If you need to access a type in this assembly from                          
+// to COM components.  If you need to access a type in this assembly from                           
-// COM, set the ComVisible attribute to true on that type.                          
+// COM, set the ComVisible attribute to true on that type.                           
-[assembly: ComVisible(false)]                          
+[assembly: ComVisible(false)]                           
-// The following GUID is for the ID of the typelib if this project is exposed to COM                          
+// The following GUID is for the ID of the typelib if this project is exposed to COM                           
-[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]                          
+[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]                           
-// Version information for an assembly consists of the following four values:                          
+// Version information for an assembly consists of the following four values:                           
-//                          
+//                           
-//      Major Version                          
+//      Major Version                           
-//      Minor Version                          
+//      Minor Version                           
-//      Build Number                          
+//      Build Number                           
-//      Revision                          
+//      Revision                           
-//                          
+//                           
-// You can specify all the values or you can default the Build and Revision Numbers                          
+// You can specify all the values or you can default the Build and Revision Numbers                           
-// by using the '*' as shown below:                          
+// by using the '*' as shown below:                           
-[assembly: AssemblyVersion("1.0.35")] 
+[assembly: AssemblyVersion("1.0.36")] 
-[assembly: AssemblyFileVersion("1.0.35")] 
+[assembly: AssemblyFileVersion("1.0.36")] 
-[assembly: AssemblyInformationalVersion("1.0.35")] 
+[assembly: AssemblyInformationalVersion("1.0.36")] 

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -49,7 +49,6 @@
             this.label8 = new System.Windows.Forms.Label();
             this.txtTimeControlTask = new System.Windows.Forms.TextBox();
             this.chkAutostart = new System.Windows.Forms.CheckBox();
-            this.chkRemoveAddedByUser = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // label5
@@ -154,7 +153,7 @@
             // chkAddComments
             // 
             this.chkAddComments.AutoSize = true;
-            this.chkAddComments.Location = new System.Drawing.Point(56, 277);
+            this.chkAddComments.Location = new System.Drawing.Point(65, 277);
             this.chkAddComments.Name = "chkAddComments";
             this.chkAddComments.Size = new System.Drawing.Size(133, 17);
             this.chkAddComments.TabIndex = 31;
@@ -163,7 +162,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(92, 322);
+            this.btnSave.Location = new System.Drawing.Point(86, 300);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 32;
@@ -228,29 +227,18 @@
             // chkAutostart
             // 
             this.chkAutostart.AutoSize = true;
-            this.chkAutostart.Location = new System.Drawing.Point(56, 254);
+            this.chkAutostart.Location = new System.Drawing.Point(65, 254);
             this.chkAutostart.Name = "chkAutostart";
             this.chkAutostart.Size = new System.Drawing.Size(96, 17);
             this.chkAutostart.TabIndex = 40;
             this.chkAutostart.Text = "Автозагрузка";
             this.chkAutostart.UseVisualStyleBackColor = true;
             // 
-            // chkRemoveAddedByUser
-            // 
-            this.chkRemoveAddedByUser.AutoSize = true;
-            this.chkRemoveAddedByUser.Location = new System.Drawing.Point(56, 299);
-            this.chkRemoveAddedByUser.Name = "chkRemoveAddedByUser";
-            this.chkRemoveAddedByUser.Size = new System.Drawing.Size(153, 17);
-            this.chkRemoveAddedByUser.TabIndex = 41;
-            this.chkRemoveAddedByUser.Text = "Заменять время за день";
-            this.chkRemoveAddedByUser.UseVisualStyleBackColor = true;
-            // 
             // frmSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(243, 357);
+            this.ClientSize = new System.Drawing.Size(243, 334);
-            this.Controls.Add(this.chkRemoveAddedByUser);
             this.Controls.Add(this.chkAutostart);
             this.Controls.Add(this.label8);
             this.Controls.Add(this.txtTimeControlTask);
@@ -306,6 +294,5 @@
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.TextBox txtTimeControlTask;
         private System.Windows.Forms.CheckBox chkAutostart;
-        private System.Windows.Forms.CheckBox chkRemoveAddedByUser;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -37,7 +37,6 @@ namespace JiraTimeBot.UI
             txtRoundTo.Text = settings.RountToMinutes.ToString();
             cboWorkType.SelectedIndex = (int) settings.WorkType;
             txtTimeControlTask.Text = settings.TimeControlTask;
-            chkRemoveAddedByUser.Checked = settings.RemoveWorklogsAddedByUser;
             txtJQL.Text = settings.JiraQuery;
             txtJQL.Enabled = settings.WorkType == WorkType.JiraLogs;
         }
@@ -61,7 +60,6 @@ namespace JiraTimeBot.UI
                 WorkType = (WorkType) cboWorkType.SelectedIndex,
                 JiraQuery = txtJQL.Text,
                 TimeControlTask = txtTimeControlTask.Text,
-                RemoveWorklogsAddedByUser = chkRemoveAddedByUser.Checked
             };
 
             //LockUnlock(false);