monster/JiraTimeBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Исправление dummy mode

Browse Source
This commit is contained in:
Danil Kislov
2019-03-16 02:23:46 +03:00
parent 1ccf2414d2
commit ca04b1cfb3
9 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JiraTimeBotForm/Configuration/Settings.cs
-1
View File
@@ -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; }
JiraTimeBotForm/DI/ContainerBuilder.cs
-1
View File
@@ -39,7 +39,6 @@ namespace JiraTimeBotForm.DI
_builder.RegisterType<MeetingProcessor>().AsSelf().As<ITasksProcessor>();
_builder.RegisterAggregateService<IAllTasksProcessors>();
_builder.RegisterType<JiraDescriptionSource>().AsSelf().As<IJiraDescriptionSource>();
_builder.RegisterType<JiraApi>().AsSelf().AsImplementedInterfaces();
JiraTimeBotForm/Job.cs
+4 -4
View File
@@ -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;
JiraTimeBotForm/TasksProcessors/ITasksProcessor.cs
+1 -1
View File
@@ -7,6 +7,6 @@ namespace JiraTimeBotForm.TasksProcessors
{
interface ITasksProcessor
{
void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings);
void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode);
}
}
JiraTimeBotForm/TasksProcessors/MeetingProcessor.cs
+1 -2
View File
@@ -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<TaskTimeItem> taskTimes, Settings settings)
public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode)
{
_log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:");
JiraTimeBotForm/TasksProcessors/WorkLogTasksProcessor.cs
+2 -2
View File
@@ -18,7 +18,7 @@ namespace JiraTimeBotForm.TasksProcessors
_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} распределение по задачам:");
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);
}
}
}
JiraTimeBotForm/UI/frmMain.cs
+4 -10
View File
@@ -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();
JiraTimeBotForm/UI/frmSettings.Designer.cs
Generated
+1
View File
@@ -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
//
JiraTimeBotForm/UI/frmSettings.cs
+5
View File
@@ -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);
}
}
}