From e19e1cbffd49a131684baa9b27ec0051a31c33a3 Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Thu, 14 Mar 2019 11:15:52 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20=D1=80=D0=B0?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs index 49d4e07..5fc2219 100644 --- a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs +++ b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs @@ -55,12 +55,17 @@ namespace JiraTimeBotForm.TaskTime } } + int remainMinutes = settings.MinuterPerWorkDay; + float fifteenMinIntervals = settings.MinuterPerWorkDay / 15; + float intervalPerCommit = fifteenMinIntervals / workTasks.Count; + //Ð�ам нужно раÑ�кидать 480 минут в день. var workTimeItems = new List(); foreach (var taskGroup in workTasks.GroupBy(f=>f)) { - var minutesPerTime = settings.MinuterPerWorkDay / workTasks.Count; - var minutesForCurrentTaskGroup = minutesPerTime * taskGroup.Count(); + int currentIntervalsCount = (int)(intervalPerCommit * taskGroup.Count()); + var minutesForCurrentTaskGroup = currentIntervalsCount * 15; + remainMinutes = remainMinutes - minutesForCurrentTaskGroup; workTimeItems.Add(new TaskTimeItem { @@ -70,6 +75,11 @@ namespace JiraTimeBotForm.TaskTime }); } + if (workTimeItems.Any()) + { + workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes); + } + return workTimeItems; } } From 7dd520b03f79ff018905262cf6ca120fd3e1b93a Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Thu, 14 Mar 2019 11:17:31 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=A3=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=82?= =?UTF-8?q?=D0=B0=D0=B9=D0=BC=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JiraTimeBotForm/frmMain.Designer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/JiraTimeBotForm/frmMain.Designer.cs b/JiraTimeBotForm/frmMain.Designer.cs index 1dc3466..1711e94 100644 --- a/JiraTimeBotForm/frmMain.Designer.cs +++ b/JiraTimeBotForm/frmMain.Designer.cs @@ -169,7 +169,7 @@ // tmrStart // this.tmrStart.Enabled = true; - this.tmrStart.Interval = 1000; + this.tmrStart.Interval = 1500; this.tmrStart.Tick += new System.EventHandler(this.tmrStart_Tick); // // txtDummyMode From 2116336723bd52e42ee37d8ce51ac3f3768432c8 Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Thu, 14 Mar 2019 11:48:27 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=A3=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=82?= =?UTF-8?q?=D0=B0=D0=B9=D0=BC=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskTime/TaskTimeDiscoverer.cs | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs index 5fc2219..0328147 100644 --- a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs +++ b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs @@ -54,33 +54,42 @@ namespace JiraTimeBotForm.TaskTime Application.DoEvents(); } } + if (!workTasks.Any()) + { + return new List(); + } int remainMinutes = settings.MinuterPerWorkDay; - float fifteenMinIntervals = settings.MinuterPerWorkDay / 15; - float intervalPerCommit = fifteenMinIntervals / workTasks.Count; //Ð�ам нужно раÑ�кидать 480 минут в день. var workTimeItems = new List(); foreach (var taskGroup in workTasks.GroupBy(f=>f)) { - int currentIntervalsCount = (int)(intervalPerCommit * taskGroup.Count()); - var minutesForCurrentTaskGroup = currentIntervalsCount * 15; - remainMinutes = remainMinutes - minutesForCurrentTaskGroup; + int currentTaskCommits = taskGroup.Count(); + int currentTaskTime = (int)RoundTo15(settings.MinuterPerWorkDay / workTasks.Count * currentTaskCommits); + remainMinutes = remainMinutes - currentTaskTime; workTimeItems.Add(new TaskTimeItem { Branch = taskGroup.Key, - Time = TimeSpan.FromMinutes(minutesForCurrentTaskGroup), + Time = TimeSpan.FromMinutes(currentTaskTime), Commits = taskGroup.Count(), }); } - - if (workTimeItems.Any()) - { - workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes); - } + workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes); return workTimeItems; } + + private decimal RoundTo15(decimal value, bool up = true) + { + if ((value % 15) == 0) + return value; + if (up) + return (value - (value % 15) + 15); + + return (value - (value % 15)); + } + } } From fc0038897a15655b995813d712efbd081abbf0da Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Thu, 14 Mar 2019 12:15:38 +0300 Subject: [PATCH 4/5] Readme --- Google-Noto-Emoji-Smileys-10103-robot-face.ico | Bin 174158 -> 0 bytes README.md | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 Google-Noto-Emoji-Smileys-10103-robot-face.ico diff --git a/Google-Noto-Emoji-Smileys-10103-robot-face.ico b/Google-Noto-Emoji-Smileys-10103-robot-face.ico deleted file mode 100644 index 910d597e1679111d9c386a21cbf4e632f516e383..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174158 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 D)IWBI diff --git a/README.md b/README.md index ff79482..605fe91 100644 --- a/README.md +++ b/README.md @@ -1 +1,7 @@ -# JiraTimeBot \ No newline at end of file +# JiraTimeBot +Ïðèëîæåíèå äëÿ àâòîìàòè÷åñêîãî äîáàâëåíèÿ Jira Worklog'îâ èñõîäÿ èç êîëè÷åñòâà êîììèòîâ â âåòêó. + +# Ïðåäïîëîæåíèÿ + - Ïðåäïîëàãàåòñÿ ÷òî âñå Âàøè ðåïîçèòîðèè íàõîäÿòñÿ â îäíîé ïàïêå (ê êîòîðîé âû óêàçûâàåòå ïóòü â íàñòðîéêàõ). + - Ïðåäïîëàãàåòñÿ ÷òî âåòêè â JIRA èìåþò íàçâàíèå ýêâèâàëåíòíîå èìåíè áðàí÷à. + From 43a44d06d3cc7d83beb25ec48e4f76007c1a3dea Mon Sep 17 00:00:00 2001 From: Danil <48130709+aeroclub-monster@users.noreply.github.com> Date: Thu, 14 Mar 2019 12:16:52 +0300 Subject: [PATCH 5/5] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 605fe91..e0d48a0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # JiraTimeBot -Ïðèëîæåíèå äëÿ àâòîìàòè÷åñêîãî äîáàâëåíèÿ Jira Worklog'îâ èñõîäÿ èç êîëè÷åñòâà êîììèòîâ â âåòêó. +Приложение длÑ� автоматичеÑ�кого добавлениÑ� Jira Worklog'ов иÑ�ходÑ� из количеÑ�тва коммитов в ветку. -# Ïðåäïîëîæåíèÿ - - Ïðåäïîëàãàåòñÿ ÷òî âñå Âàøè ðåïîçèòîðèè íàõîäÿòñÿ â îäíîé ïàïêå (ê êîòîðîé âû óêàçûâàåòå ïóòü â íàñòðîéêàõ). - - Ïðåäïîëàãàåòñÿ ÷òî âåòêè â JIRA èìåþò íàçâàíèå ýêâèâàëåíòíîå èìåíè áðàí÷à. +# ПредположениÑ� + - ПредполагаетÑ�Ñ� что вÑ�е Ваши репозитории находÑ�Ñ‚Ñ�Ñ� в одной папке (к которой вы указываете путь в наÑ�тройках). + - ПредполагаетÑ�Ñ� что ветки в JIRA имеют название Ñ�квивалентное имени бранча в Mercurial.