Мелкие фиксы настроек и WorkMode
This commit is contained in:
@@ -40,7 +40,6 @@ namespace JiraTimeBotForm.JiraIntegration
|
|||||||
date = date.GetValueOrDefault(DateTime.Now.Date);
|
date = date.GetValueOrDefault(DateTime.Now.Date);
|
||||||
|
|
||||||
var userName = settings.JiraUserName;
|
var userName = settings.JiraUserName;
|
||||||
//userName = "Zoya.Aleksandridi";
|
|
||||||
|
|
||||||
var jql = $"status changed by '{userName}' during (\"{date.Value:yyyy-MM-dd}\",\"{date.Value:yyyy-MM-dd}\")";
|
var jql = $"status changed by '{userName}' during (\"{date.Value:yyyy-MM-dd}\",\"{date.Value:yyyy-MM-dd}\")";
|
||||||
var affectedIssues = jira.Issues.GetIssuesFromJqlAsync(jql, 50, 0, cancellationToken).Result.ToList();
|
var affectedIssues = jira.Issues.GetIssuesFromJqlAsync(jql, 50, 0, cancellationToken).Result.ToList();
|
||||||
|
|||||||
@@ -90,9 +90,13 @@ namespace JiraTimeBotForm.UI
|
|||||||
|
|
||||||
private void Form1_Load(object sender, EventArgs e)
|
private void Form1_Load(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
_settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
|
|
||||||
tmrStart.Enabled = true;
|
tmrStart.Enabled = true;
|
||||||
|
PrintStartMessage();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PrintStartMessage()
|
||||||
|
{
|
||||||
|
_settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
|
||||||
_log.Info($"Загружен бот для {_settings.JiraUserName}, Режим: {_settings.WorkType.ToString()}, работаем в {_settings.RepositoryPath}");
|
_log.Info($"Загружен бот для {_settings.JiraUserName}, Режим: {_settings.WorkType.ToString()}, работаем в {_settings.RepositoryPath}");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,6 +179,8 @@ namespace JiraTimeBotForm.UI
|
|||||||
{
|
{
|
||||||
var frm = new frmSettings();
|
var frm = new frmSettings();
|
||||||
frm.ShowDialog();
|
frm.ShowDialog();
|
||||||
|
|
||||||
|
PrintStartMessage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-4
@@ -167,10 +167,11 @@
|
|||||||
//
|
//
|
||||||
// cboWorkType
|
// cboWorkType
|
||||||
//
|
//
|
||||||
|
this.cboWorkType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||||
this.cboWorkType.FormattingEnabled = true;
|
this.cboWorkType.FormattingEnabled = true;
|
||||||
this.cboWorkType.Items.AddRange(new object[] {
|
this.cboWorkType.Items.AddRange(new object[] {
|
||||||
"Mercurial",
|
"Mercurial",
|
||||||
"Jira Updates"});
|
"Обновления Jira-задачь"});
|
||||||
this.cboWorkType.Location = new System.Drawing.Point(109, 18);
|
this.cboWorkType.Location = new System.Drawing.Point(109, 18);
|
||||||
this.cboWorkType.Name = "cboWorkType";
|
this.cboWorkType.Name = "cboWorkType";
|
||||||
this.cboWorkType.Size = new System.Drawing.Size(99, 21);
|
this.cboWorkType.Size = new System.Drawing.Size(99, 21);
|
||||||
@@ -179,11 +180,11 @@
|
|||||||
// label6
|
// label6
|
||||||
//
|
//
|
||||||
this.label6.AutoSize = true;
|
this.label6.AutoSize = true;
|
||||||
this.label6.Location = new System.Drawing.Point(27, 21);
|
this.label6.Location = new System.Drawing.Point(18, 21);
|
||||||
this.label6.Name = "label6";
|
this.label6.Name = "label6";
|
||||||
this.label6.Size = new System.Drawing.Size(75, 13);
|
this.label6.Size = new System.Drawing.Size(85, 13);
|
||||||
this.label6.TabIndex = 35;
|
this.label6.TabIndex = 35;
|
||||||
this.label6.Text = "Работаем на:";
|
this.label6.Text = "Режим работы:";
|
||||||
//
|
//
|
||||||
// frmSettings
|
// frmSettings
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -117,4 +117,7 @@
|
|||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
|
<metadata name="cboWorkType.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>True</value>
|
||||||
|
</metadata>
|
||||||
</root>
|
</root>
|
||||||
Reference in New Issue
Block a user