diff --git a/JiraTimeBotForm/JiraIntegration/JiraApi.cs b/JiraTimeBotForm/JiraIntegration/JiraApi.cs index f40d6e8..b1ac081 100644 --- a/JiraTimeBotForm/JiraIntegration/JiraApi.cs +++ b/JiraTimeBotForm/JiraIntegration/JiraApi.cs @@ -20,7 +20,7 @@ namespace JiraTimeBotForm.JiraIntegration _jira = Jira.CreateRestClient(_settings.JiraUrl, _settings.JiraUserName, _settings.JiraPassword); } - public void SetTodayWorklog(List taskTimeItems, DateTime? date = null) + public void SetTodayWorklog(List taskTimeItems, DateTime? date = null, bool dummy = false) { if (date == null) { @@ -48,7 +48,10 @@ namespace JiraTimeBotForm.JiraIntegration if (timeDiff > 1) { _log.Trace($"ВремÑ� отличаетÑ�Ñ� на {timeDiff} минут, удалÑ�ÑŽ worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}"); - issue.DeleteWorklogAsync(workLog, WorklogStrategy.RetainRemainingEstimate); + if (!dummy) + { + issue.DeleteWorklogAsync(workLog, WorklogStrategy.RetainRemainingEstimate); + } hasTodayWorklog = false; } else @@ -62,8 +65,12 @@ namespace JiraTimeBotForm.JiraIntegration if (!hasTodayWorklog) { var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m"; - var addedWorklog = issue.AddWorklogAsync(new Worklog(timeSpentJira, date.Value)).Result; - _log.Trace($"Добавили Worklog длÑ� {taskTimeItem.Branch}: {addedWorklog.Author} {addedWorklog.CreateDate}: {addedWorklog.TimeSpent}"); + var workLogToAdd = new Worklog(timeSpentJira, date.Value); + if (!dummy) + { + workLogToAdd = issue.AddWorklogAsync(workLogToAdd).Result; + } + _log.Trace($"Добавили Worklog длÑ� {taskTimeItem.Branch}: {workLogToAdd.Author} {workLogToAdd.CreateDate}: {workLogToAdd.TimeSpent}"); } } } diff --git a/JiraTimeBotForm/JiraTimeBotForm.csproj b/JiraTimeBotForm/JiraTimeBotForm.csproj index bfe22da..c9121ca 100644 --- a/JiraTimeBotForm/JiraTimeBotForm.csproj +++ b/JiraTimeBotForm/JiraTimeBotForm.csproj @@ -32,7 +32,7 @@ 4 - Google-Noto-Emoji-Smileys-10103-robot-face.ico + app.ico @@ -74,11 +74,11 @@ - + Form - - Form1.cs + + frmMain.cs @@ -87,8 +87,8 @@ - - Form1.cs + + frmMain.cs ResXFileCodeGenerator @@ -114,7 +114,7 @@ - + \ No newline at end of file diff --git a/JiraTimeBotForm/Google-Noto-Emoji-Smileys-10103-robot-face.ico b/JiraTimeBotForm/app.ico similarity index 100% rename from JiraTimeBotForm/Google-Noto-Emoji-Smileys-10103-robot-face.ico rename to JiraTimeBotForm/app.ico diff --git a/JiraTimeBotForm/Form1.Designer.cs b/JiraTimeBotForm/frmMain.Designer.cs similarity index 93% rename from JiraTimeBotForm/Form1.Designer.cs rename to JiraTimeBotForm/frmMain.Designer.cs index c15cbd5..c6fb20c 100644 --- a/JiraTimeBotForm/Form1.Designer.cs +++ b/JiraTimeBotForm/frmMain.Designer.cs @@ -45,6 +45,7 @@ namespace JiraTimeBotForm 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.SuspendLayout(); // // actTime @@ -168,11 +169,22 @@ namespace JiraTimeBotForm this.tmrStart.Interval = 1000; this.tmrStart.Tick += new System.EventHandler(this.tmrStart_Tick); // + // txtDummyMode + // + this.txtDummyMode.AutoSize = true; + this.txtDummyMode.Location = new System.Drawing.Point(48, 234); + this.txtDummyMode.Name = "txtDummyMode"; + this.txtDummyMode.Size = new System.Drawing.Size(114, 17); + this.txtDummyMode.TabIndex = 13; + this.txtDummyMode.Text = "Òåñòîâûé ïðîãîí"; + this.txtDummyMode.UseVisualStyleBackColor = true; + // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(740, 292); + this.Controls.Add(this.txtDummyMode); this.Controls.Add(this.btnStart); this.Controls.Add(this.txtLog); this.Controls.Add(this.label4); @@ -215,6 +227,7 @@ namespace JiraTimeBotForm private System.Windows.Forms.Button btnStart; private System.Windows.Forms.NotifyIcon ntfyIcon; private System.Windows.Forms.Timer tmrStart; + private System.Windows.Forms.CheckBox txtDummyMode; } } diff --git a/JiraTimeBotForm/Form1.cs b/JiraTimeBotForm/frmMain.cs similarity index 96% rename from JiraTimeBotForm/Form1.cs rename to JiraTimeBotForm/frmMain.cs index 7752cda..e889925 100644 --- a/JiraTimeBotForm/Form1.cs +++ b/JiraTimeBotForm/frmMain.cs @@ -163,9 +163,9 @@ namespace JiraTimeBotForm var taskTimes = taskDiscoverer.GetTaskTimes(settings, date); if (!taskTimes.Any()) { - _log.Warn($"{date} âû íå ñäåëàëè íè÷åãî ïîëåçíîãî =) Èñïîëüçóþ ïðåäûäóùèé äåíü."); + _log.Warn($"{date:dd.MM.yyyy} âû íå ñäåëàëè íè÷åãî ïîëåçíîãî =) Èñïîëüçóþ ïðåäûäóùèé äåíü."); daysDiff--; - if (daysDiff < 7) + if (daysDiff < -7) { _log.Error("Íå íàøëè íè îäíîãî êîììèòà çà ïðåäûäóùèå 7 äíåé. Âîçìîæíî âû â îòïóñêå? Âûõîæó."); return; @@ -180,7 +180,7 @@ namespace JiraTimeBotForm _log.Trace($"- {taskTime.Branch} (êîììèòîâ {taskTime.Commits}): {taskTime.Time}"); } - jira.SetTodayWorklog(taskTimes); + jira.SetTodayWorklog(taskTimes, dummy: txtDummyMode.Checked); _log.Info("Ãîòîâî."); return; } diff --git a/JiraTimeBotForm/Form1.resx b/JiraTimeBotForm/frmMain.resx similarity index 100% rename from JiraTimeBotForm/Form1.resx rename to JiraTimeBotForm/frmMain.resx