Compare commits

...
5 Commits
6 changed files with 48 additions and 35 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.19 1.0.20
+3 -1
View File
@@ -1,7 +1,9 @@
# JiraTimeBot [![Build Status](https://travis-ci.org/monster1025/JiraTimeBot.svg?branch=master)](https://travis-ci.org/monster1025/JiraTimeBot) # JiraTimeBot [![Build Status](https://travis-ci.org/monster1025/JiraTimeBot.svg?branch=master)](https://travis-ci.org/monster1025/JiraTimeBot)
Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку. Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку.
# Предположения # Ограничения
- Предполагается что все Ваши репозитории находятся в одной папке (к которой вы указываете путь в настройках). - Предполагается что все Ваши репозитории находятся в одной папке (к которой вы указываете путь в настройках).
- Предполагается что ветки в JIRA имеют название эквивалентное имени бранча в Mercurial. - Предполагается что ветки в JIRA имеют название эквивалентное имени бранча в Mercurial.
# Скачать
Скачать актуальную версию можно тут: https://github.com/monster1025/JiraTimeBot/releases/latest
+1 -1
View File
@@ -19,7 +19,7 @@ call tools\SetVersion.cmd %VERSION%
git add . git add .
git commit -m "%~1" git commit -m "%~1"
git tag -m "Version v%VERSION%" -a v%VERSION% git tag -m "Version v%VERSION%: %~1" -a v%VERSION%
git push origin v%VERSION% git push origin v%VERSION%
git push git push
+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.19")] [assembly: AssemblyVersion("1.0.20")]
[assembly: AssemblyFileVersion("1.0.19")] [assembly: AssemblyFileVersion("1.0.20")]
[assembly: AssemblyInformationalVersion("1.0.19")] [assembly: AssemblyInformationalVersion("1.0.20")]
@@ -23,6 +23,17 @@ namespace JiraTimeBot.TaskTime
int remainMinutes = settings.MinuterPerWorkDay; int remainMinutes = settings.MinuterPerWorkDay;
int totalCommitsCount = commits.Count; int totalCommitsCount = commits.Count;
//если кол-во коммитов более чем кол-во интервалов - то уменьшим интервал вдвое.
while (totalCommitsCount > (8 * (60.0 / settings.RountToMinutes)))
{
settings.RountToMinutes = (int)RoundTo((decimal)(settings.RountToMinutes / 2.0), 5);
_log.Info($"Слишком много задачь - уменьшаю интервал до {settings.RountToMinutes}.");
if (settings.RountToMinutes == 5)
{
break;
}
}
List<TaskTimeItem> workTimeItems = new List<TaskTimeItem>(); List<TaskTimeItem> workTimeItems = new List<TaskTimeItem>();
//Нам нужно раскидать 480 минут в день. //Нам нужно раскидать 480 минут в день.
+1 -1
View File
@@ -114,7 +114,7 @@
// //
// tmrUpdate // tmrUpdate
// //
this.tmrUpdate.Interval = 10000; this.tmrUpdate.Interval = 1000;
this.tmrUpdate.Tick += new System.EventHandler(this.tmrUpdate_Tick); this.tmrUpdate.Tick += new System.EventHandler(this.tmrUpdate_Tick);
// //
// frmMain // frmMain