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

Pull перед работой

Browse Source
This commit is contained in:
Danil Kislov
2019-12-11 09:04:40 +03:00
parent e26ef9d7f4
commit 2f1578a695
6 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.semver.txt
+1 -1
View File
@@ -1 +1 @@
1.0.68 1.0.69
src/JiraTimeBot/Configuration/Settings.cs
+1 -1
View File
@@ -13,7 +13,7 @@ namespace JiraTimeBot.Configuration
public int RoundToMinutes { get; set; } public int RoundToMinutes { get; set; }
public string JiraUrl = "https://myteam.aeroclub.ru"; public string JiraUrl = "https://myteam.aeroclub.ru";
public bool PullBeforeProcess { get; set; }
public string RepositoryPath { get; set; } public string RepositoryPath { get; set; }
public string MercurialAuthorEmail { get; set; } public string MercurialAuthorEmail { get; set; }
public string JiraUserName { get; set; } public string JiraUserName { get; set; }
src/JiraTimeBot/Mercurial/MercurialLog.cs
+6
View File
@@ -51,6 +51,12 @@ namespace JiraTimeBot.Mercurial
var directoryInfo = new DirectoryInfo(repoDirectory); var directoryInfo = new DirectoryInfo(repoDirectory);
var repo = new Repository(repoDirectory); var repo = new Repository(repoDirectory);
if (settings.PullBeforeProcess)
{
repo.Pull();
}
var logCommand = new LogCommand var logCommand = new LogCommand
{ {
Date = date, Date = date,
src/JiraTimeBot/Properties/AssemblyInfo.cs
+31 -31
View File
@@ -1,31 +1,31 @@
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("JiraTimeBot")] [assembly: AssemblyTitle("JiraTimeBot")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JiraTimeBot")] [assembly: AssemblyProduct("JiraTimeBot")]
[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible // Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from // to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type. // COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] [assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
// Version information for an assembly consists of the following four values: // Version information for an assembly consists of the following four values:
// //
// Major Version // Major Version
// Minor Version // Minor Version
// Build Number // Build Number
// Revision // Revision
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.68")] [assembly: AssemblyVersion("1.0.69")]
[assembly: AssemblyFileVersion("1.0.68")] [assembly: AssemblyFileVersion("1.0.69")]
[assembly: AssemblyInformationalVersion("1.0.68")] [assembly: AssemblyInformationalVersion("1.0.69")]
src/JiraTimeBot/UI/frmSettings.Designer.cs
Generated
+15 -2
View File
@@ -53,6 +53,7 @@
this.txtWorkDayDuration = new System.Windows.Forms.TextBox(); this.txtWorkDayDuration = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label();
this.txtRandomMinutes = new System.Windows.Forms.TextBox(); this.txtRandomMinutes = new System.Windows.Forms.TextBox();
this.chkPullBeforeProcess = new System.Windows.Forms.CheckBox();
this.SuspendLayout(); this.SuspendLayout();
// //
// label5 // label5
@@ -168,7 +169,7 @@
// //
// btnSave // btnSave
// //
this.btnSave.Location = new System.Drawing.Point(86, 359); this.btnSave.Location = new System.Drawing.Point(86, 382);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(75, 23); this.btnSave.Size = new System.Drawing.Size(75, 23);
this.btnSave.TabIndex = 32; this.btnSave.TabIndex = 32;
@@ -272,11 +273,22 @@
this.txtRandomMinutes.Size = new System.Drawing.Size(99, 20); this.txtRandomMinutes.Size = new System.Drawing.Size(99, 20);
this.txtRandomMinutes.TabIndex = 43; this.txtRandomMinutes.TabIndex = 43;
// //
// chkPullBeforeProcess
//
this.chkPullBeforeProcess.AutoSize = true;
this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 359);
this.chkPullBeforeProcess.Name = "chkPullBeforeProcess";
this.chkPullBeforeProcess.Size = new System.Drawing.Size(83, 17);
this.chkPullBeforeProcess.TabIndex = 45;
this.chkPullBeforeProcess.Text = "Делать pull";
this.chkPullBeforeProcess.UseVisualStyleBackColor = true;
//
// frmSettings // frmSettings
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(243, 391); this.ClientSize = new System.Drawing.Size(243, 414);
this.Controls.Add(this.chkPullBeforeProcess);
this.Controls.Add(this.label9); this.Controls.Add(this.label9);
this.Controls.Add(this.txtRandomMinutes); this.Controls.Add(this.txtRandomMinutes);
this.Controls.Add(this.lblWorkDay); this.Controls.Add(this.lblWorkDay);
@@ -340,5 +352,6 @@
private System.Windows.Forms.TextBox txtWorkDayDuration; private System.Windows.Forms.TextBox txtWorkDayDuration;
private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label9;
private System.Windows.Forms.TextBox txtRandomMinutes; private System.Windows.Forms.TextBox txtRandomMinutes;
private System.Windows.Forms.CheckBox chkPullBeforeProcess;
} }
} }
src/JiraTimeBot/UI/frmSettings.cs
+3 -1
View File
@@ -40,6 +40,7 @@ namespace JiraTimeBot.UI
txtJQL.Text = settings.JiraQuery; txtJQL.Text = settings.JiraQuery;
txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString(); txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString(); txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString();
chkPullBeforeProcess.Checked = settings.PullBeforeProcess;
cboWorkType_SelectedIndexChanged(null, null); cboWorkType_SelectedIndexChanged(null, null);
} }
@@ -72,7 +73,8 @@ namespace JiraTimeBot.UI
JiraQuery = txtJQL.Text, JiraQuery = txtJQL.Text,
TimeControlTask = txtTimeControlTask.Text, TimeControlTask = txtTimeControlTask.Text,
MinuterPerWorkDay = minuterPerWorkDay, MinuterPerWorkDay = minuterPerWorkDay,
RandomWorkMinutes = randomWorkMinutes RandomWorkMinutes = randomWorkMinutes,
PullBeforeProcess = chkPullBeforeProcess.Checked
}; };
//LockUnlock(false); //LockUnlock(false);