diff --git a/JiraTimeBotForm/Configuration/Settings.cs b/JiraTimeBotForm/Configuration/Settings.cs index 5f96cba..5aaad5f 100644 --- a/JiraTimeBotForm/Configuration/Settings.cs +++ b/JiraTimeBotForm/Configuration/Settings.cs @@ -17,7 +17,6 @@ namespace JiraTimeBotForm.Configuration public string JiraUserName { get; set; } public string JiraPassword { get; set; } public TimeSpan ActivationTime { get; set; } - public bool DummyMode { get; set; } public bool AddCommentsToWorklog { get; set; } diff --git a/JiraTimeBotForm/DI/ContainerBuilder.cs b/JiraTimeBotForm/DI/ContainerBuilder.cs index 3ddb2b0..6e2eb21 100644 --- a/JiraTimeBotForm/DI/ContainerBuilder.cs +++ b/JiraTimeBotForm/DI/ContainerBuilder.cs @@ -38,7 +38,6 @@ namespace JiraTimeBotForm.DI _builder.RegisterType().AsSelf().As(); _builder.RegisterType().AsSelf().As(); _builder.RegisterAggregateService(); - _builder.RegisterType().AsSelf().As(); _builder.RegisterType().AsSelf().AsImplementedInterfaces(); diff --git a/JiraTimeBotForm/Job.cs b/JiraTimeBotForm/Job.cs index 9905c00..7f7d882 100644 --- a/JiraTimeBotForm/Job.cs +++ b/JiraTimeBotForm/Job.cs @@ -25,14 +25,14 @@ namespace JiraTimeBotForm _log = log; } - public Task DoTheJob(Settings settings, ITasksProcessor tasksProcessor, CancellationToken cancellationToken) + public Task DoTheJob(Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken) { _log.Info("Начинаем работу"); - return Task.Run(() => DoTheJobImpl(settings, tasksProcessor, cancellationToken), cancellationToken); + return Task.Run(() => DoTheJobImpl(settings, tasksProcessor, dummyMode, cancellationToken), cancellationToken); } - private void DoTheJobImpl(Settings settings, ITasksProcessor tasksProcessor, CancellationToken cancellationToken) + private void DoTheJobImpl(Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken) { int daysDiff = 0; if (tasksProcessor is MeetingProcessor) @@ -71,7 +71,7 @@ namespace JiraTimeBotForm continue; } - tasksProcessor.Process(date, taskTimes, settings); + tasksProcessor.Process(date, taskTimes, settings, dummyMode); _log.Info("Готово."); return; diff --git a/JiraTimeBotForm/TasksProcessors/ITasksProcessor.cs b/JiraTimeBotForm/TasksProcessors/ITasksProcessor.cs index 0eb1241..76d380a 100644 --- a/JiraTimeBotForm/TasksProcessors/ITasksProcessor.cs +++ b/JiraTimeBotForm/TasksProcessors/ITasksProcessor.cs @@ -7,6 +7,6 @@ namespace JiraTimeBotForm.TasksProcessors { interface ITasksProcessor { - void Process(DateTime date, List taskTimes, Settings settings); + void Process(DateTime date, List taskTimes, Settings settings, bool dummyMode); } } diff --git a/JiraTimeBotForm/TasksProcessors/MeetingProcessor.cs b/JiraTimeBotForm/TasksProcessors/MeetingProcessor.cs index 51116e2..d95b313 100644 --- a/JiraTimeBotForm/TasksProcessors/MeetingProcessor.cs +++ b/JiraTimeBotForm/TasksProcessors/MeetingProcessor.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using JiraTimeBotForm.Configuration; using JiraTimeBotForm.JiraIntegration; -using JiraTimeBotForm.TaskTime; using JiraTimeBotForm.TaskTime.Objects; namespace JiraTimeBotForm.TasksProcessors @@ -19,7 +18,7 @@ namespace JiraTimeBotForm.TasksProcessors _jiraApi = jiraApi; } - public void Process(DateTime date, List taskTimes, Settings settings) + public void Process(DateTime date, List taskTimes, Settings settings, bool dummyMode) { _log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:"); diff --git a/JiraTimeBotForm/TasksProcessors/WorkLogTasksProcessor.cs b/JiraTimeBotForm/TasksProcessors/WorkLogTasksProcessor.cs index 01b478d..e15f6c3 100644 --- a/JiraTimeBotForm/TasksProcessors/WorkLogTasksProcessor.cs +++ b/JiraTimeBotForm/TasksProcessors/WorkLogTasksProcessor.cs @@ -18,7 +18,7 @@ namespace JiraTimeBotForm.TasksProcessors _jiraApi = jiraApi; } - public void Process(DateTime date, List taskTimes, Settings settings) + public void Process(DateTime date, List taskTimes, Settings settings, bool dummyMode) { _log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:"); foreach (var taskTime in taskTimes) @@ -26,7 +26,7 @@ namespace JiraTimeBotForm.TasksProcessors _log.Trace($"- {taskTime.Branch} (коммитов {taskTime.Commits}): {taskTime.Time}"); } - _jiraApi.SetTodayWorklog(taskTimes, settings, dummy: settings.DummyMode, addCommentsToWorklog: settings.AddCommentsToWorklog); + _jiraApi.SetTodayWorklog(taskTimes, settings, dummy: dummyMode, addCommentsToWorklog: settings.AddCommentsToWorklog); } } } diff --git a/JiraTimeBotForm/UI/frmMain.cs b/JiraTimeBotForm/UI/frmMain.cs index a67c6a7..0c295b1 100644 --- a/JiraTimeBotForm/UI/frmMain.cs +++ b/JiraTimeBotForm/UI/frmMain.cs @@ -90,7 +90,7 @@ namespace JiraTimeBotForm.UI using (_tokenSource = GetTokenSource()) { - await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, _tokenSource.Token); + await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token); } LockUnlock(true); @@ -128,15 +128,14 @@ namespace JiraTimeBotForm.UI await Task.Delay(2000); - if (settings.DummyMode) + if (txtDummyMode.Checked) { - settings.DummyMode = false; _log.Info("Выключаем режим Тестового прогона"); } using (var tokenSource = GetTokenSource()) { - await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, tokenSource.Token); + await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, tokenSource.Token); } LockUnlock(true); @@ -149,7 +148,7 @@ namespace JiraTimeBotForm.UI using (_tokenSource = GetTokenSource()) { - await _job.DoTheJob(settings, _tasksProcessors.MeetingProcessor, _tokenSource.Token); + await _job.DoTheJob(settings, _tasksProcessors.MeetingProcessor, txtDummyMode.Checked, _tokenSource.Token); } LockUnlock(true); @@ -160,11 +159,6 @@ namespace JiraTimeBotForm.UI _tokenSource.Cancel(); } - private void textBox1_KeyPress(object sender, KeyPressEventArgs e) - { - e.Handled = !char.IsDigit(e.KeyChar) && !char.IsControl(e.KeyChar); - } - private void btnSettings_Click(object sender, EventArgs e) { var frm = new frmSettings(); diff --git a/JiraTimeBotForm/UI/frmSettings.Designer.cs b/JiraTimeBotForm/UI/frmSettings.Designer.cs index e1d689c..7951c7b 100644 --- a/JiraTimeBotForm/UI/frmSettings.Designer.cs +++ b/JiraTimeBotForm/UI/frmSettings.Designer.cs @@ -59,6 +59,7 @@ this.txtRoundTo.Name = "txtRoundTo"; this.txtRoundTo.Size = new System.Drawing.Size(100, 20); this.txtRoundTo.TabIndex = 27; + this.txtRoundTo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtRoundTo_KeyPress); // // label4 // diff --git a/JiraTimeBotForm/UI/frmSettings.cs b/JiraTimeBotForm/UI/frmSettings.cs index 6aa3681..96beb64 100644 --- a/JiraTimeBotForm/UI/frmSettings.cs +++ b/JiraTimeBotForm/UI/frmSettings.cs @@ -67,5 +67,10 @@ namespace JiraTimeBotForm.UI MessageBox.Show("Настройки сохранены."); this.Close(); } + + private void txtRoundTo_KeyPress(object sender, KeyPressEventArgs e) + { + e.Handled = !char.IsDigit(e.KeyChar) && !char.IsControl(e.KeyChar); + } } }