Исправление dummy mode
This commit is contained in:
@@ -17,7 +17,6 @@ namespace JiraTimeBotForm.Configuration
|
|||||||
public string JiraUserName { get; set; }
|
public string JiraUserName { get; set; }
|
||||||
public string JiraPassword { get; set; }
|
public string JiraPassword { get; set; }
|
||||||
public TimeSpan ActivationTime { get; set; }
|
public TimeSpan ActivationTime { get; set; }
|
||||||
public bool DummyMode { get; set; }
|
|
||||||
public bool AddCommentsToWorklog { get; set; }
|
public bool AddCommentsToWorklog { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ namespace JiraTimeBotForm.DI
|
|||||||
_builder.RegisterType<WorkLogTasksProcessor>().AsSelf().As<ITasksProcessor>();
|
_builder.RegisterType<WorkLogTasksProcessor>().AsSelf().As<ITasksProcessor>();
|
||||||
_builder.RegisterType<MeetingProcessor>().AsSelf().As<ITasksProcessor>();
|
_builder.RegisterType<MeetingProcessor>().AsSelf().As<ITasksProcessor>();
|
||||||
_builder.RegisterAggregateService<IAllTasksProcessors>();
|
_builder.RegisterAggregateService<IAllTasksProcessors>();
|
||||||
|
|
||||||
|
|
||||||
_builder.RegisterType<JiraDescriptionSource>().AsSelf().As<IJiraDescriptionSource>();
|
_builder.RegisterType<JiraDescriptionSource>().AsSelf().As<IJiraDescriptionSource>();
|
||||||
_builder.RegisterType<JiraApi>().AsSelf().AsImplementedInterfaces();
|
_builder.RegisterType<JiraApi>().AsSelf().AsImplementedInterfaces();
|
||||||
|
|||||||
@@ -25,14 +25,14 @@ namespace JiraTimeBotForm
|
|||||||
_log = log;
|
_log = log;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task DoTheJob(Settings settings, ITasksProcessor tasksProcessor, CancellationToken cancellationToken)
|
public Task DoTheJob(Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
_log.Info("Начинаем работу");
|
_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;
|
int daysDiff = 0;
|
||||||
if (tasksProcessor is MeetingProcessor)
|
if (tasksProcessor is MeetingProcessor)
|
||||||
@@ -71,7 +71,7 @@ namespace JiraTimeBotForm
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
tasksProcessor.Process(date, taskTimes, settings);
|
tasksProcessor.Process(date, taskTimes, settings, dummyMode);
|
||||||
|
|
||||||
_log.Info("Готово.");
|
_log.Info("Готово.");
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -7,6 +7,6 @@ namespace JiraTimeBotForm.TasksProcessors
|
|||||||
{
|
{
|
||||||
interface ITasksProcessor
|
interface ITasksProcessor
|
||||||
{
|
{
|
||||||
void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings);
|
void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using JiraTimeBotForm.Configuration;
|
using JiraTimeBotForm.Configuration;
|
||||||
using JiraTimeBotForm.JiraIntegration;
|
using JiraTimeBotForm.JiraIntegration;
|
||||||
using JiraTimeBotForm.TaskTime;
|
|
||||||
using JiraTimeBotForm.TaskTime.Objects;
|
using JiraTimeBotForm.TaskTime.Objects;
|
||||||
|
|
||||||
namespace JiraTimeBotForm.TasksProcessors
|
namespace JiraTimeBotForm.TasksProcessors
|
||||||
@@ -19,7 +18,7 @@ namespace JiraTimeBotForm.TasksProcessors
|
|||||||
_jiraApi = jiraApi;
|
_jiraApi = jiraApi;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings)
|
public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode)
|
||||||
{
|
{
|
||||||
_log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:");
|
_log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:");
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ namespace JiraTimeBotForm.TasksProcessors
|
|||||||
_jiraApi = jiraApi;
|
_jiraApi = jiraApi;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings)
|
public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode)
|
||||||
{
|
{
|
||||||
_log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:");
|
_log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:");
|
||||||
foreach (var taskTime in taskTimes)
|
foreach (var taskTime in taskTimes)
|
||||||
@@ -26,7 +26,7 @@ namespace JiraTimeBotForm.TasksProcessors
|
|||||||
_log.Trace($"- {taskTime.Branch} (коммитов {taskTime.Commits}): {taskTime.Time}");
|
_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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ namespace JiraTimeBotForm.UI
|
|||||||
|
|
||||||
using (_tokenSource = GetTokenSource())
|
using (_tokenSource = GetTokenSource())
|
||||||
{
|
{
|
||||||
await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, _tokenSource.Token);
|
await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, _tokenSource.Token);
|
||||||
}
|
}
|
||||||
|
|
||||||
LockUnlock(true);
|
LockUnlock(true);
|
||||||
@@ -128,15 +128,14 @@ namespace JiraTimeBotForm.UI
|
|||||||
|
|
||||||
await Task.Delay(2000);
|
await Task.Delay(2000);
|
||||||
|
|
||||||
if (settings.DummyMode)
|
if (txtDummyMode.Checked)
|
||||||
{
|
{
|
||||||
settings.DummyMode = false;
|
|
||||||
_log.Info("Выключаем режим Тестового прогона");
|
_log.Info("Выключаем режим Тестового прогона");
|
||||||
}
|
}
|
||||||
|
|
||||||
using (var tokenSource = GetTokenSource())
|
using (var tokenSource = GetTokenSource())
|
||||||
{
|
{
|
||||||
await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, tokenSource.Token);
|
await _job.DoTheJob(settings, _tasksProcessors.WorkLogTasksProcessor, txtDummyMode.Checked, tokenSource.Token);
|
||||||
}
|
}
|
||||||
|
|
||||||
LockUnlock(true);
|
LockUnlock(true);
|
||||||
@@ -149,7 +148,7 @@ namespace JiraTimeBotForm.UI
|
|||||||
|
|
||||||
using (_tokenSource = GetTokenSource())
|
using (_tokenSource = GetTokenSource())
|
||||||
{
|
{
|
||||||
await _job.DoTheJob(settings, _tasksProcessors.MeetingProcessor, _tokenSource.Token);
|
await _job.DoTheJob(settings, _tasksProcessors.MeetingProcessor, txtDummyMode.Checked, _tokenSource.Token);
|
||||||
}
|
}
|
||||||
|
|
||||||
LockUnlock(true);
|
LockUnlock(true);
|
||||||
@@ -160,11 +159,6 @@ namespace JiraTimeBotForm.UI
|
|||||||
_tokenSource.Cancel();
|
_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)
|
private void btnSettings_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var frm = new frmSettings();
|
var frm = new frmSettings();
|
||||||
|
|||||||
+1
@@ -59,6 +59,7 @@
|
|||||||
this.txtRoundTo.Name = "txtRoundTo";
|
this.txtRoundTo.Name = "txtRoundTo";
|
||||||
this.txtRoundTo.Size = new System.Drawing.Size(100, 20);
|
this.txtRoundTo.Size = new System.Drawing.Size(100, 20);
|
||||||
this.txtRoundTo.TabIndex = 27;
|
this.txtRoundTo.TabIndex = 27;
|
||||||
|
this.txtRoundTo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtRoundTo_KeyPress);
|
||||||
//
|
//
|
||||||
// label4
|
// label4
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -67,5 +67,10 @@ namespace JiraTimeBotForm.UI
|
|||||||
MessageBox.Show("Настройки сохранены.");
|
MessageBox.Show("Настройки сохранены.");
|
||||||
this.Close();
|
this.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void txtRoundTo_KeyPress(object sender, KeyPressEventArgs e)
|
||||||
|
{
|
||||||
|
e.Handled = !char.IsDigit(e.KeyChar) && !char.IsControl(e.KeyChar);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user