summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2020-05-05 14:25:42 +0200
committeremkael <emkael@tlen.pl>2020-05-05 14:25:42 +0200
commit62827e6cf470449c117624058fb36ad94804bcc0 (patch)
tree10cd1e4d36c34b694acfadaa69fc7f6ae2b1eabd
parent7b66ddf2e4fbdb837e78d8b7dbaa9fc38391bc32 (diff)
Time tracking related pluginsHEADmaster
-rw-r--r--plugins/TaskIntervalButton/Controller/TaskIntervalController.php45
-rw-r--r--plugins/TaskIntervalButton/LICENSE21
-rw-r--r--plugins/TaskIntervalButton/Locale/en_GB/translations.php3
-rw-r--r--plugins/TaskIntervalButton/Locale/pl_PL/translations.php9
-rw-r--r--plugins/TaskIntervalButton/Makefile5
-rw-r--r--plugins/TaskIntervalButton/Plugin.php47
-rw-r--r--plugins/TaskIntervalButton/README.md31
-rw-r--r--plugins/TaskIntervalButton/Template/task_add_interval/add_interval_button.php5
-rw-r--r--plugins/TaskIntervalButton/Template/task_add_interval/add_interval_confirm.php15
-rw-r--r--plugins/TaskIntervalButton/Test/PluginTest.php20
-rw-r--r--plugins/TimeMachine/Action/SubtaskTimerMoveTaskColumn.php40
-rw-r--r--plugins/TimeMachine/Assets/js/components/chart-project-time-machine.js84
-rw-r--r--plugins/TimeMachine/Controller/AnalyticsTimesController.php150
-rw-r--r--plugins/TimeMachine/Controller/SubtaskController.php100
-rw-r--r--plugins/TimeMachine/Helper/AnalyticsTimes.php177
-rw-r--r--plugins/TimeMachine/Helper/SubTaskTimeTracking.php38
-rw-r--r--plugins/TimeMachine/LICENSE674
-rw-r--r--plugins/TimeMachine/Locale/fr_FR/translations.php11
-rw-r--r--plugins/TimeMachine/Locale/pl_PL/translations.php10
-rw-r--r--plugins/TimeMachine/Makefile5
-rw-r--r--plugins/TimeMachine/Model/SubtaskTimeTrackingModel.php147
-rw-r--r--plugins/TimeMachine/Plugin.php95
-rw-r--r--plugins/TimeMachine/README.md61
-rw-r--r--plugins/TimeMachine/Template/analytic/sidebar.php46
-rw-r--r--plugins/TimeMachine/Template/analytic/spent_time_by_dates.php100
-rw-r--r--plugins/TimeMachine/Template/analytic/time_comparison_by_categories.php84
-rw-r--r--plugins/TimeMachine/Template/analytic/time_comparison_by_swimlane.php84
-rw-r--r--plugins/TimeMachine/Template/subtask/edit.php28
-rw-r--r--plugins/TimeMachine/Template/subtask/menu.php21
-rw-r--r--plugins/TimeMachine/Test/PluginTest.php19
-rw-r--r--plugins/TimeMachine/Validator/SubTaskTimeTrackingValidator.php48
-rw-r--r--plugins/Timetrackingeditor/Console/AllSubtaskTimeTrackingExportCommand.php29
-rw-r--r--plugins/Timetrackingeditor/Console/SubtaskTimeTrackingExportCommand.php35
-rw-r--r--plugins/Timetrackingeditor/Controller/SubtaskAjaxController.php45
-rw-r--r--plugins/Timetrackingeditor/Controller/SubtaskStatusController.php49
-rw-r--r--plugins/Timetrackingeditor/Controller/TimeTrackingEditorController.php377
-rw-r--r--plugins/Timetrackingeditor/Export/SubtaskTimeTrackingExport.php218
-rw-r--r--plugins/Timetrackingeditor/Filter/SubtaskIdFilter.php39
-rw-r--r--plugins/Timetrackingeditor/Filter/SubtaskTasksFilter.php46
-rw-r--r--plugins/Timetrackingeditor/Filter/SubtaskTitleFilter.php47
-rw-r--r--plugins/Timetrackingeditor/Formatter/SubtaskAutoCompleteFormatter.php39
-rw-r--r--plugins/Timetrackingeditor/Html.php182
-rw-r--r--plugins/Timetrackingeditor/Model/SubtaskTimeTrackingCreationModel.php53
-rw-r--r--plugins/Timetrackingeditor/Model/SubtaskTimeTrackingEditModel.php143
-rw-r--r--plugins/Timetrackingeditor/Model/SubtaskTimeTrackingModel.php133
-rw-r--r--plugins/Timetrackingeditor/Plugin.php91
-rw-r--r--plugins/Timetrackingeditor/README.md40
-rw-r--r--plugins/Timetrackingeditor/Schema/Mysql.php16
-rw-r--r--plugins/Timetrackingeditor/Schema/Postgres.php16
-rw-r--r--plugins/Timetrackingeditor/Schema/Sqlite.php16
-rw-r--r--plugins/Timetrackingeditor/Template/create.php41
-rw-r--r--plugins/Timetrackingeditor/Template/edit.php41
-rw-r--r--plugins/Timetrackingeditor/Template/menu.php23
-rw-r--r--plugins/Timetrackingeditor/Template/remove.php20
-rw-r--r--plugins/Timetrackingeditor/Template/start.php23
-rw-r--r--plugins/Timetrackingeditor/Template/stop.php23
-rw-r--r--plugins/Timetrackingeditor/Template/subtask/table.php89
-rw-r--r--plugins/Timetrackingeditor/Template/time_tracking_editor.php53
-rw-r--r--plugins/Timetrackingeditor/Test/PluginTest.php17
-rw-r--r--plugins/Timetrackingeditor/Test/TimetrackingeditorTest.php48
-rw-r--r--plugins/Timetrackingeditor/Validator/SubtaskTimeTrackingValidator.php73
-rw-r--r--plugins/Timetrackingeditor/assets/css/timetrackingeditor.css3
62 files changed, 4291 insertions, 0 deletions
diff --git a/plugins/TaskIntervalButton/Controller/TaskIntervalController.php b/plugins/TaskIntervalButton/Controller/TaskIntervalController.php
new file mode 100644
index 00000000..27b9395d
--- /dev/null
+++ b/plugins/TaskIntervalButton/Controller/TaskIntervalController.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Kanboard\Plugin\TaskIntervalButton\Controller;
+
+use Kanboard\Controller\BaseController;
+use Kanboard\Core\Controller\AccessForbiddenException;
+
+class TaskIntervalController extends BaseController
+{
+ public function confirm()
+ {
+ $task = $this->getTask();
+ $user = $this->getUser();
+
+ if ($user['username'] !== $task["assignee_username"]) {
+ throw new AccessForbiddenException();
+ }
+
+ $this->response->html($this->template->render('TaskIntervalButton:task_add_interval/add_interval_confirm', array(
+ 'task' => $task,
+ 'user' => $user
+ )));
+ }
+
+ public function addInterval()
+ {
+ $task = $this->getTask();
+ $user = $this->getUser();
+ $this->checkCSRFParam();
+
+ if ($user['username'] !== $task["assignee_username"]) {
+ throw new AccessForbiddenException();
+ }
+
+ $values = array('id' => $task['id'], 'time_spent' => $task['time_spent'] + 0.5);
+
+ if ($this->taskModificationModel->update($values, false)) {
+ $this->flash->success(t("Interval added."));
+ } else {
+ $this->flash->failure(t("Unable to add interval."));
+ }
+
+ return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+ }
+} \ No newline at end of file
diff --git a/plugins/TaskIntervalButton/LICENSE b/plugins/TaskIntervalButton/LICENSE
new file mode 100644
index 00000000..88d0052e
--- /dev/null
+++ b/plugins/TaskIntervalButton/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Igor Mroz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/plugins/TaskIntervalButton/Locale/en_GB/translations.php b/plugins/TaskIntervalButton/Locale/en_GB/translations.php
new file mode 100644
index 00000000..eed6d54d
--- /dev/null
+++ b/plugins/TaskIntervalButton/Locale/en_GB/translations.php
@@ -0,0 +1,3 @@
+<?php
+
+return array(); \ No newline at end of file
diff --git a/plugins/TaskIntervalButton/Locale/pl_PL/translations.php b/plugins/TaskIntervalButton/Locale/pl_PL/translations.php
new file mode 100644
index 00000000..a880d442
--- /dev/null
+++ b/plugins/TaskIntervalButton/Locale/pl_PL/translations.php
@@ -0,0 +1,9 @@
+<?php
+
+return array(
+ 'Add time interval' => 'Dodaj spędzony czas',
+ 'Interval added.' => 'Czas dodany.',
+ 'Unable to add interval.' => 'Nie udało się dodać czasu.',
+ 'Add interval' => 'Dodaj czas',
+ 'Do you really want to add interval (30 minutes) to this task: "%s"?' => 'Czy na pewno chcesz dodać czas (30 minut) do zadania: "%s"?',
+);
diff --git a/plugins/TaskIntervalButton/Makefile b/plugins/TaskIntervalButton/Makefile
new file mode 100644
index 00000000..7a80e681
--- /dev/null
+++ b/plugins/TaskIntervalButton/Makefile
@@ -0,0 +1,5 @@
+plugin=TaskIntervalButton
+
+all:
+ @ echo "Build archive for plugin ${plugin} version=${version}"
+ @ git archive HEAD --prefix=${plugin}/ --format=zip -o ${plugin}-${version}.zip
diff --git a/plugins/TaskIntervalButton/Plugin.php b/plugins/TaskIntervalButton/Plugin.php
new file mode 100644
index 00000000..ea73cf11
--- /dev/null
+++ b/plugins/TaskIntervalButton/Plugin.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Kanboard\Plugin\TaskIntervalButton;
+
+use Kanboard\Core\Plugin\Base;
+use Kanboard\Core\Translator;
+use Kanboard\Core\Security\Role;
+
+class Plugin extends Base
+{
+ public function initialize()
+ {
+ $this->projectAccessMap->add('TaskIntervalController', array("confirm", "addInterval"), Role::PROJECT_MEMBER);
+ $this->template->hook->attach('template:task:sidebar:actions', 'TaskIntervalButton:task_add_interval/add_interval_button');
+ }
+
+ public function onStartup()
+ {
+ Translator::load($this->languageModel->getCurrentLanguage(), __DIR__.'/Locale');
+ }
+
+ public function getPluginName()
+ {
+ return 'Task Interval Button';
+ }
+
+ public function getPluginDescription()
+ {
+ return t('Simple plugins which adds button to incrementally change time spent on task.');
+ }
+
+ public function getPluginAuthor()
+ {
+ return 'Igor Mroz';
+ }
+
+ public function getPluginVersion()
+ {
+ return '0.9.0';
+ }
+
+ public function getPluginHomepage()
+ {
+ return 'https://github.com/mrozigor/kanboard-add-time-interval-plugin';
+ }
+}
+
diff --git a/plugins/TaskIntervalButton/README.md b/plugins/TaskIntervalButton/README.md
new file mode 100644
index 00000000..7ab86ab0
--- /dev/null
+++ b/plugins/TaskIntervalButton/README.md
@@ -0,0 +1,31 @@
+Task Interval Button
+==============================
+
+Simple plugins which adds button to incrementally change time spent on task.
+
+Author
+------
+
+- Igor Mroz
+- License MIT
+
+Requirements
+------------
+
+- Kanboard >= 1.0.35
+
+Installation
+------------
+
+You have the choice between 3 methods:
+
+1. Install the plugin from the Kanboard plugin manager in one click
+2. Download the zip file and decompress everything under the directory `plugins/IM`
+3. Clone this repository into the folder `plugins/IM`
+
+Note: Plugin folder is case-sensitive.
+
+Documentation
+-------------
+
+On task summary page, in the sidebar there is button "Add time interval" which adds 30 minutes to time actually spent on this task. You have to confirm this.
diff --git a/plugins/TaskIntervalButton/Template/task_add_interval/add_interval_button.php b/plugins/TaskIntervalButton/Template/task_add_interval/add_interval_button.php
new file mode 100644
index 00000000..faf1996a
--- /dev/null
+++ b/plugins/TaskIntervalButton/Template/task_add_interval/add_interval_button.php
@@ -0,0 +1,5 @@
+<?php if ($task['is_active'] == 1): ?>
+<li>
+<?= $this->modal->confirm('clock-o', t('Add time interval'), 'TaskIntervalController', 'confirm', array('plugin' => 'TaskIntervalButton', 'task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+</li>
+<?php endif ?>
diff --git a/plugins/TaskIntervalButton/Template/task_add_interval/add_interval_confirm.php b/plugins/TaskIntervalButton/Template/task_add_interval/add_interval_confirm.php
new file mode 100644
index 00000000..21789f77
--- /dev/null
+++ b/plugins/TaskIntervalButton/Template/task_add_interval/add_interval_confirm.php
@@ -0,0 +1,15 @@
+<div class="page-header">
+ <h2><?= t('Add interval') ?></h2>
+</div>
+
+<div class="confirm">
+ <p class="alert alert-info">
+ <?= t('Do you really want to add interval (30 minutes) to this task: "%s"?', $this->text->e($task['title'])) ?>
+ </p>
+
+ <?= $this->modal->confirmButtons(
+ 'TaskIntervalController',
+ 'addInterval',
+ array('plugin' => 'TaskIntervalButton', 'task_id' => $task['id'], 'project_id' => $task['project_id'])
+ ) ?>
+</div> \ No newline at end of file
diff --git a/plugins/TaskIntervalButton/Test/PluginTest.php b/plugins/TaskIntervalButton/Test/PluginTest.php
new file mode 100644
index 00000000..7640c814
--- /dev/null
+++ b/plugins/TaskIntervalButton/Test/PluginTest.php
@@ -0,0 +1,20 @@
+<?php
+
+require_once 'tests/units/Base.php';
+
+use Kanboard\Plugin\TaskIntervalButton\Plugin;
+
+class PluginTest extends Base
+{
+ public function testPlugin()
+ {
+ $plugin = new Plugin($this->container);
+ $this->assertSame(null, $plugin->initialize());
+ $this->assertSame(null, $plugin->onStartup());
+ $this->assertNotEmpty($plugin->getPluginName());
+ $this->assertNotEmpty($plugin->getPluginDescription());
+ $this->assertNotEmpty($plugin->getPluginAuthor());
+ $this->assertNotEmpty($plugin->getPluginVersion());
+ $this->assertNotEmpty($plugin->getPluginHomepage());
+ }
+}
diff --git a/plugins/TimeMachine/Action/SubtaskTimerMoveTaskColumn.php b/plugins/TimeMachine/Action/SubtaskTimerMoveTaskColumn.php
new file mode 100644
index 00000000..e6d2217b
--- /dev/null
+++ b/plugins/TimeMachine/Action/SubtaskTimerMoveTaskColumn.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Kanboard\Plugin\TimeMachine\Action;
+
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\SubtaskModel;
+
+/**
+ * Create a subtask and activate the timer when moving a task to another column.
+ *
+ * @package Kanboard\Action
+ * @author yvalentin
+ */
+class SubtaskTimerMoveTaskColumn extends \Kanboard\Action\SubtaskTimerMoveTaskColumn
+{
+ /**
+ * Execute the action (append to the task description).
+ * SubTask is create with user session (not with creator of the task, on original action on extends class)
+ *
+ * @access public
+ * @param array $data Event data dictionary
+ * @return bool True if the action was executed or false when not executed
+ */
+ public function doAction(array $data)
+ {
+ $userId = $this->userSession->getId();
+ $subtaskID = $this->subtaskModel->create(array(
+ 'title' => $this->getParam('subtask'),
+ 'user_id' => $userId,
+ 'task_id' => $data['task']['id'],
+ 'status' => SubtaskModel::STATUS_INPROGRESS,
+ ));
+
+ if ($subtaskID !== false) {
+ return $this->subtaskTimeTrackingModel->toggleTimer($subtaskID, $userId, SubtaskModel::STATUS_INPROGRESS);
+ }
+
+ return false;
+ }
+}
diff --git a/plugins/TimeMachine/Assets/js/components/chart-project-time-machine.js b/plugins/TimeMachine/Assets/js/components/chart-project-time-machine.js
new file mode 100644
index 00000000..0ae20256
--- /dev/null
+++ b/plugins/TimeMachine/Assets/js/components/chart-project-time-machine.js
@@ -0,0 +1,84 @@
+KB.component('chart-project-analytics-time-comparison', function (containerElement, options) {
+ this.render = function () {
+ let spent = options.labelSpent;
+ let estimated = options.labelEstimated;
+ let data = [];
+ let result = [];
+ let groupsSpent = [];
+ let groupsEstimated = [];
+ let categories = [options.labelOpen, options.labelClosed];
+
+ for (let metric in options.metrics) {
+ data[metric+'-'+spent] = [metric+'-'+spent];
+ data[metric+'-'+estimated] = [metric+'-'+estimated];
+ groupsSpent.push(metric+'-'+spent);
+ groupsEstimated.push(metric+'-'+estimated);
+ data[metric+'-'+spent].push(options.metrics[metric]['open'].time_spent);
+ data[metric+'-'+estimated].push(options.metrics[metric]['open'].time_estimated);
+ data[metric+'-'+spent].push(options.metrics[metric]['closed'].time_spent);
+ data[metric+'-'+estimated].push(options.metrics[metric]['closed'].time_estimated);
+ result.push(data[metric+'-'+estimated]);
+ result.push(data[metric+'-'+spent]);
+ }
+ result.sort();
+
+ KB.dom(containerElement).add(KB.dom('div').attr('id', 'chart').build());
+
+ c3.generate({
+ data: {
+ columns: result,
+ type: 'bar',
+ groups: [
+ groupsEstimated,
+ groupsSpent
+ ]
+ },
+ bar: {
+ width: {
+ ratio: 0.5
+ }
+ },
+ axis: {
+ x: {
+ type: 'category',
+ categories: categories
+ }
+ },
+ legend: {
+ show: true
+ }
+ });
+ };
+});
+
+KB.component('chart-project-analytics-spent-time-by-dates', function (containerElement, options) {
+ this.render = function () {
+ let spentTime = [options.labelSpent];
+ spentTime.push(options.metrics['open']);
+ spentTime.push(options.metrics['closed']);
+ let categories = [options.labelOpen, options.labelClosed];
+
+ KB.dom(containerElement).add(KB.dom('div').attr('id', 'chart').build());
+
+ c3.generate({
+ data: {
+ columns: [spentTime],
+ type: 'bar'
+ },
+ bar: {
+ width: {
+ ratio: 0.3
+ }
+ },
+ axis: {
+ x: {
+ type: 'category',
+ categories: categories
+ }
+ },
+ legend: {
+ show: true
+ }
+ });
+ };
+}); \ No newline at end of file
diff --git a/plugins/TimeMachine/Controller/AnalyticsTimesController.php b/plugins/TimeMachine/Controller/AnalyticsTimesController.php
new file mode 100644
index 00000000..081d3be0
--- /dev/null
+++ b/plugins/TimeMachine/Controller/AnalyticsTimesController.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Kanboard\Plugin\TimeMachine\Controller;
+
+use Kanboard\Controller\BaseController;
+use Kanboard\Filter\TaskProjectFilter;
+use Kanboard\Model\TaskModel;
+
+
+/**
+ * @plugin TimeMachine
+ *
+ * @package Kanboard\Plugin\TimeMachine\Controller
+ * @author yvalentin
+ */
+class AnalyticsTimesController extends BaseController {
+
+ /**
+ * Show comparison between actual and estimated hours chart by Swimlane
+ *
+ * @access public
+ */
+ public function timeComparisonBySwimlane()
+ {
+ $project = $this->getProject();
+ $paginator = $this->getPaginator('timeComparisonBySwimlane', $project);
+
+ list($metrics, $swimlanes) = $this->helper->analyticsTimes->buildBySwimlane($project['id']);
+ $this->response->html(
+ $this->helper->layout->analytic('TimeMachine:analytic/time_comparison_by_swimlane',
+ array(
+ 'project' => $project,
+ 'swimlanes' => $swimlanes,
+ 'paginator' => $paginator,
+ 'metrics' => $metrics,
+ 'title' => t('Estimated vs actual time / Swimlanes'),
+ )
+ )
+ );
+ }
+
+ /**
+ * Show comparison between actual and estimated hours chart by Categories
+ *
+ * @access public
+ */
+ public function timeComparisonByCategories()
+ {
+ $project = $this->getProject();
+ $paginator = $this->getPaginator('timeComparisonByCategories', $project);
+
+ list($metrics, $categories) = $this->helper->analyticsTimes->buildByCategories($project['id']);
+ $this->response->html(
+ $this->helper->layout->analytic('TimeMachine:analytic/time_comparison_by_categories',
+ array(
+ 'project' => $project,
+ 'categories' => $categories,
+ 'paginator' => $paginator,
+ 'metrics' => $metrics,
+ 'title' => t('Estimated vs actual time / Categories'),
+ )
+ )
+ );
+ }
+
+ public function timeComparisonByDates()
+ {
+ $project = $this->getProject();
+ list($from, $to) = $this->getDates();
+ $paginatorParams = [
+ 'from' => $from->format('Y-m-d'),
+ 'to' => $to->format('Y-m-d')
+ ];
+ $paginator = $this->getPaginator('timeComparisonByDates', $project, $paginatorParams);
+
+ list($metrics, $categories, $swimlanes) = $this->helper->analyticsTimes->buildByDates($project['id'], $from, $to);
+
+ $this->response->html(
+ $this->helper->layout->analytic('TimeMachine:analytic/spent_time_by_dates',
+ array(
+ 'project' => $project,
+ 'categories' => $categories,
+ 'swimlanes' => $swimlanes,
+ 'from' => $from,
+ 'to' => $to,
+ 'userFormat' => $this->dateParser->getUserDateFormat(),
+ 'paginator' => $paginator,
+ 'metrics' => $metrics,
+ 'title' => t('Spent time / Dates'),
+ )
+ )
+ );
+
+ }
+
+ /**
+ * Get dates from/to from form request
+ *
+ * @return array
+ */
+ private function getDates()
+ {
+ $values = $this->request->getValues();
+
+ $from = $this->request->getStringParam('from', date('Y-m-d', strtotime('first day of this month')));
+ $to = $this->request->getStringParam('to', date('Y-m-d', strtotime('last day of this month')));
+
+ if (! empty($values)) {
+ $from = $this->dateParser->getIsoDate($values['from']);
+ $to = $this->dateParser->getIsoDate($values['to']);
+ }
+
+ // Return \DateTime
+ $from = (new \DateTime($from));
+ $to = (new \DateTime($to));
+ $to->setTime('23', '59', '59');
+
+ return array($from, $to);
+ }
+
+ /**
+ * @param $action
+ * @param $project
+ * @param array $params
+ *
+ * @return \Kanboard\Core\Paginator
+ */
+ private function getPaginator($action, $project, array $params = [])
+ {
+ $urlParams = array('plugin' => 'TimeMachine', 'project_id' => $project['id']);
+ if(!empty($params)) {
+ foreach ($params as $key => $param) {
+ $urlParams[$key] = $param;
+ }
+ }
+ return $this->paginator
+ ->setUrl(
+ 'AnalyticsTimesController',
+ $action,
+ $urlParams
+ )
+ ->setMax(30)
+ ->setOrder(TaskModel::TABLE.'.id')
+ ->setQuery($this->taskQuery
+ ->withFilter(new TaskProjectFilter($project['id']))
+ ->getQuery()
+ )
+ ->calculate();
+ }
+}
diff --git a/plugins/TimeMachine/Controller/SubtaskController.php b/plugins/TimeMachine/Controller/SubtaskController.php
new file mode 100644
index 00000000..423a0d88
--- /dev/null
+++ b/plugins/TimeMachine/Controller/SubtaskController.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Kanboard\Plugin\TimeMachine\Controller;
+
+use Kanboard\Controller\BaseController;
+use Kanboard\Core\Controller\AccessForbiddenException;
+use Kanboard\Core\Controller\PageNotFoundException;
+
+/**
+ * Subtask controller
+ *
+ * @package Kanboard\Plugin\TimeMachine\Controller
+ * @author yvalentin
+ */
+class SubtaskController extends BaseController
+{
+
+ /**
+ * Edit form with subTaskTimeTracking
+ *
+ * @access public
+ * @param array $values
+ * @param array $errors
+ * @throws AccessForbiddenException
+ * @throws PageNotFoundException
+ */
+ public function edit(array $values = [], array $valuesSttts = [], array $errors = [], array $errorsSttts = [])
+ {
+ $task = $this->getTask();
+ $subtask = $this->getSubtask($task);
+ $sttts = $this->subtaskTimeTrackingModel->getBySubTaskId($subtask['id']);
+
+ $this->response->html($this->template->render('subtask/edit', array(
+ 'values' => empty($values) ? $subtask : $values,
+ 'errors' => $errors,
+ 'errorsSttts' => $errorsSttts,
+ 'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']),
+ 'status_list' => $this->subtaskModel->getStatusList(),
+ 'sttts' => empty($valuesSttts) ? $sttts : $valuesSttts,
+ 'subtask' => $subtask,
+ 'task' => $task,
+ )));
+ }
+
+ /**
+ * Update and validate a subtask with subTaskTimeTracking
+ *
+ * @access public
+ */
+ public function update()
+ {
+ $task = $this->getTask();
+ $subtask = $this->getSubtask($task);
+
+ $values = $this->request->getValues();
+ $values['id'] = $subtask['id'];
+ $values['task_id'] = $task['id'];
+
+ // get subTaskTimeTracking values
+ $valuesSttts = $this->getSubTaskTimeTracking($values);
+
+ list($valid, $errors) = $this->subtaskValidator->validateModification($values);
+ list($validSttts, $errorsSttts) = $this->helper->subTaskTimeTrackingValidator->validates($valuesSttts);
+
+ if ($valid && !in_array(false, $validSttts)) {
+ if ($this->subtaskModel->update($values)
+ && $this->subtaskTimeTrackingModel->updates($valuesSttts, $subtask['id'], $task['id'])) {
+ $this->flash->success(t('Sub-task updated successfully.'));
+ } else {
+ $this->flash->failure(t('Unable to update your sub-task.'));
+ }
+
+ return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
+ }
+
+ return $this->edit($values, $valuesSttts, $errors, $errorsSttts);
+ }
+
+ /**
+ * Get Sub Task Time Tracking from form values
+ *
+ * @param array $values
+ *
+ * @return array
+ */
+ private function getSubTaskTimeTracking(array &$values)
+ {
+ $sttts = [];
+ foreach ($values as $key => $value) {
+ if(strpos($key,'-') !== false) {
+ list($column, $id) = explode('-', $key);
+ $sttts[$id][$column] = $value;
+ $sttts[$id]['id'] = $id;
+ unset($values[$key]);
+ }
+ }
+
+ return $sttts;
+ }
+}
diff --git a/plugins/TimeMachine/Helper/AnalyticsTimes.php b/plugins/TimeMachine/Helper/AnalyticsTimes.php
new file mode 100644
index 00000000..c865a52a
--- /dev/null
+++ b/plugins/TimeMachine/Helper/AnalyticsTimes.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace Kanboard\Plugin\TimeMachine\Helper;
+
+use Kanboard\Core\Base;
+use Kanboard\Model\SubtaskModel;
+use Kanboard\Model\SubtaskTimeTrackingModel;
+use Kanboard\Model\TaskModel;
+
+/**
+ * Analytics Times Comparison
+ *
+ * @package AnalyticsTimes
+ * @author yvalentin
+ */
+class AnalyticsTimes extends Base
+{
+
+ /**
+ * @param $project_id
+ *
+ * @return array
+ */
+ public function buildBySwimlane($project_id)
+ {
+ return $this->build($project_id, 'swimlaneModel', 'swimlane_id');
+ }
+
+ /**
+ * @param $project_id
+ *
+ * @return array
+ */
+ public function buildByCategories($project_id)
+ {
+ return $this->build($project_id, 'categoryModel', 'category_id');
+ }
+
+ /**
+ * Build report
+ *
+ * @param $project_id
+ * @param $model
+ * @param $column
+ *
+ * @return array
+ */
+ public function build($project_id, $model, $column)
+ {
+ $rows = $this->db->table(TaskModel::TABLE)
+ ->columns('SUM(time_estimated) AS time_estimated', 'SUM(time_spent) AS time_spent', 'is_active', $column)
+ ->eq('project_id', $project_id)
+ ->groupBy('is_active', $column)
+ ->findAll();
+
+// ->gte('day', $from)
+// ->lte('day', $to)
+
+ $metrics = [];
+ $names = [];
+
+ foreach ($rows as $row) {
+ if (!array_key_exists($row[$column],$names)) {
+ $name = $this->$model->getNameById($row[$column]);
+ $names[$row[$column]] = empty($name) ? t("Default") : $name;
+ $metrics[$names[$row[$column]]]['open']['time_spent'] = 0;
+ $metrics[$names[$row[$column]]]['open']['time_estimated'] = 0;
+ $metrics[$names[$row[$column]]]['closed']['time_spent'] = 0;
+ $metrics[$names[$row[$column]]]['closed']['time_estimated'] = 0;
+ }
+ $key = $row['is_active'] == TaskModel::STATUS_OPEN ? 'open' : 'closed';
+ $metrics[$names[$row[$column]]][$key]['time_spent'] = round((float) $row['time_spent'],2);
+ $metrics[$names[$row[$column]]][$key]['time_estimated'] = round((float) $row['time_estimated'],2);
+ }
+
+ return array($metrics, $names);
+ }
+
+ /**
+ * @param $project_id
+ * @param \DateTime $from
+ * @param \DateTime $to
+ *
+ * @return array
+ */
+ public function buildByDates($project_id, \DateTime $from, \DateTime $to)
+ {
+ $rows = $this->db->table(TaskModel::TABLE)
+ ->columns(
+ 'tasks.id',
+ 'subtasks.id as s_id',
+ 'subtask_time_tracking.id as stt_id',
+ 'is_active',
+ 'category_id',
+ 'swimlane_id',
+ 'tasks.time_spent',
+ 'subtasks.time_spent as s_time_spent',
+ 'subtask_time_tracking.time_spent as stt_time_spent',
+ 'subtask_time_tracking.start as stt_start',
+ 'subtask_time_tracking.end as stt_end'
+ )
+ ->eq('project_id', $project_id)
+ ->join(SubtaskModel::TABLE, 'task_id', 'id')
+ ->join(SubtaskTimeTrackingModel::TABLE, 'subtask_id', 'id', SubtaskModel::TABLE)
+ ->orderBy('tasks.id')
+ ->findAll();
+
+ $tasks = [];
+ $categories = [];
+ $swimlanes = [];
+ $tmp = [];
+ foreach ($rows as $row) {
+ $task = $row['id'];
+ $subtask = $row['s_id'];
+ $stt = $row['stt_id'];
+ // Has sub tasks with time tracking
+ if (!is_null($task) && !is_null($subtask) && !is_null($stt)) {
+ // set Datetime
+ $sttStart = (new \DateTime())->setTimestamp($row['stt_start']);
+ $sttEnd = (new \DateTime())->setTimestamp($row['stt_end']);
+ // check if start after the date from and end date before date to
+ if ($this->isInDate($sttStart, $sttEnd, $from, $to)) {
+ // recalculate time spent
+ // Get time spent for the period form
+ $startCal = $sttStart <= $from ? $from : $sttStart;
+ $endCal = $sttEnd > $to ? $to : $sttEnd;
+ // Override stt_time_spent
+ $row['stt_time_spentt'] = $this->dateParser->getHours($startCal, $endCal);
+ // regroup data by task id and subTask for debug
+ $tmp[$row['id']][$row['s_id']][$row['stt_id']] = $row;
+ // Get value of spentTime to recalculate
+ $this->initAndAdd($tasks, $task, $row);
+
+ if (!array_key_exists($row['category_id'],$categories)) {
+ $categories[$row['category_id']] = $this->categoryModel->getNameById($row['category_id']);
+ }
+ if (!array_key_exists($row['swimlane_id'],$swimlanes)) {
+ $swimlanes[$row['swimlane_id']] = $this->swimlaneModel->getNameById($row['swimlane_id']);
+ }
+ }
+ }
+ }
+ return array($tasks, $categories, $swimlanes);
+ }
+
+ /**
+ * @param array $tasks
+ * @param $taskId
+ * @param array $row
+ */
+ private function initAndAdd(array &$tasks, $taskId, array $row)
+ {
+ if(!array_key_exists($taskId, $tasks)) {
+ $tasks[$taskId]['open']['stt_time_spent'] = 0;
+ $tasks[$taskId]['closed']['stt_time_spent'] = 0;
+ $tasks[$taskId]['open']['time_spent'] = 0;
+ $tasks[$taskId]['closed']['time_spent'] = 0;
+ $tasks[$taskId]['swimlane_id'] = $row['swimlane_id'];
+ $tasks[$taskId]['category_id'] = $row['category_id'];
+ }
+ $isActive = $row['is_active'] == TaskModel::STATUS_OPEN ? 'open' : 'closed';
+ $tasks[$taskId][$isActive]['stt_time_spent'] += $row['stt_time_spent'];
+ $tasks[$taskId][$isActive]['time_spent'] = round((float) $row['time_spent'],2);
+ }
+
+ private function isInDate(\DateTime $sttStart, \DateTime $sttEnd, \DateTime $from, \DateTime $to)
+ {
+ return (
+ // stt is In the $from boundary
+ (($sttStart <= $from) && ($sttEnd > $from))
+ // stt is In the $to boundary
+ || (($sttStart < $to) && ($sttEnd >= $to))
+ // stt is In the $from and $to boundary
+ || (($sttStart >= $from) && ($sttEnd < $to ))
+ );
+ }
+}
diff --git a/plugins/TimeMachine/Helper/SubTaskTimeTracking.php b/plugins/TimeMachine/Helper/SubTaskTimeTracking.php
new file mode 100644
index 00000000..7197672a
--- /dev/null
+++ b/plugins/TimeMachine/Helper/SubTaskTimeTracking.php
@@ -0,0 +1,38 @@
+<?php
+
+
+namespace Kanboard\Plugin\TimeMachine\Helper;
+
+use Kanboard\Core\Base;
+
+/**
+ * Class SubTaskTimeTracking
+ *
+ * @package Kanboard\Plugin\TimeMachine\Helper
+ * @author yvalentin
+ */
+class SubTaskTimeTracking extends Base
+{
+
+ /**
+ * Datetime field
+ *
+ * @access public
+ * @param string $label
+ * @param string $name
+ * @param array $values
+ * @param array $errors
+ * @param array $attributes
+ * @return string
+ */
+ public function datetime($label, $name, array $values, array $errors = array(), array $attributes = array())
+ {
+ $userFormat = $this->dateParser->getUserDateTimeFormat();
+ $values = $this->dateParser->format($values, array($name), $userFormat);
+ $attributes = array_merge(array('placeholder="'.date($userFormat).'"'), $attributes);
+
+ return $this->helper->form->label($label, $name) .
+ $this->helper->form->text($name, $values, $errors, $attributes, 'form-datetime');
+ }
+
+}
diff --git a/plugins/TimeMachine/LICENSE b/plugins/TimeMachine/LICENSE
new file mode 100644
index 00000000..f288702d
--- /dev/null
+++ b/plugins/TimeMachine/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/plugins/TimeMachine/Locale/fr_FR/translations.php b/plugins/TimeMachine/Locale/fr_FR/translations.php
new file mode 100644
index 00000000..a1a68308
--- /dev/null
+++ b/plugins/TimeMachine/Locale/fr_FR/translations.php
@@ -0,0 +1,11 @@
+<?php
+
+return array(
+ 'Estimated vs actual time / Swimlanes' => 'Temps estimé vs réel / Swimlanes',
+ 'Estimated vs actual time / Categories' => 'Temps estimé vs réel / Catégories',
+ 'Spent time / Dates' => 'Temps passées / Dates',
+ 'Total spent time / Dates' => 'Temps passées total / Dates',
+ 'Default' => 'Par défaut',
+ 'Categories' => 'Catégories',
+);
+
diff --git a/plugins/TimeMachine/Locale/pl_PL/translations.php b/plugins/TimeMachine/Locale/pl_PL/translations.php
new file mode 100644
index 00000000..4796ee8c
--- /dev/null
+++ b/plugins/TimeMachine/Locale/pl_PL/translations.php
@@ -0,0 +1,10 @@
+<?php
+
+return array(
+ 'Estimated vs actual time / Swimlanes' => 'Szacowany vs rzeczywisty czas / Tory',
+ 'Estimated vs actual time / Categories' => 'Szacowany vs rzeczywisty czas / Kategorie',
+ 'Spent time / Dates' => 'Spędzony czas / Daty',
+ 'Total spent time / Dates' => 'Łączny spędzony czas / Daty',
+ 'Default' => 'Domyślnie',
+ 'Categories' => 'Kategorie',
+);
diff --git a/plugins/TimeMachine/Makefile b/plugins/TimeMachine/Makefile
new file mode 100644
index 00000000..14e3ec1a
--- /dev/null
+++ b/plugins/TimeMachine/Makefile
@@ -0,0 +1,5 @@
+plugin=TimeMachine
+version=1.0.0
+archive:
+ @ echo "Build archive for plugin ${plugin} version=${version}"
+ @ git archive HEAD --prefix=${plugin}/ --format=zip -o ${plugin}-${version}.zip \ No newline at end of file
diff --git a/plugins/TimeMachine/Model/SubtaskTimeTrackingModel.php b/plugins/TimeMachine/Model/SubtaskTimeTrackingModel.php
new file mode 100644
index 00000000..aff6b396
--- /dev/null
+++ b/plugins/TimeMachine/Model/SubtaskTimeTrackingModel.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace Kanboard\Plugin\TimeMachine\Model;
+
+use Kanboard\Model\SubtaskModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\UserModel;
+
+/**
+ * Class SubtaskTimeTrackingModel
+ *
+ * @author yvalentin
+ * https://yohannvalentin.com
+ */
+class SubtaskTimeTrackingModel extends \Kanboard\Model\SubtaskTimeTrackingModel
+{
+ /**
+ *
+ * @param $subTask_id
+ *
+ * @return array
+ */
+ public function getBySubTaskId($subTask_id)
+ {
+ $sttts = $this->db
+ ->table(self::TABLE)
+ ->columns(
+ self::TABLE.'.id',
+ self::TABLE.'.subtask_id',
+ self::TABLE.'.end',
+ self::TABLE.'.start',
+ self::TABLE.'.time_spent',
+ self::TABLE.'.user_id',
+ SubtaskModel::TABLE.'.task_id',
+ SubtaskModel::TABLE.'.title AS subtask_title',
+ UserModel::TABLE.'.username',
+ UserModel::TABLE.'.name AS user_fullname'
+ )
+ ->join(SubtaskModel::TABLE, 'id', 'subtask_id')
+ ->join(UserModel::TABLE, 'id', 'user_id', self::TABLE)
+ ->eq(SubtaskModel::TABLE.'.id', $subTask_id)
+ ->findAll();
+
+ $values = [];
+ foreach ($sttts as $key => $sttt) {
+ $values[$sttt['id']] = $sttt;
+ // This is for form input name
+ $values[$sttt['id']]['start-'.$sttt['id']] = $sttt['start'];
+ $values[$sttt['id']]['end-'.$sttt['id']] = $sttt['end'];
+ }
+
+ return $values;
+ }
+
+ /**
+ * Update a subTask Time Tracking
+ *
+ * @param array $values
+ * @param $subTaskId
+ * @param $taskId
+ * @param bool $fireEvent
+ *
+ * @return array
+ * @throws \Exception
+ */
+ public function updates(array $values, $subTaskId, $taskId, $fireEvent = true)
+ {
+ $result = [];
+ foreach ($values as $key => $value) {
+ $value = $this->dateParser->convert($value, array('start'), true);
+ $value = $this->dateParser->convert($value, array('end'), true);
+ if (!empty($value['start']) && !empty($value['end'])) {
+ $value['time_spent'] = $this->dateParser->getHours(
+ (new \DateTime())->setTimestamp($value['start']),
+ (new \DateTime())->setTimestamp($value['end'])
+ );
+ } else {
+ $value['time_spent'] = 0;
+ $value['start'] = !empty($value['start']) ? $value['start'] : 0;
+ $value['end'] = !empty($value['end']) ? $value['end'] : 0;
+ }
+
+ $result[] = $this->db->table(self::TABLE)->eq('id', $key)->save($value);
+ }
+
+ if (!in_array(false, $result)) {
+ // Need to update task time tracking spent time and sub task too
+ $this->calculateSubtaskTimeSpent($subTaskId, $fireEvent);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Update subtask time spent By calculation
+ *
+ * @access public
+ * @param integer $subtask_id
+ * @return bool
+ */
+ public function calculateSubtaskTimeSpent($subtask_id, $fireEvent)
+ {
+ $timeSpent = $this->db->table(self::TABLE)
+ ->eq('subtask_id', $subtask_id)
+ ->columns(
+ 'SUM(time_spent) AS time_spent'
+ )
+ ->findOne();
+
+ $subtask = $this->subtaskModel->getById($subtask_id);
+
+ return $this->subtaskModel->update(array(
+ 'id' => $subtask['id'],
+ 'time_spent' => $timeSpent['time_spent'],
+ 'task_id' => $subtask['task_id'],
+ ), $fireEvent);
+ }
+
+ /**
+ * Update task time tracking based on subtasks time tracking
+ *
+ * @access public
+ * @param integer $task_id Task id
+ * @return bool
+ */
+ public function updateTaskTimeTracking($task_id)
+ {
+ $values = $this->calculateSubtaskTime($task_id);
+ // Do not update time_estimated or spend_time of task if sum of subtask time estimated is equal to 0
+ if($values['time_estimated'] == 0) {
+ unset($values['time_estimated']);
+ }
+ if($values['time_spent'] == 0) {
+ unset($values['time_spent']);
+ }
+
+ if (empty($values)) {
+ return true;
+ }
+
+ return $this->db
+ ->table(TaskModel::TABLE)
+ ->eq('id', $task_id)
+ ->update($values);
+ }
+
+}
diff --git a/plugins/TimeMachine/Plugin.php b/plugins/TimeMachine/Plugin.php
new file mode 100644
index 00000000..374f0f53
--- /dev/null
+++ b/plugins/TimeMachine/Plugin.php
@@ -0,0 +1,95 @@
+<?php
+namespace Kanboard\Plugin\TimeMachine;
+
+use Kanboard\Core\Plugin\Base;
+use Kanboard\Core\Translator;
+use Kanboard\Plugin\TimeMachine\Action\SubtaskTimerMoveTaskColumn;
+use Kanboard\Plugin\TimeMachine\Model\SubtaskTimeTrackingModel;
+
+class Plugin extends Base
+{
+ /**
+ *
+ */
+ public function initialize()
+ {
+ /***** AnalyticTimes *****/
+ $this->hook->on('template:layout:js',
+ array(
+ 'template' => 'plugins/TimeMachine/Assets/js/components/chart-project-time-machine.js'
+ )
+ );
+ $this->template->hook->attach('template:analytic:sidebar', 'TimeMachine:analytic/sidebar');
+ $this->helper->register('analyticsTimes', '\Kanboard\Plugin\TimeMachine\Helper\AnalyticsTimes');
+
+ /***** SubTaskTimeTracking *****/
+ $this->helper->register('subTaskTimeTracking', '\Kanboard\Plugin\TimeMachine\Helper\SubTaskTimeTracking');
+ $this->helper->register('subTaskTimeTrackingValidator', '\Kanboard\Plugin\TimeMachine\Validator\SubTaskTimeTrackingValidator');
+ // Sub task time tracking Model extended
+ $this->container['subtaskTimeTrackingModel'] = $this->container->factory(function ($c) {
+ return new SubtaskTimeTrackingModel($c);
+ });
+
+ $this->template->setTemplateOverride('subtask/menu', 'TimeMachine:subtask/menu');
+ $this->template->setTemplateOverride('subtask/edit', 'TimeMachine:subtask/edit');
+
+ // Override SubTaskTimerMoveTaskColumn to create subTask with user connected (User who move card)
+ $this->actionManager->register(new SubtaskTimerMoveTaskColumn($this->container));
+ }
+
+ /**
+ *
+ */
+ public function onStartup()
+ {
+ Translator::load($this->languageModel->getCurrentLanguage(), __DIR__.'/Locale');
+ }
+
+ /**
+ * @return string
+ */
+ public function getPluginName()
+ {
+ return 'TimeMachine';
+ }
+
+ /**
+ * @return string
+ */
+ public function getPluginDescription()
+ {
+ return t('Plugin to add time machine : Back to the Future (more analytics datas, edit form on subtask time tracking)');
+ }
+
+ /**
+ * @return string
+ */
+ public function getPluginAuthor()
+ {
+ return 'yvalentin';
+ }
+
+ /**
+ * @return string
+ */
+ public function getPluginVersion()
+ {
+ return '1.0.1';
+ }
+
+ /**
+ * @return string
+ */
+ public function getPluginHomepage()
+ {
+ return 'https://gitlab.com/yv-kanboard-plugin/time-machine';
+ }
+
+ /**
+ * @return string
+ */
+ public function getCompatibleVersion()
+ {
+ return '>=1.2.6';
+ }
+}
diff --git a/plugins/TimeMachine/README.md b/plugins/TimeMachine/README.md
new file mode 100644
index 00000000..5b762259
--- /dev/null
+++ b/plugins/TimeMachine/README.md
@@ -0,0 +1,61 @@
+# Kanboard - ⌛ Time Machine ⏳ - Plugin
+------------------
+
+**Plugin to add time machine : Back to the Future**
+
+- *Add a Analytics Times on project Analytics sidebar* 📊 :
+ - "estimated vs actual time" comparison:
+ - By swimlane
+ - By categories
+ - Spent time with start and end dates filter **!!! Attention! this is based on time tracking -
+with the timer functionality on subtasks !!!**
+
+- *Add a form to edit start and end dates of subtask time tracking / timer ⏱*
+
+- *Override Action:*
+ - SubtaskTimerMoveTaskColumn
+
+ // This doesn't work for now
+
+ Create a subtask and activate the timer when moving a task to another column
+ **with user session id (not with creator of the task)**
+
+Install:
+-------
+* To install, download the repo into the kanboard plugins folder.
+* Make sure the name of the folder is "TimeMachine".
+
+How it works:
+------------
+1. Install plugin
+
+2. Go Project Analytics to see new entries menus (see screenshot)
+
+3. You can edit start and end dates of your subtasks time tracking
+
+ On the task show's template, if you have subtasks with timer,
+ you can edit start and end dates of each time tracking entry for this subtask
+
+TODO:
+------------
+* Change Access map to authorize member/viewer (like customers) to see Analytics
+* Check only assigned member, creator or admin can change values on time tracking edition
+* Fix paginator on spent time by date analytic
+
+Screenshots:
+-----------
+1. By swimlane
+
+ ![AnalyticsTimes-swimlanes](https://gitlab.com/yv-kanboard-plugin/analytics-times/wikis/uploads/a00e312cb00c7fd131659341d10e9142/AnalyticsTimes-swimlanes.png)
+
+2. By categories
+
+ ![AnalyticsTimes-categories](https://gitlab.com/yv-kanboard-plugin/analytics-times/wikis/uploads/5dad072e0740bf9d0c96a4dbfe65829d/AnalyticsTimes-categories.png)
+
+3. Spent time with start and end dates filter
+
+ ![AnalyticsTimes-spenttime-dates](https://gitlab.com/yv-kanboard-plugin/analytics-times/wikis/uploads/9a6293ec54662399c992e54e55cdf8c1/AnalyticsTimes-spenttime-dates.png)
+
+4. Subtask time tracking edition
+
+ ![SubtaskTimeTracking-edit](https://gitlab.com/yv-kanboard-plugin/analytics-times/wikis/uploads/ef2beef638138cb86a31a47c30a86f74/SubtaskTimeTrackingEdit.png) \ No newline at end of file
diff --git a/plugins/TimeMachine/Template/analytic/sidebar.php b/plugins/TimeMachine/Template/analytic/sidebar.php
new file mode 100644
index 00000000..cc04bc1d
--- /dev/null
+++ b/plugins/TimeMachine/Template/analytic/sidebar.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Created by yvalentin.
+ * https://yohannvalentin.com
+ *
+ * Date: 12/11/18
+ */
+?>
+
+<li <?= $this->app->checkMenuSelection('AnalyticsTimesController', 'timeComparisonBySwimlane') ?>>
+ <?= $this->modal->replaceLink(
+ t('Estimated vs actual time / Swimlanes'),
+ 'AnalyticsTimesController',
+ 'timeComparisonBySwimlane',
+ array(
+ 'plugin' => 'TimeMachine',
+ 'project_id' => $project['id']
+ )
+ )
+ ?>
+</li>
+<li <?= $this->app->checkMenuSelection('AnalyticsTimesController', 'timeComparisonByCategories') ?>>
+ <?= $this->modal->replaceLink(
+ t('Estimated vs actual time / Categories'),
+ 'AnalyticsTimesController',
+ 'timeComparisonByCategories',
+ array(
+ 'plugin' => 'TimeMachine',
+ 'project_id' => $project['id']
+ )
+ )
+ ?>
+</li>
+<!--TODO check if project has automatic action: task.move.column - \Kanboard\Action\SubtaskTimerMoveTaskColumn -->
+<li <?= $this->app->checkMenuSelection('AnalyticsTimesController', 'timeComparisonByDates') ?>>
+ <?= $this->modal->replaceLink(
+ t('Spent time / Dates'),
+ 'AnalyticsTimesController',
+ 'timeComparisonByDates',
+ array(
+ 'plugin' => 'TimeMachine',
+ 'project_id' => $project['id']
+ )
+ )
+ ?>
+</li> \ No newline at end of file
diff --git a/plugins/TimeMachine/Template/analytic/spent_time_by_dates.php b/plugins/TimeMachine/Template/analytic/spent_time_by_dates.php
new file mode 100644
index 00000000..47fa657c
--- /dev/null
+++ b/plugins/TimeMachine/Template/analytic/spent_time_by_dates.php
@@ -0,0 +1,100 @@
+<?php if (! $is_ajax): ?>
+ <div class="page-header">
+ <h2><?= t('Spent time / Dates') ?></h2>
+ </div>
+<?php endif ?>
+
+<div class="panel">
+ <?php $spentTime['total'] = 0; $spentTime['open'] = 0; $spentTime['closed'] = 0; ?>
+ <?php foreach ($metrics as $taskId => $metric) : ?>
+ <?php $spentTime['total'] += $metric['open']['stt_time_spent'] + $metric['closed']['stt_time_spent']?>
+ <?php $spentTime['open'] += $metric['open']['stt_time_spent']?>
+ <?php $spentTime['closed'] += $metric['closed']['stt_time_spent']?>
+ <?php endforeach; ?>
+ <?= t('Total spent time / Dates')?> : <?= $from->format($userFormat) ?> -> <?= $to->format($userFormat) ?>
+ <ul>
+ <li>
+ <strong>
+ <?= $this->text->e($spentTime['total']) ?>
+ </strong>
+ <i>(<?=t('Open').' : '.$this->text->e($spentTime['open']) ?>
+ - <?= t('Closed').' : '.$spentTime['closed'] ?>)</i>
+ </li>
+ </ul>
+</div>
+
+<form method="post"
+ class="form-inline"
+ style="text-align: center"
+ action="<?= $this->url->href(
+ 'AnalyticsTimesController',
+ 'timeComparisonByDates',
+ array('plugin' => 'TimeMachine', 'project_id' => $project['id']))
+ ?>"
+ autocomplete="off">
+ <?= $this->form->csrf() ?>
+ <?php $values['from'] = $from->getTimestamp() ?>
+ <?php $values['to'] = $to->getTimestamp() ?>
+ <?= $this->form->date(t('Start date'), 'from', $values) ?>
+ <?= $this->form->date(t('End date'), 'to', $values) ?>
+ <?= $this->modal->submitButtons(array('submitLabel' => t('Execute'))) ?>
+</form>
+<?php if (empty($metrics)): ?>
+ <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
+<?php else: ?>
+ <?php if ($paginator->isEmpty()): ?>
+ <p class="alert"><?= t('No tasks found.') ?></p>
+ <?php elseif (! $paginator->isEmpty()): ?>
+ <?= $this->app->component('chart-project-analytics-spent-time-by-dates', array(
+ 'metrics' => $spentTime,
+ 'labelSpent' => t('Hours Spent'),
+ 'labelClosed' => t('Closed'),
+ 'labelOpen' => t('Open'),
+ )) ?>
+ <table class="table-fixed table-small table-scrolling margin-top">
+ <tr>
+ <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
+ <th class="column-8"><?= $paginator->order(t('Categories'), 'tasks.category_id') ?></th>
+ <th class="column-8"><?= $paginator->order(t('Swimlane'), 'tasks.swimlane_id') ?></th>
+ <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
+ <th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
+ <th class="column-13"><?= t('Spent time / Dates')?></th>
+ <th class="column-9"><?= $paginator->order(t('Hours Spent'), 'tasks.time_spent') ?></th>
+ </tr>
+ <?php foreach ($paginator->getCollection() as $task): ?>
+ <?php if (array_key_exists($task['id'], $metrics)) : ?>
+ <tr>
+ <td class="task-table color-<?= $task['color_id'] ?>">
+ <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+ </td>
+ <td class="task-table category-<?= $task['category_id'] ?>">
+ <?= $this->text->e($categories[$task['category_id']]) ?>
+ </td>
+ <td class="task-table swimlane-<?= $task['swimlane_id'] ?>">
+ <?= $this->text->e($swimlanes[$task['swimlane_id']]) ?>
+ </td>
+ <td>
+ <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+ </td>
+ <td>
+ <?php if ($task['is_active'] == \Kanboard\Model\TaskModel::STATUS_OPEN): ?>
+ <?php $isActive = "open" ?>
+ <?= t('Open') ?>
+ <?php else: ?>
+ <?php $isActive = "closed" ?>
+ <?= t('Closed') ?>
+ <?php endif ?>
+ </td>
+ <td>
+ <?= $this->text->e($metrics[$task['id']][$isActive]['stt_time_spent']) ?>
+ </td>
+ <td>
+ <?= $this->text->e($metrics[$task['id']][$isActive]['time_spent']) ?>
+ </td>
+ </tr>
+ <?php endif; ?>
+ <?php endforeach ?>
+ </table>
+ <?= $paginator ?>
+ <?php endif ?>
+<?php endif ?>
diff --git a/plugins/TimeMachine/Template/analytic/time_comparison_by_categories.php b/plugins/TimeMachine/Template/analytic/time_comparison_by_categories.php
new file mode 100644
index 00000000..fc838374
--- /dev/null
+++ b/plugins/TimeMachine/Template/analytic/time_comparison_by_categories.php
@@ -0,0 +1,84 @@
+<?php if (! $is_ajax): ?>
+ <div class="page-header">
+ <h2><?= t('Estimated vs actual time / Categories') ?></h2>
+ </div>
+<?php endif ?>
+
+<div class="panel">
+ <?php foreach ($metrics as $categorieName => $metricByCategories) : ?>
+ <p><strong><?= $categorieName ?></strong></p>
+ <ul>
+ <li>
+ <?= t('Estimated hours: ') ?>
+ <strong>
+ <?= $this->text->e($metricByCategories['open']['time_estimated'] + $metricByCategories['closed']['time_estimated']) ?>
+ </strong>
+ <i>(<?=t('Open').' : '.$this->text->e($metricByCategories['open']['time_estimated']) ?>
+ - <?= t('Closed').' : '.$metricByCategories['closed']['time_estimated'] ?>)</i>
+ </li>
+ <li>
+ <?= t('Actual hours: ')?>
+ <strong>
+ <?= $this->text->e($metricByCategories['open']['time_spent'] + $metricByCategories['closed']['time_spent']) ?>
+ </strong>
+ <i>(<?=t('Open').' : '.$this->text->e($metricByCategories['open']['time_spent']) ?>
+ - <?= t('Closed').' : '.$metricByCategories['closed']['time_spent'] ?>)</i>
+ </li>
+ </ul>
+ <?php endforeach; ?>
+</div>
+
+<?php if (empty($metrics)): ?>
+ <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
+<?php else: ?>
+ <?php if ($paginator->isEmpty()): ?>
+ <p class="alert"><?= t('No tasks found.') ?></p>
+ <?php elseif (! $paginator->isEmpty()): ?>
+ <?= $this->app->component('chart-project-analytics-time-comparison', array(
+ 'metrics' => $metrics,
+ 'labelSpent' => t('Hours Spent'),
+ 'labelEstimated' => t('Hours Estimated'),
+ 'labelClosed' => t('Closed'),
+ 'labelOpen' => t('Open'),
+ )) ?>
+
+ <table class="table-fixed table-small table-scrolling">
+ <tr>
+ <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
+ <th class="column-8"><?= $paginator->order(t('Categories'), 'tasks.category_id') ?></th>
+ <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
+ <th class="column-10"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
+ <th class="column-12"><?= $paginator->order(t('Estimated Time'), 'tasks.time_estimated') ?></th>
+ <th class="column-12"><?= $paginator->order(t('Actual Time'), 'tasks.time_spent') ?></th>
+ </tr>
+ <?php foreach ($paginator->getCollection() as $task): ?>
+ <tr>
+ <td class="task-table color-<?= $task['color_id'] ?>">
+ <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+ </td>
+ <td class="task-table swimlane-<?= $task['category_id'] ?>">
+ <?= $this->text->e($categories[$task['category_id']]) ?>
+ </td>
+ <td>
+ <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+ </td>
+ <td>
+ <?php if ($task['is_active'] == \Kanboard\Model\TaskModel::STATUS_OPEN): ?>
+ <?= t('Open') ?>
+ <?php else: ?>
+ <?= t('Closed') ?>
+ <?php endif ?>
+ </td>
+ <td>
+ <?= $this->text->e($task['time_estimated']) ?>
+ </td>
+ <td>
+ <?= $this->text->e($task['time_spent']) ?>
+ </td>
+ </tr>
+ <?php endforeach ?>
+ </table>
+
+ <?= $paginator ?>
+ <?php endif ?>
+<?php endif ?>
diff --git a/plugins/TimeMachine/Template/analytic/time_comparison_by_swimlane.php b/plugins/TimeMachine/Template/analytic/time_comparison_by_swimlane.php
new file mode 100644
index 00000000..95fd7a41
--- /dev/null
+++ b/plugins/TimeMachine/Template/analytic/time_comparison_by_swimlane.php
@@ -0,0 +1,84 @@
+<?php if (! $is_ajax): ?>
+ <div class="page-header">
+ <h2><?= t('Estimated vs actual time / Swimlanes') ?></h2>
+ </div>
+<?php endif ?>
+
+<div class="panel">
+ <?php foreach ($metrics as $swimlaneName => $metricBySwimlane) : ?>
+ <p><strong><?= $swimlaneName ?></strong></p>
+ <ul>
+ <li>
+ <?= t('Estimated hours: ') ?>
+ <strong>
+ <?= $this->text->e($metricBySwimlane['open']['time_estimated'] + $metricBySwimlane['closed']['time_estimated']) ?>
+ </strong>
+ <i>(<?=t('Open').' : '.$this->text->e($metricBySwimlane['open']['time_estimated']) ?>
+ - <?= t('Closed').' : '.$metricBySwimlane['closed']['time_estimated'] ?>)</i>
+ </li>
+ <li>
+ <?= t('Actual hours: ')?>
+ <strong>
+ <?= $this->text->e($metricBySwimlane['open']['time_spent'] + $metricBySwimlane['closed']['time_spent']) ?>
+ </strong>
+ <i>(<?=t('Open').' : '.$this->text->e($metricBySwimlane['open']['time_spent']) ?>
+ - <?= t('Closed').' : '.$metricBySwimlane['closed']['time_spent'] ?>)</i>
+ </li>
+ </ul>
+ <?php endforeach; ?>
+</div>
+
+<?php if (empty($metrics)): ?>
+ <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
+<?php else: ?>
+ <?php if ($paginator->isEmpty()): ?>
+ <p class="alert"><?= t('No tasks found.') ?></p>
+ <?php elseif (! $paginator->isEmpty()): ?>
+ <?= $this->app->component('chart-project-analytics-time-comparison', array(
+ 'metrics' => $metrics,
+ 'labelSpent' => t('Hours Spent'),
+ 'labelEstimated' => t('Hours Estimated'),
+ 'labelClosed' => t('Closed'),
+ 'labelOpen' => t('Open'),
+ )) ?>
+
+ <table class="table-fixed table-small table-scrolling">
+ <tr>
+ <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
+ <th class="column-8"><?= $paginator->order(t('Swimlane'), 'tasks.swimlane_id') ?></th>
+ <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
+ <th class="column-10"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
+ <th class="column-12"><?= $paginator->order(t('Estimated Time'), 'tasks.time_estimated') ?></th>
+ <th class="column-12"><?= $paginator->order(t('Actual Time'), 'tasks.time_spent') ?></th>
+ </tr>
+ <?php foreach ($paginator->getCollection() as $task): ?>
+ <tr>
+ <td class="task-table color-<?= $task['color_id'] ?>">
+ <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+ </td>
+ <td class="task-table swimlane-<?= $task['swimlane_id'] ?>">
+ <?= $this->text->e($swimlanes[$task['swimlane_id']]) ?>
+ </td>
+ <td>
+ <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+ </td>
+ <td>
+ <?php if ($task['is_active'] == \Kanboard\Model\TaskModel::STATUS_OPEN): ?>
+ <?= t('Open') ?>
+ <?php else: ?>
+ <?= t('Closed') ?>
+ <?php endif ?>
+ </td>
+ <td>
+ <?= $this->text->e($task['time_estimated']) ?>
+ </td>
+ <td>
+ <?= $this->text->e($task['time_spent']) ?>
+ </td>
+ </tr>
+ <?php endforeach ?>
+ </table>
+
+ <?= $paginator ?>
+ <?php endif ?>
+<?php endif ?>
diff --git a/plugins/TimeMachine/Template/subtask/edit.php b/plugins/TimeMachine/Template/subtask/edit.php
new file mode 100644
index 00000000..7f20075c
--- /dev/null
+++ b/plugins/TimeMachine/Template/subtask/edit.php
@@ -0,0 +1,28 @@
+<div class="page-header">
+ <h2><?= t('Edit a sub-task') ?></h2>
+</div>
+
+<form method="post" action="<?= $this->url->href('SubtaskController', 'update', array('plugin' => 'TimeMachine', 'task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>" autocomplete="off">
+ <?= $this->form->csrf() ?>
+
+ <?= $this->subtask->renderTitleField($values, $errors, array('autofocus')) ?>
+ <?= $this->subtask->renderAssigneeField($users_list, $values, $errors) ?>
+ <?= $this->subtask->renderTimeEstimatedField($values, $errors) ?>
+ <?= $this->subtask->renderTimeSpentField($values, $errors) ?>
+ <div class="subtask-time-tracking-edit form-inline">
+ <h3><strong>Time Tracking details</strong></h3>
+ <?php foreach ($sttts as $key => $sttt) :?>
+ <?php $errorsSttt = isset($errorsSttts[$key]) ? $errorsSttts[$key]: []; ?>
+ <div>
+ <?= $sttt['username']?> :
+ <?= $this->helper->form->datetime(t('Start Date'), 'start-'.$sttt['id'], $sttt, $errorsSttt) ?>
+ <?= $this->helper->form->datetime(t('End Date'), 'end-'.$sttt['id'], $sttt, $errorsSttt) ?>
+ / <?=t('Time spent')?> : <?= $sttt['time_spent']?>
+ </div>
+ <?php endforeach; ?>
+ </div>
+
+ <?= $this->hook->render('template:subtask:form:edit', array('values' => $values, 'errors' => $errors)) ?>
+
+ <?= $this->modal->submitButtons() ?>
+</form>
diff --git a/plugins/TimeMachine/Template/subtask/menu.php b/plugins/TimeMachine/Template/subtask/menu.php
new file mode 100644
index 00000000..5f8a41f8
--- /dev/null
+++ b/plugins/TimeMachine/Template/subtask/menu.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Created by yvalentin.
+ * https://yohannvalentin.com
+ *
+ */
+?>
+<div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog"></i><i class="fa fa-caret-down"></i></a>
+ <ul>
+ <li>
+ <?= $this->modal->medium('edit', t('Edit'), 'SubtaskController', 'edit', array('plugin' => 'TimeMachine', 'task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
+ </li>
+ <li>
+ <?= $this->modal->confirm('trash-o', t('Remove'), 'SubtaskController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
+ </li>
+ <li>
+ <?= $this->modal->confirm('clone', t('Convert to task'), 'SubtaskConverterController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>
+ </li>
+ </ul>
+</div> \ No newline at end of file
diff --git a/plugins/TimeMachine/Test/PluginTest.php b/plugins/TimeMachine/Test/PluginTest.php
new file mode 100644
index 00000000..ad56a5b4
--- /dev/null
+++ b/plugins/TimeMachine/Test/PluginTest.php
@@ -0,0 +1,19 @@
+<?php
+require_once '../../../tests/units/Base.php';
+
+use Kanboard\Plugin\TimeMachine\Plugin;
+
+class PluginTest extends Base
+{
+ public function testPlugin()
+ {
+ $plugin = new Plugin($this->container);
+ $this->assertSame(null, $plugin->initialize());
+ $this->assertSame(null, $plugin->onStartup());
+ $this->assertNotEmpty($plugin->getPluginName());
+ $this->assertNotEmpty($plugin->getPluginDescription());
+ $this->assertNotEmpty($plugin->getPluginAuthor());
+ $this->assertNotEmpty($plugin->getPluginVersion());
+ $this->assertNotEmpty($plugin->getPluginHomepage());
+ }
+} \ No newline at end of file
diff --git a/plugins/TimeMachine/Validator/SubTaskTimeTrackingValidator.php b/plugins/TimeMachine/Validator/SubTaskTimeTrackingValidator.php
new file mode 100644
index 00000000..28421b66
--- /dev/null
+++ b/plugins/TimeMachine/Validator/SubTaskTimeTrackingValidator.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Kanboard\Plugin\TimeMachine\Validator;
+
+use Kanboard\Validator\BaseValidator;
+use SimpleValidator\Validator;
+use SimpleValidator\Validators;
+
+/**
+ * SubTask Time Tracking Validator
+ *
+ * @package Kanboard\Validator
+ * @author Frederic Guillot
+ */
+class SubTaskTimeTrackingValidator extends BaseValidator
+{
+
+ /**
+ * Validate SubTackTimeTracking from form
+ *
+ * @param array $values Form values
+ *
+ * @return array $valid, $errors [0] = Success or not, [1] = List of errors
+ */
+ public function validates(array $values)
+ {
+ $valids = [];
+ $errors = [];
+
+ foreach ($values as $key => $value) {
+ $rules = array(
+ new Validators\Required('id', t('The task time tracking id is required')),
+ new Validators\Date('start', t('Invalid date'), $this->dateParser->getParserFormats()),
+ new Validators\Date('end', t('Invalid date'), $this->dateParser->getParserFormats()),
+ );
+
+ $v = new Validator($value, $rules);
+
+ $valids[$key] = $v->execute();
+ $errors[$key] = $v->getErrors();
+ }
+
+ return array(
+ $valids,
+ $errors
+ );
+ }
+}
diff --git a/plugins/Timetrackingeditor/Console/AllSubtaskTimeTrackingExportCommand.php b/plugins/Timetrackingeditor/Console/AllSubtaskTimeTrackingExportCommand.php
new file mode 100644
index 00000000..6a56aa22
--- /dev/null
+++ b/plugins/Timetrackingeditor/Console/AllSubtaskTimeTrackingExportCommand.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Console;
+
+use Kanboard\Plugin\Timetrackingeditor\Html;
+use Kanboard\Model\SubtaskTimeTrackingModel;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Kanboard\Console\BaseCommand;
+
+class AllSubtaskTimeTrackingExportCommand extends BaseCommand
+{
+ protected function configure()
+ {
+ $this
+ ->setName('export:allsubtaskstimetracking')
+ ->setDescription('Subtasks Time Tracking CSV export for all events');
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output)
+ {
+ $data = $this->subtaskTimeTrackingExport->exportAll();
+
+ if (is_array($data)) {
+ Html::output($data);
+ }
+ }
+}
diff --git a/plugins/Timetrackingeditor/Console/SubtaskTimeTrackingExportCommand.php b/plugins/Timetrackingeditor/Console/SubtaskTimeTrackingExportCommand.php
new file mode 100644
index 00000000..4f6e6384
--- /dev/null
+++ b/plugins/Timetrackingeditor/Console/SubtaskTimeTrackingExportCommand.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Kanboard\Console;
+
+use Kanboard\Core\Csv;
+use Kanboard\Model\SubtaskTimeTrackingModel;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class SubtaskTimeTrackingExportCommand extends BaseCommand
+{
+ protected function configure()
+ {
+ $this
+ ->setName('export:subtaskstimetracking')
+ ->setDescription('Subtasks Time Tracking CSV export')
+ ->addArgument('project_id', InputArgument::REQUIRED, 'Project id')
+ ->addArgument('start_date', InputArgument::REQUIRED, 'Start date (YYYY-MM-DD)')
+ ->addArgument('end_date', InputArgument::REQUIRED, 'End date (YYYY-MM-DD)');
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output)
+ {
+ $data = $this->subtaskTimeTrackingExport->export(
+ $input->getArgument('project_id'),
+ $input->getArgument('start_date'),
+ $input->getArgument('end_date')
+ );
+
+ if (is_array($data)) {
+ Html::output($data);
+ }
+ }
+}
diff --git a/plugins/Timetrackingeditor/Controller/SubtaskAjaxController.php b/plugins/Timetrackingeditor/Controller/SubtaskAjaxController.php
new file mode 100644
index 00000000..4871bfe0
--- /dev/null
+++ b/plugins/Timetrackingeditor/Controller/SubtaskAjaxController.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Controller;
+
+use Kanboard\Controller\BaseController;
+use Kanboard\Core\Filter\QueryBuilder;
+use Kanboard\Model\SubtaskModel;
+use Kanboard\Plugin\Timetrackingeditor\Filter\SubtaskTasksFilter;
+use Kanboard\Plugin\Timetrackingeditor\Filter\SubtaskIdFilter;
+use Kanboard\Plugin\Timetrackingeditor\Filter\SubtaskTitleFilter;
+use Kanboard\Plugin\Timetrackingeditor\Formatter\SubtaskAutoCompleteFormatter;
+
+/**
+ * Task Ajax Controller
+ *
+ * @package Kanboard\Plugin\Timetrackingeditor\Controller
+ * @author Thomas Stinner
+ */
+class SubtaskAjaxController extends BaseController
+{
+ /**
+ * Task auto-completion (Ajax)
+ *
+ * @access public
+ */
+ public function autocomplete()
+ {
+ $search = $this->request->getStringParam('term');
+ $task_id = $this->request->getIntegerParam('task_id');
+
+ $subtaskQuery = new QueryBuilder();
+ $subtaskQuery->withQuery($this->db
+ ->table(SubtaskModel::TABLE)
+ ->eq('task_id', $task_id)
+ ->columns(SubtaskModel::TABLE.'*'));
+
+ if (ctype_digit($search)) {
+ $subtaskQuery->withFilter(new SubtaskIdFilter($search));
+ } else {
+ $subtaskQuery->withFilter(new SubtaskTitleFilter($search));
+ }
+
+ $this->response->json($subtaskQuery->format(new SubtaskAutoCompleteFormatter($this->container)));
+ }
+}
diff --git a/plugins/Timetrackingeditor/Controller/SubtaskStatusController.php b/plugins/Timetrackingeditor/Controller/SubtaskStatusController.php
new file mode 100644
index 00000000..c27881a1
--- /dev/null
+++ b/plugins/Timetrackingeditor/Controller/SubtaskStatusController.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Controller;
+
+use Kanboard\Model\SubtaskModel;
+
+/**
+ * SubtaskStatusController.
+ *
+ * @author Thomas Stinner
+ */
+class SubtaskStatusController extends \Kanboard\Controller\SubtaskStatusController
+{
+ /**
+ * Change status to the next status: Toto -> In Progress -> Done.
+ */
+ public function change()
+ {
+ $task = $this->getTask();
+ $subtask = $this->getSubtask();
+
+ if ($subtask['status'] == SubtaskModel::STATUS_DONE) {
+ $status = SubtaskModel::STATUS_TODO;
+ } else {
+ $status = SubtaskModel::STATUS_DONE;
+ }
+ $subtask['status'] = $status;
+ $this->subtaskModel->update($subtask);
+
+ if ($this->request->getIntegerParam('refresh-table') === 0) {
+
+ $html = $this->helper->subtask->toggleStatus($subtask, $task['project_id']);
+ } else {
+ $html = $this->renderTable($task);
+ }
+
+ $this->response->html($html);
+ }
+
+ protected function renderTable(array $task)
+ {
+ return $this->template->render('subtask/table', array(
+ 'task' => $task,
+ 'subtasks' => $this->subtaskModel->getAll($task['id']),
+ 'editable' => true,
+ ));
+ }
+}
+?>
diff --git a/plugins/Timetrackingeditor/Controller/TimeTrackingEditorController.php b/plugins/Timetrackingeditor/Controller/TimeTrackingEditorController.php
new file mode 100644
index 00000000..815074f2
--- /dev/null
+++ b/plugins/Timetrackingeditor/Controller/TimeTrackingEditorController.php
@@ -0,0 +1,377 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Controller;
+use Kanboard\Controller\BaseController;
+use Kanboard\Controller\SubtaskStatusController;
+use Kanboard\Model\SubtaskTimeTrackingModel;
+use Kanboard\Plugin\Timetrackingeditor\Model\SubtaskTimeTrackingEditModel;
+use Kanboard\Plugin\Timetrackingeditor\Model\SubtaskTimeTrackingCreationModel;
+use Kanboard\Plugin\Timetrackingeditor\Validator\SubtaskTimeTrackingValidator;
+
+/**
+ * Column Controller
+ *
+ * @package Kanboard\Plugin\Timetrackingeditor\Controller
+ * @author Frederic Guillot
+ */
+class TimeTrackingEditorController extends BaseController
+{
+
+/**
+ * Show Form to start the timer
+ * @access public
+ * @param array $values
+ * @param arry $errors
+ */
+
+ public function start(array $values = array(), array $errors = array())
+ {
+ $project = $this->getProject();
+
+ if (empty($values)) {
+ $values = array('project_id' => $project['id'],
+ 'task_id' => $this->request->getIntegerParam('task_id'),
+ 'subtask_id' => $this->request->getIntegerParam('subtask_id')
+ );
+ }
+
+ $values['subtask'] = $this->subtaskModel->getById($values['subtask_id']);
+
+ $this->response->html($this->template->render('Timetrackingeditor:start', array(
+ 'values' => $values,
+ 'errors' => $errors,
+ 'project' => $project,
+ 'title' => t('Start a new timer')
+ )));
+ }
+
+ /**
+ * Show Form to stop the timer
+ * @access public
+ * @param array $values
+ * @param arry $errors
+ */
+
+ public function stop(array $values = array(), array $errors = array())
+ {
+ $project = $this->getProject();
+
+ if (empty($values)) {
+ $values = array('project_id' => $project['id'],
+ 'task_id' => $this->request->getIntegerParam('task_id'),
+ 'subtask_id' => $this->request->getIntegerParam('subtask_id')
+ );
+ }
+
+ $values['subtask'] = $this->subtaskModel->getById($values['subtask_id']);
+
+ $timetracking = $this->subtaskTimeTrackingEditModel
+ ->getOpenTimer(
+ $this->userSession->getId(),
+ $values['subtask_id']
+ );
+
+ $values['comment'] = $timetracking["comment"];
+ $values['is_billable'] = $timetracking['is_billable'];
+
+ $this->response->html($this->template->render('Timetrackingeditor:stop', array(
+ 'values' => $values,
+ 'errors' => $errors,
+ 'project' => $project,
+ 'title' => t('Stop a timer')
+ )));
+ }
+
+
+/**
+ * Start the timer and save comment and is_billable
+ * @access public
+ *
+ */
+
+ public function startsave()
+ {
+ $values = $this->request->getValues();
+ $project = $this->getProject();
+ $task = $this->getTask();
+
+ if (!$this->subtaskTimeTrackingModel->logStartTimeExtended(
+ $values['subtask_id'],
+ $this->userSession->getId(),
+ $values['comment'],
+ $values['is_billable'] ?: 0)) {
+ // TODO: Best way to display the errors?
+ $this->flash->failure("Another Timer is already running");
+ return false;
+ }
+
+ $this->subtaskStatusModel->toggleStatus($values['subtask_id']);
+
+ return $this->response->redirect($this->helper->url->to('SubtaskStatusController', 'change', array(
+ 'refresh-table' => 1,
+ 'project_id' => $project['id'],
+ 'task_id' => $task['id'],
+ 'subtask_id' => $values['subtask_id']
+ )), true);
+ }
+
+ /**
+ * Stop the timer and save comment and is_billable
+ *
+ * @access public
+ */
+ public function stopsave()
+ {
+
+ $values = $this->request->getValues();
+ $project = $this->getProject();
+ $task = $this->getTask();
+
+ $this->subtaskTimeTrackingModel->logEndTimeExtended(
+ $values['subtask_id'],
+ $this->userSession->getId(),
+ $values['comment'],
+ $values['is_billable'] ?: 0);
+
+ $this->subtaskStatusModel->toggleStatus($values['subtask_id']);
+
+ return $this->response->redirect($this->helper->url->to('SubtaskStatusController', 'change', array(
+ 'refresh-table' => 1,
+ 'project_id' => $project['id'],
+ 'task_id' => $task['id'],
+ 'subtask_id' => $values['subtask_id']
+ )), true);
+ }
+ /**
+ * Show Form to create new entry
+ * @access public
+ * @param array $values
+ * @param array $errors
+ */
+ public function create(array $values = array(), array $errors = array())
+ {
+ $project = $this->getProject();
+
+ if (empty($values)) {
+ $values = array('project_id' => $project['id'],
+ 'task_id' => $this->request->getIntegerParam('task_id')
+ );
+ }
+
+ if ($this->request->getIntegerParam('subtask_id')) {
+ $values['opposite_subtask_id'] = $this->request->getIntegerParam('subtask_id');
+ $subtask = $this->subtaskModel->getById($values['opposite_subtask_id']);
+
+ $values['subtask'] = $subtask['title'];
+ $autofocus = "time_spent";
+ } else {
+ $autofocus = "subtask";
+ }
+
+
+ $this->response->html($this->template->render('Timetrackingeditor:create', array(
+ 'values' => $values,
+ 'errors' => $errors,
+ 'project' => $project,
+ 'autofocus' => $autofocus,
+ 'title' => t('Add new time tracking event')
+ )));
+ }
+
+ /**
+ * Edit an existing entry
+ *
+ * @access public
+ * @param array $values
+ * @param array $errors
+ */
+ public function edit(array $values = array(), array $errors = array())
+ {
+ $project = $this->getProject();
+
+ if (empty($values)) {
+ $values = array('project_id' => $project['id'],
+ 'task_id' => $this->request->getIntegerParam('task_id'),
+ 'subtask_id' => $this->request->getIntegerParam('subtask_id'),
+ 'id' => $this->request->getIntegerParam('id')
+ );
+ }
+
+ $values = $this->subtaskTimeTrackingEditModel->getById($this->request->getIntegerParam('id'));
+
+ $values = $this->dateParser->format($values, array('start'), $this->dateParser->getUserDateFormat());
+ $values['subtask'] = $values['subtask_title'];
+ $values['opposite_subtask_id'] = $values['subtask_id'];
+
+ $this->response->html($this->template->render('Timetrackingeditor:edit', array(
+ 'values' => $values,
+ 'errors' => $errors,
+ 'project' => $project,
+ 'title' => t('Edit a time tracking event')
+ )));
+ }
+
+ /**
+ * Update a time tracking entry
+ *
+ * @access public
+ * @param array $values
+ * @param array $errors
+ */
+ public function update(array $values = array(), array $errors = array())
+ {
+ $project = $this->getProject();
+ $values = $this->request->getValues();
+ $oldtimetracking = $this->subtaskTimeTrackingModel->getById($values['id']);
+
+ if (!isset($values['is_billable'])) {
+ $values["is_billable"] = 0;
+ }
+
+ list($valid, $errors) = $this->subtaskTimeTrackingValidator->validateModification($values);
+
+ if ($valid && $this->subtaskTimeTrackingEditModel->update($values)) {
+ $this->flash->success(t('Timetracking entry updated successfully.'));
+ $this->updateTimespent($values['task_id'], $oldtimetracking['subtask_id'], $oldtimetracking['time_spent'] * -1);
+ $this->updateTimespent($values['task_id'], $values['opposite_subtask_id'], $values['time_spent']);
+
+ if ($oldtimetracking['is_billable'] == 1) {
+ $this->updateTimebillable($values['task_id'], $oldtimetracking['opposite_subtask_id'], $oldtimetracking['time_spent'] * -1);
+ }
+ if ($values['is_billable'] == 1) {
+ $this->updateTimebillable($values['task_id'], $values['opposite_subtask_id'], $values['time_spent']);
+ }
+ return $this->afterSave($project, $values);
+ }
+
+ $this->flash->failure(t('Unable to update your time tracking entry.'));
+ return $this->edit($values, $errors);
+
+ }
+
+
+ /**
+ * Save a newly created time tracking entry
+ * @access public
+ * @param array $values
+ * @param array $errors
+ */
+ public function save(array $values = array(), array $errors = array())
+ {
+ $project = $this->getProject();
+ $values = $this->request->getValues();
+
+ list($valid, $errors) = $this->subtaskTimeTrackingValidator->validateCreation($values);
+
+ if ($valid && $this->subtaskTimeTrackingCreationModel->create($values)) {
+ $this->updateTimespent($values['task_id'], $values['opposite_subtask_id'], $values['time_spent']);
+ if (isset($values['is_billable']) && $values['is_billable'] == 1) {
+ $this->updateTimebillable($values['task_id'], $values['opposite_subtask_id'], $values['time_spent']);
+ }
+ $this->flash->success(t('Timetracking entry added successfully.'));
+
+ return $this->afterSave($project, $values);
+ }
+
+ $this->flash->failure(t('Unable to create your time tracking entry.'));
+ return $this->create($values, $errors);
+
+ }
+
+ /**
+ * Confirmation dialog before removing an entry
+ *
+ * @access public
+ */
+ public function confirm()
+ {
+
+ $id = $this->request->getIntegerParam('id');
+
+ $timetracking = $this->subtaskTimeTrackingEditModel->getById($id);
+
+ $this->response->html($this->template->render('timetrackingeditor:remove', array(
+ 'timetracking' => $timetracking,
+ )));
+ }
+
+ /**
+ * Remove an entry
+ *
+ * @access public
+ */
+ public function remove()
+ {
+ $this->checkCSRFParam();
+ $id = $this->request->getIntegerParam('id');
+ $timetracking = $this->subtaskTimeTrackingEditModel->getById($id);
+
+ if ($this->subtaskTimeTrackingEditModel->remove($id)) {
+ $this->updateTimespent($timetracking['task_id'], $timetracking['subtask_id'], $timetracking['time_spent'] * -1);
+ if ($timetracking['is_billable'] == 1) {
+ $this->updateTimebillable($timetracking['task_id'], $timetracking['subtask_id'], $timetracking['time_spent'] * -1);
+ }
+ $this->flash->success(t('Entry removed successfully.'));
+ } else {
+ $this->flash->failure(t('Unable to remove this entry.'));
+ }
+
+ $this->response->redirect($this->helper->url->to('TaskViewController', 'timetracking', array('project_id' => $timetracking['project_id'], 'task_id' => $timetracking['task_id'])), true);
+ }
+
+ /**
+ * update time spent for the task
+ *
+ * @access private
+ * @param int $task_id
+ * @param int $subtask_id
+ * @return bool
+ */
+
+ private function updateTimespent($task_id, $subtask_id, $time_spent)
+ {
+ $this->subtaskTimeTrackingModel->updateSubtaskTimeSpent($subtask_id, $time_spent);
+ return $this->subtaskTimeTrackingModel->updateTaskTimeTracking($task_id);
+
+ }
+
+/**
+ * update time billable for the task
+ *
+ * @access private
+ * @param int $task_id
+ * @param int $subtask_id
+ * @return bool
+ */
+ private function updateTimebillable($task_id, $subtask_id, $time_billable)
+ {
+ $this->subtaskTimeTrackingModel->updateSubtaskTimeBillable($subtask_id, $time_billable);
+ return $this->subtaskTimeTrackingModel->updateTaskTimeTracking($task_id);
+ }
+
+
+ /**
+ * Present another, empty form if add_another is activated
+ *
+ * @access private
+ * @param array $project
+ * @param array $values
+ */
+ private function afterSave(array $project, array &$values)
+ {
+ if (isset($values['add_another']) && $values['add_another'] == 1) {
+ return $this->create(array(
+ 'project_id' => $this->getProject()['id'],
+ 'subtask' => $values['subtask'],
+ 'opposite_subtask_id' => $values['opposite_subtask_id'],
+ 'task_id' => $values['task_id'],
+ 'start' => $values['start'],
+ 'is_billable' => $values['is_billable'],
+ 'add_another' => 1,
+ ));
+ }
+
+ return $this->response->redirect($this->helper->url->to('TaskViewController', 'timetracking', array('project_id' => $project['id'], 'task_id' => $values['task_id'])), true);
+ }
+
+}
diff --git a/plugins/Timetrackingeditor/Export/SubtaskTimeTrackingExport.php b/plugins/Timetrackingeditor/Export/SubtaskTimeTrackingExport.php
new file mode 100644
index 00000000..c9fc1071
--- /dev/null
+++ b/plugins/Timetrackingeditor/Export/SubtaskTimeTrackingExport.php
@@ -0,0 +1,218 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Export;
+
+use Kanboard\Core\Base;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\SubtaskModel;
+use Kanboard\Model\UserModel;
+use Kanboard\Model\SubtaskTimeTrackingModel;
+use Kanboard\Model\ProjectModel;
+
+/**
+ * SubtaskTimeTracking Export
+ *
+ * @package export
+ * @author Thomas Stinner
+ */
+class SubtaskTimeTrackingExport extends Base
+{
+ /**
+ * Fetch subtasks time tracking and return the prepared CSV
+ *
+ * @access public
+ * @param integer $project_id Project id
+ * @param mixed $from Start date (timestamp or user formatted date)
+ * @param mixed $to End date (timestamp or user formatted date)
+ * @return array
+ */
+ public function export($project_id, $from, $to)
+ {
+ $subtaskstt = $this->getSubtasksTimeTracking($project_id, $from, $to);
+ $results = array($this->getColumns());
+
+ foreach ($subtaskstt as $subtasktt) {
+ $results[] = $this->format($subtasktt);
+ }
+
+ return $results;
+ }
+
+ public function exportAll()
+ {
+ $subtaskstt = $this->getAllSubtasksTimeTracking();
+ $results = array($this->getFormats());
+ $results[] = $this->getColumns();
+
+ foreach ($subtaskstt as $subtasktt) {
+ $results[] = $this->format($subtasktt);
+ }
+
+ return $results;
+ }
+
+ /**
+ * Get column titles
+ *
+ * @access public
+ * @return string[]
+ */
+ public function getColumns()
+ {
+ return array(
+ e('TimeTracking Id'),
+ e('User Id'),
+ e('Subtask Id'),
+ e('start'),
+ e('end'),
+ e('Time Spent'),
+ e('Is Billable?'),
+ e('Comment'),
+ e('Task Id'),
+ e('Task Title'),
+ e('Subtask Title'),
+ e('Project Id'),
+ e('Project Name'),
+ e('Color Id'),
+ e('Username'),
+ e('User Fullname'),
+ );
+ }
+
+ /**
+ * Get Format of the getColumns
+ *
+ * @access public
+ * @return string[]
+ */
+ public function getFormats()
+ {
+ return array(
+ 'num',
+ 'num',
+ 'num',
+ 'date',
+ 'date',
+ 'dec',
+ 'bool',
+ 'text',
+ 'num',
+ 'text',
+ 'text',
+ 'num',
+ 'text',
+ 'num',
+ 'text',
+ 'text'
+ );
+ }
+
+ /**
+ * Format the output of a subtask array
+ *
+ * @access public
+ * @param array $subtask Subtask properties
+ * @return array
+ */
+ public function format(array $subtasktt)
+ {
+ $values = array();
+ $values[] = $subtasktt['id'];
+ $values[] = $subtasktt['user_id'];
+ $values[] = $subtasktt['subtask_id'];
+ $values[] = $this->helper->dt->date($subtasktt['start']);
+ $values[] = $this->helper->dt->date($subtasktt['end']);
+ $values[] = str_replace(".",",",$subtasktt['time_spent']);
+ $values[] = $subtasktt['is_billable'];
+ $values[] = $this->helper->text->markdown($subtasktt['comment']);
+ $values[] = $subtasktt['task_id'];
+ $values[] = $subtasktt['task_title'];
+ $values[] = $subtasktt['subtask_title'];
+ $values[] = $subtasktt['project_id'];
+ $values[] = $subtasktt['project_name'];
+ $values[] = $subtasktt['color_id'];
+ $values[] = $subtasktt['username'];
+ $values[] = $subtasktt['user_fullname'];
+ return $values;
+ }
+
+ /**
+ * Get all time tracking events for a given project
+ *
+ * @access public
+ * @param integer $project_id Project id
+ * @param mixed $from Start date (timestamp or user formatted date)
+ * @param mixed $to End date (timestamp or user formatted date)
+ * @return array
+ */
+ public function getSubtasksTimeTracking($project_id, $from, $to)
+ {
+ if (! is_numeric($from)) {
+ $from = $this->dateParser->removeTimeFromTimestamp($this->dateParser->getTimestamp($from));
+ }
+
+ if (! is_numeric($to)) {
+ $to = $this->dateParser->removeTimeFromTimestamp(strtotime('+1 day', $this->dateParser->getTimestamp($to)));
+ }
+
+ return $this->db->table(SubtaskTimeTrackingModel::TABLE)
+ ->eq('project_id', $project_id)
+ ->columns(
+ SubtaskTimeTrackingModel::TABLE.'.id',
+ SubtaskTimeTrackingModel::TABLE.'.user_id',
+ SubtaskTimeTrackingModel::TABLE.'.subtask_id',
+ SubtaskTimeTrackingModel::TABLE.'.start',
+ SubtaskTimeTrackingModel::TABLE.'.end',
+ SubtaskTimeTrackingModel::TABLE.'.time_spent',
+ SubtaskTimeTrackingModel::TABLE.'.is_billable',
+ SubtaskTimeTrackingModel::TABLE.'.comment',
+ SubtaskModel::TABLE.'.task_id',
+ SubtaskModel::TABLE.'.title AS subtask_title',
+ TaskModel::TABLE.'.project_id',
+ ProjectModel::TABLE.'.name AS project_name',
+ TaskModel::TABLE.'.title AS task_title',
+ TaskModel::TABLE.'.color_id',
+ UserModel::TABLE.'.username',
+ UserModel::TABLE.'.name AS user_fullname'
+ )
+ ->join(SubtaskModel::TABLE, 'id', 'subtask_id')
+ ->join(TaskModel::TABLE, 'id', 'task_id', SubtaskModel::TABLE)
+ ->join(UserModel::TABLE, 'id', 'user_id', SubtaskTimeTrackingModel::TABLE)
+ ->join(ProjectModel::TABLE, 'id', 'project_id', TaskModel::TABLE)
+ ->gte(SubtaskTimeTrackingModel::TABLE.'.start', $from)
+ ->lte(SubtaskTimeTrackingModel::TABLE.'.start', $to)
+ ->eq(TaskModel::TABLE.'.project_id', $project_id)
+ ->findAll();
+ }
+
+ public function getAllSubtasksTimeTracking()
+ {
+
+ return $this->db->table(SubtaskTimeTrackingModel::TABLE)
+ ->columns(
+ SubtaskTimeTrackingModel::TABLE.'.id',
+ SubtaskTimeTrackingModel::TABLE.'.user_id',
+ SubtaskTimeTrackingModel::TABLE.'.subtask_id',
+ SubtaskTimeTrackingModel::TABLE.'.start',
+ SubtaskTimeTrackingModel::TABLE.'.end',
+ SubtaskTimeTrackingModel::TABLE.'.time_spent',
+ SubtaskTimeTrackingModel::TABLE.'.is_billable',
+ SubtaskTimeTrackingModel::TABLE.'.comment',
+ SubtaskModel::TABLE.'.task_id',
+ SubtaskModel::TABLE.'.title AS subtask_title',
+ TaskModel::TABLE.'.project_id',
+ ProjectModel::TABLE.'.name AS project_name',
+ TaskModel::TABLE.'.title AS task_title',
+ TaskModel::TABLE.'.color_id',
+ UserModel::TABLE.'.username',
+ UserModel::TABLE.'.name AS user_fullname'
+ )
+ ->join(SubtaskModel::TABLE, 'id', 'subtask_id')
+ ->join(TaskModel::TABLE, 'id', 'task_id', SubtaskModel::TABLE)
+ ->join(UserModel::TABLE, 'id', 'user_id', SubtaskTimeTrackingModel::TABLE)
+ ->join(ProjectModel::TABLE, 'id', 'project_id', TaskModel::TABLE)
+ ->findAll();
+
+
+ }
+}
diff --git a/plugins/Timetrackingeditor/Filter/SubtaskIdFilter.php b/plugins/Timetrackingeditor/Filter/SubtaskIdFilter.php
new file mode 100644
index 00000000..79779446
--- /dev/null
+++ b/plugins/Timetrackingeditor/Filter/SubtaskIdFilter.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Filter;
+
+use Kanboard\Core\Filter\FilterInterface;
+use Kanboard\Filter\BaseFilter;
+use Kanboard\Model\SubtaskModel;
+
+/**
+ * Filter subtasks by id
+ *
+ * @package filter
+ * @author Thomas Stinner
+ */
+class SubtaskIdFilter extends BaseFilter implements FilterInterface
+{
+ /**
+ * Get search attribute
+ *
+ * @access public
+ * @return string[]
+ */
+ public function getAttributes()
+ {
+ return array('id');
+ }
+
+ /**
+ * Apply filter
+ *
+ * @access public
+ * @return FilterInterface
+ */
+ public function apply()
+ {
+ $this->query->eq(SubtaskModel::TABLE.'.id', $this->value);
+ return $this;
+ }
+}
diff --git a/plugins/Timetrackingeditor/Filter/SubtaskTasksFilter.php b/plugins/Timetrackingeditor/Filter/SubtaskTasksFilter.php
new file mode 100644
index 00000000..d96a1a34
--- /dev/null
+++ b/plugins/Timetrackingeditor/Filter/SubtaskTasksFilter.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Filter;
+
+
+use Kanboard\Core\Filter\FilterInterface;
+use Kanboard\Filter\BaseFilter;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\SubtaskModel;
+
+/**
+ * Filter subtasks by task
+ *
+ * @package filter
+ * @author Thomas Stinner
+ */
+class SubtaskTasksFilter extends BaseFilter implements FilterInterface
+{
+ /**
+ * Get search attribute
+ *
+ * @access public
+ * @return string[]
+ */
+ public function getAttributes()
+ {
+ return array('task');
+ }
+
+ /**
+ * Apply filter
+ *
+ * @access public
+ * @return FilterInterface
+ */
+ public function apply()
+ {
+ if (is_int($this->value) || ctype_digit($this->value)) {
+ $this->query->eq(SubtaskModel::TABLE.'.task_id', $this->value);
+ } else {
+ $this->query->ilike(TaskModel::TABLE.'.name', $this->value);
+ }
+
+ return $this;
+ }
+}
diff --git a/plugins/Timetrackingeditor/Filter/SubtaskTitleFilter.php b/plugins/Timetrackingeditor/Filter/SubtaskTitleFilter.php
new file mode 100644
index 00000000..5be456f1
--- /dev/null
+++ b/plugins/Timetrackingeditor/Filter/SubtaskTitleFilter.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Kanboard\Plugin\TimetrackingEditor\Filter;
+
+use Kanboard\Core\Filter\FilterInterface;
+use Kanboard\Filter\BaseFilter;
+use Kanboard\Model\SubtaskModel;
+
+/**
+ * Filter Subtasks by title
+ *
+ * @package filter
+ * @author Thomas Stinner
+ */
+class SubtaskTitleFilter extends BaseFilter implements FilterInterface
+{
+ /**
+ * Get search attribute
+ *
+ * @access public
+ * @return string[]
+ */
+ public function getAttributes()
+ {
+ return array('title');
+ }
+
+ /**
+ * Apply filter
+ *
+ * @access public
+ * @return FilterInterface
+ */
+ public function apply()
+ {
+ if (ctype_digit($this->value) || (strlen($this->value) > 1 && $this->value{0} === '#' && ctype_digit(substr($this->value, 1)))) {
+ $this->query->beginOr();
+ $this->query->eq(SubtaskModel::TABLE.'.id', str_replace('#', '', $this->value));
+ $this->query->ilike(SubtaskModel::TABLE.'.title', '%'.$this->value.'%');
+ $this->query->closeOr();
+ } else {
+ $this->query->ilike(SubtaskModel::TABLE.'.title', '%'.$this->value.'%');
+ }
+
+ return $this;
+ }
+}
diff --git a/plugins/Timetrackingeditor/Formatter/SubtaskAutoCompleteFormatter.php b/plugins/Timetrackingeditor/Formatter/SubtaskAutoCompleteFormatter.php
new file mode 100644
index 00000000..724a146e
--- /dev/null
+++ b/plugins/Timetrackingeditor/Formatter/SubtaskAutoCompleteFormatter.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Formatter;
+
+use Kanboard\Core\Filter\FormatterInterface;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\SubtaskModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Formatter\BaseFormatter;
+
+/**
+ * Subtask AutoComplete Formatter
+ *
+ * @package formatter
+ * @author Thomas Stinner
+ */
+class SubtaskAutoCompleteFormatter extends BaseFormatter implements FormatterInterface
+{
+ /**
+ * Apply formatter
+ *
+ * @access public
+ * @return array
+ */
+ public function format()
+ {
+ $subtasks = $this->query->columns(
+ SubtaskModel::TABLE.'.id',
+ SubtaskModel::TABLE.'.title'
+ )->asc(SubtaskModel::TABLE.'.id')->findAll();
+
+ foreach ($subtasks as &$subtask) {
+ $subtask['value'] = $subtask['title'];
+ $subtask['label'] = ' > #'.$subtask['id'].' '.$subtask['title'];
+ }
+
+ return $subtasks;
+ }
+}
diff --git a/plugins/Timetrackingeditor/Html.php b/plugins/Timetrackingeditor/Html.php
new file mode 100644
index 00000000..eb3e1fa5
--- /dev/null
+++ b/plugins/Timetrackingeditor/Html.php
@@ -0,0 +1,182 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor;
+
+use SplFileObject;
+
+/**
+ * HTML Writer
+ *
+ * Allows exporting Data as HTML file.
+ * In contrast to CSV this allows clean interpration of HTML Tags by Excel
+ *
+ * @author Thomas Stinner
+ */
+class Html
+{
+ /**
+ * CSV/SQL columns
+ *
+ * @access private
+ * @var array
+ */
+ private $columns = array();
+
+ /**
+ * Constructor
+ *
+ * @access public
+ */
+ public function __construct()
+ {
+ }
+
+ /**
+ * Check boolean field value
+ *
+ * @static
+ * @access public
+ * @param mixed $value
+ * @return int
+ */
+ public static function getBooleanValue($value)
+ {
+ if (! empty($value)) {
+ $value = trim(strtolower($value));
+ return $value === '1' || $value{0} === 't' || $value{0} === 'y' ? 1 : 0;
+ }
+
+ return 0;
+ }
+
+ /**
+ * Output CSV file to standard output
+ *
+ * @static
+ * @access public
+ * @param array $rows
+ */
+ public static function output(array $rows)
+ {
+ $html= new static;
+ $html->write('php://output', $rows);
+ }
+
+ /**
+ * Define column mapping between CSV and SQL columns
+ *
+ * @access public
+ * @param array $columns
+ * @return Csv
+ */
+ public function setColumnMapping(array $columns)
+ {
+ $this->columns = $columns;
+ return $this;
+ }
+
+ /**
+ * Write HTML file
+ *
+ * @access public
+ * @param string $filename
+ * @param array $rows
+ * @return Html
+ */
+ public function write($filename, array $rows)
+ {
+
+ $fp = fopen($filename, 'w');
+
+ if (is_resource($fp)) {
+ $types = array_shift($rows);
+
+ $this->writeHeader($fp);
+ foreach ($rows as $row) {
+ $this->writeRow($fp, $types, $row);
+ }
+ $this->writeFooter($fp);
+ fclose($fp);
+ }
+
+ return $this;
+ }
+
+ /**
+ * write a HTML header
+ *
+ * @param $fp filepointer
+ */
+ private function writeHeader($fp)
+ {
+ fwrite($fp,"<HTML><HEAD><STYLE>\n");
+ fwrite($fp,"b,p {mso-data-placement: same-cell; }\n");
+ fwrite($fp,".num { mso-number-format:General; }\n");
+ fwrite($fp,".dec { mso-number-format: 0,00; }\n");
+ fwrite($fp,".text { mso-number-format:\"\\@\"; }\n");
+ fwrite($fp,".date { mso-number-format:\"Short Date\"; }\n");
+ fwrite($fp,"</STYLE></HEAD>\n");
+ fwrite($fp,"<BODY><TABLE>");
+
+ }
+
+ /**
+ * write a single row
+ *
+ * @param fp filepointer
+ * @param $row row
+ */
+ private function writeRow($fp, array $types, array $row)
+ {
+ fwrite($fp,"<tr>");
+ foreach ($row as $key => $value) {
+ fwrite($fp,"<td class='".$types[$key]."'>".$value."</td>");
+ }
+ fwrite($fp,"</tr>\n");
+ }
+
+ /**
+ * write a HTML footer
+ */
+ private function writeFooter($fp)
+ {
+ fwrite($fp,"</TABLE></BODY></HTML>");
+ }
+
+ /**
+ * Associate columns header with row values
+ *
+ * @access private
+ * @param array $row
+ * @return array
+ */
+ private function associateColumns(array $row)
+ {
+ $line = array();
+ $index = 0;
+
+ foreach ($this->columns as $sql_name => $csv_name) {
+ if (isset($row[$index])) {
+ $line[$sql_name] = $row[$index];
+ } else {
+ $line[$sql_name] = '';
+ }
+
+ $index++;
+ }
+
+ return $line;
+ }
+
+ /**
+ * Filter empty rows
+ *
+ * @access private
+ * @param array $row
+ * @return array
+ */
+ private function filterRow(array $row)
+ {
+ return array_filter($row);
+ }
+}
diff --git a/plugins/Timetrackingeditor/Model/SubtaskTimeTrackingCreationModel.php b/plugins/Timetrackingeditor/Model/SubtaskTimeTrackingCreationModel.php
new file mode 100644
index 00000000..806d9345
--- /dev/null
+++ b/plugins/Timetrackingeditor/Model/SubtaskTimeTrackingCreationModel.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Model;
+
+use Kanboard\Core\Base;
+use Kanboard\Event\TaskEvent;
+use Kanboard\Model\SubtaskTimeTrackingModel;
+
+/**
+ * Task Creation
+ *
+ * @package Kanboard\Plugin\Timetrackingeditor\Model
+ * @author Thomas Stinner
+ */
+class SubtaskTimeTrackingCreationModel extends Base
+{
+ /**
+ * Create a time tracking event
+ *
+ * @access public
+ * @param array $values Form values
+ * @return integer
+ */
+ public function create(array $values)
+ {
+
+ $this->prepare($values);
+ $subtrackingid = $this->db->table(SubtaskTimeTrackingModel::TABLE)->persist($values);
+
+ return (int) $subtrackingid;
+ }
+
+ /**
+ * Prepare data
+ *
+ * @access public
+ * @param array $values Form values
+ */
+ public function prepare(array &$values)
+ {
+ if ($this->userSession->isLogged()) {
+ $values['user_id'] = $this->userSession->getId();
+ }
+
+ $values["subtask_id"] = $values["opposite_subtask_id"];
+
+ $this->helper->model->removeFields($values, array('project_id', 'task_id', 'opposite_subtask_id', 'subtask', 'add_another'));
+
+ // Calculate end time
+ $values = $this->dateParser->convert($values, array('start'), true);
+ $values["end"] = $values["start"] + ($values['time_spent']*60*60);
+ }
+}
diff --git a/plugins/Timetrackingeditor/Model/SubtaskTimeTrackingEditModel.php b/plugins/Timetrackingeditor/Model/SubtaskTimeTrackingEditModel.php
new file mode 100644
index 00000000..a6ee24dc
--- /dev/null
+++ b/plugins/Timetrackingeditor/Model/SubtaskTimeTrackingEditModel.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Model;
+
+use Kanboard\Core\Base;
+use Kanboard\Model\SubtaskModel;
+use Kanboard\Model\TaskModel;
+
+/**
+ * Task Creation
+ *
+ * @package Kanboard\Plugin\Timetrackingeditor\Model
+ * @author Thomas Stinner
+ */
+class SubtaskTimeTrackingEditModel extends Base
+{
+
+ /**
+ * GetOpenTimer
+ * Returns the Open (started but not finished) Time Tracking entry
+ * for a specific user and subtask
+ *
+ * @access public
+ * @param integer $user_id User id
+ * @param integer $subtask_id Subtask id
+ * @return \Picodb\Table
+ */
+ public function getOpenTimer($user_id, $subtask_id)
+ {
+ return $this->db
+ ->table(SubtaskTimeTrackingModel::TABLE)
+ ->columns(
+ SubtaskTimeTrackingModel::TABLE.'.id',
+ SubtaskTimeTrackingModel::TABLE.'.subtask_id',
+ SubtaskTimeTrackingModel::TABLE.'.end',
+ SubtaskTimeTrackingModel::TABLE.'.start',
+ SubtaskTimeTrackingModel::TABLE.'.time_spent',
+ SubtaskTimeTrackingModel::TABLE.'.comment',
+ SubtaskTimeTrackingModel::TABLE.'.is_billable'
+ )
+ ->eq(SubtaskTimeTrackingModel::TABLE.'.subtask_id', $subtask_id)
+ ->eq(SubtaskTimeTrackingModel::TABLE.'.user_id', $user_id)
+ ->eq(SubtaskTimeTrackingModel::TABLE.'.end', 0)
+ ->findOne();
+ }
+
+ /**
+ * Get by Id
+ *
+ * @access public
+ * @param int $id TimetrackingId
+ * @return \PicoDb\Table
+ */
+ public function getById($id)
+ {
+ return $this->db
+ ->table(SubtaskTimeTrackingModel::TABLE)
+ ->columns(
+ SubtaskTimeTrackingModel::TABLE.'.id',
+ SubtaskTimeTrackingModel::TABLE.'.subtask_id',
+ SubtaskTimeTrackingModel::TABLE.'.end',
+ SubtaskTimeTrackingModel::TABLE.'.start',
+ SubtaskTimeTrackingModel::TABLE.'.time_spent',
+ SubtaskTimeTrackingModel::TABLE.'.comment',
+ SubtaskTimeTrackingModel::TABLE.'.is_billable',
+ SubtaskModel::TABLE.'.task_id',
+ SubtaskModel::TABLE.'.title AS subtask_title',
+ TaskModel::TABLE.'.title AS task_title',
+ TaskModel::TABLE.'.project_id',
+ TaskModel::TABLE.'.color_id'
+ )
+ ->join(SubtaskModel::TABLE, 'id', 'subtask_id')
+ ->join(TaskModel::TABLE, 'id', 'task_id', SubtaskModel::TABLE)
+ ->eq(SubtaskTimeTrackingModel::TABLE.'.id', $id)
+ ->findOne();
+
+ }
+
+ /**
+ * Create a time tracking event
+ *
+ * @access public
+ * @param array $values Form values
+ * @return integer
+ */
+ public function create(array $values)
+ {
+
+ $this->prepare($values);
+ $subtrackingid = $this->db->table(SubtaskTimeTrackingModel::TABLE)->persist($values);
+
+ return (int) $subtrackingid;
+ }
+
+ /**
+ * Update a time tracking event
+ *
+ * @access public
+ * @param array $values
+ * @return boolean
+ */
+ public function update(array $values)
+ {
+ $this->prepare($values);
+
+ return $this->db->table(SubtaskTimeTrackingModel::TABLE)->eq('id', $values['id'])->update($values);
+ }
+
+
+ /**
+ * remove an entry
+ *
+ * @access public
+ * @param int $id
+ * @return boolran
+ */
+ public function remove($id)
+ {
+ return $this->db->table(SubtaskTimeTrackingModel::TABLE)->eq('id', $id)->remove();
+
+ }
+
+ /**
+ * Prepare data
+ *
+ * @access public
+ * @param array $values Form values
+ */
+ public function prepare(array &$values)
+ {
+ if ($this->userSession->isLogged()) {
+ $values['user_id'] = $this->userSession->getId();
+ }
+
+ $values["subtask_id"] = $values["opposite_subtask_id"];
+
+ $this->helper->model->removeFields($values, array('project_id', 'task_id', 'opposite_subtask_id', 'subtask', 'add_another', 'old_time_spent', 'old_opposite_subtask_id'));
+
+ // Calculate end time
+ $values = $this->dateParser->convert($values, array('start'), true);
+ $values["end"] = $values["start"] + ($values['time_spent']*60*60);
+ }
+}
diff --git a/plugins/Timetrackingeditor/Model/SubtaskTimeTrackingModel.php b/plugins/Timetrackingeditor/Model/SubtaskTimeTrackingModel.php
new file mode 100644
index 00000000..1fcf8738
--- /dev/null
+++ b/plugins/Timetrackingeditor/Model/SubtaskTimeTrackingModel.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace Kanboard\Plugin\TimetrackingEditor\Model;
+
+use Kanboard\Model\SubtaskModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\UserModel;
+
+/**
+ * @author Thomas Stinner
+ */
+
+class SubtaskTimeTrackingModel extends \Kanboard\Model\SubtaskTimeTrackingModel
+{
+ /**
+ * Log start time
+ *
+ * @access public
+ * @param integer $subtask_id
+ * @param integer $user_id
+ * @return boolean
+ */
+ public function logStartTimeExtended($subtask_id, $user_id, $comment, $is_billable)
+ {
+ return
+ ! $this->hasTimer($subtask_id, $user_id) &&
+ $this->db
+ ->table(self::TABLE)
+ ->insert(array('subtask_id' => $subtask_id,
+ 'user_id' => $user_id,
+ 'comment' => $comment,
+ 'is_billable' => $is_billable,
+ 'start' => time(),
+ 'end' => 0));
+ }
+
+ /**
+ * Log end time
+ *
+ * @access public
+ * @param integer $subtask_id
+ * @param integer $user_id
+ * @return boolean
+ */
+ public function logEndTimeExtended($subtask_id, $user_id, $comment, $is_billable)
+ {
+ $time_spent = $this->getTimeSpent($subtask_id, $user_id);
+
+ if ($time_spent > 0) {
+ $this->updateSubtaskTimeSpent($subtask_id, $time_spent);
+ }
+
+ return $this->db
+ ->table(self::TABLE)
+ ->eq('subtask_id', $subtask_id)
+ ->eq('user_id', $user_id)
+ ->eq('end', 0)
+ ->update(array(
+ 'end' => time(),
+ 'time_spent' => $time_spent,
+ 'comment' => $comment,
+ 'is_billable' => $is_billable
+ ));
+ }
+
+ /**
+ * Get query for task timesheet (pagination)
+ *
+ * @access public
+ * @param integer $task_id Task id
+ * @return \PicoDb\Table
+ */
+ public function getTaskQuery($task_id)
+ {
+ return $this->db
+ ->table(self::TABLE)
+ ->columns(
+ self::TABLE.'.id',
+ self::TABLE.'.subtask_id',
+ self::TABLE.'.end',
+ self::TABLE.'.start',
+ self::TABLE.'.time_spent',
+ self::TABLE.'.user_id',
+ self::TABLE.'.comment',
+ self::TABLE.'.is_billable',
+ SubtaskModel::TABLE.'.task_id',
+ SubtaskModel::TABLE.'.title AS subtask_title',
+ TaskModel::TABLE.'.project_id',
+ UserModel::TABLE.'.username',
+ UserModel::TABLE.'.name AS user_fullname'
+ )
+ ->join(SubtaskModel::TABLE, 'id', 'subtask_id')
+ ->join(TaskModel::TABLE, 'id', 'task_id', SubtaskModel::TABLE)
+ ->join(UserModel::TABLE, 'id', 'user_id', self::TABLE)
+ ->eq(TaskModel::TABLE.'.id', $task_id);
+ }
+
+ /**
+ * Update subtask time billable
+ *
+ * @access public
+ * @param integer $subtask_id
+ * @param float $time_billable
+ * @return bool
+ */
+ public function updateSubtaskTimeBillable($subtask_id, $time_billable)
+ {
+ $subtask = $this->subtaskModel->getById($subtask_id);
+
+ return $this->subtaskModel->update(array(
+ 'id' => $subtask['id'],
+ 'time_billable' => $subtask['time_billable'] + $time_billable,
+ 'task_id' => $subtask['task_id'],
+ ), false);
+ }
+
+ /**
+ * get a Subtasktimetracking entry by Id
+ *
+ * @access public
+ * @param $id the subtasktimetracking id
+ * @return array
+ */
+ public function getById($id)
+ {
+ return $this->db
+ ->table(SubtaskTimeTrackingModel::TABLE)
+ ->eq('id', $id)
+ ->findOne();
+ }
+
+
+}
diff --git a/plugins/Timetrackingeditor/Plugin.php b/plugins/Timetrackingeditor/Plugin.php
new file mode 100644
index 00000000..f36403fb
--- /dev/null
+++ b/plugins/Timetrackingeditor/Plugin.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor;
+
+use Kanboard\Core\Translator;
+use Kanboard\Core\Plugin\Base;
+use Kanboard\Plugin\Timetrackingeditor\Helper\SubtaskHelper;
+use Kanboard\Plugin\Timetrackingeditor\Model\SubtaskTimeTrackingModel;
+use Kanboard\Plugin\Timetrackingeditor\Console\AllSubtaskTimeTrackingExportCommand;
+
+class Plugin extends Base
+{
+ public function initialize()
+ {
+ $this->hook->on("template:layout:css", array("template" => "plugins/Timetrackingeditor/assets/css/timetrackingeditor.css"));
+ $this->template->setTemplateOverride('task/time_tracking_details', 'timetrackingeditor:time_tracking_editor');
+ $this->template->setTemplateOverride('subtask/table', 'timetrackingeditor:subtask/table');
+
+ # $this->helper->register("subtask", "Kanboard\Plugin\Timetrackingeditor\Helper\SubtaskHelper");
+
+ $this->container["cli"]->add(new AllSubtaskTimeTrackingExportCommand($this->container));
+ }
+
+ public function onStartup()
+ {
+ Translator::load($this->languageModel->getCurrentLanguage(), __DIR__.'/Locale');
+ }
+
+ public function getClasses()
+ {
+ return array(
+ 'Plugin\Timetrackingeditor\Model' => array(
+ 'SubtaskTimeTrackingCreationModel',
+ 'SubtaskTimeTrackingEditModel',
+ 'SubtaskTimeTrackingModel',
+ ),
+ 'Plugin\Timetrackingeditor\Filter' => array(
+ 'SubtaskFilter',
+ 'SubtaskTaskFilter',
+ 'SubtaskTitleFilter'
+ ),
+ 'Plugin\Timetrackingeditor\Console' => array(
+ 'AllSubtaskTimeTrackingExportCommand'
+ ),
+ 'Plugin\Timetrackingeditor\Controller' => array(
+ 'SubtaskStatusController',
+ 'SubtaskAjaxController',
+ 'TimeTrackingEditorController'
+ ),
+ 'Plugin\Timetrackingeditor\Export' => array(
+ 'SubtaskTimeTrackingExport'
+ ),
+ 'Plugin\Timetrackingeditor\Validator' => array(
+ 'SubtaskTimeTrackingValidator'
+ ),
+ 'Plugin\Timetrackingeditor\Formatter' => array(
+ 'SubtaskAutoCompleteFormatter'
+ ),
+ );
+ }
+
+ public function getPluginName()
+ {
+ return 'TimeTrackingEditor';
+ }
+
+ public function getPluginDescription()
+ {
+ return t('Allows Editing of TimeTracking Values');
+ }
+
+ public function getPluginAuthor()
+ {
+ return 'Thomas Stinner';
+ }
+
+ public function getPluginVersion()
+ {
+ return '1.0.21';
+ }
+
+ public function getPluginHomepage()
+ {
+ return 'https://github.com/stinnux/kanboard-timetrackingeditor';
+ }
+
+ public function getCompatibleVersion()
+ {
+ return '>=1.2.4';
+ }
+}
diff --git a/plugins/Timetrackingeditor/README.md b/plugins/Timetrackingeditor/README.md
new file mode 100644
index 00000000..68907fc0
--- /dev/null
+++ b/plugins/Timetrackingeditor/README.md
@@ -0,0 +1,40 @@
+Timetrackingeditor
+==================
+
+
+Allows manual adding and editon of Timetracking Entries
+
+Author
+------
+
+- Thomas Stinner
+
+Requirements
+------------
+
+- Kanboard >= 1.0.38 (not testet with older versions)
+
+
+Installation
+------------
+
+You have the choice between 3 methods:
+
+1. Install the plugin from the Kanboard plugin manager in one click
+2. Download the zip file and decompress everything under the directory `plugins/Timetrackingeditor`
+3. Clone this repository into the folder `plugins/Timetrackingeditor`
+
+Note: Plugin folder is case-sensitive.
+
+
+Documentation
+-------------
+
+With this plugin you are able to edit, remove and manually create entries in the Time Tracking Table.
+
+Just go to a subtask, select "Time Tracking" (only visible if you have entered either an estimate and/or time spent value for the Task). Now you have the opportunity to add/remove/delete entries. You are only allowed to remove and edit your own entries.
+
+You can also add comments to every Time Tracking entry and select if the time is billable or not. Entries that have been selected as billable have a shopping cart symbol.
+
+Additionally you can export all time tracking entries as an HTML table (which makes it easy to import to excel) using the command ``` kanboard export:allsubtaskstimetracking```
+
diff --git a/plugins/Timetrackingeditor/Schema/Mysql.php b/plugins/Timetrackingeditor/Schema/Mysql.php
new file mode 100644
index 00000000..8fda41c7
--- /dev/null
+++ b/plugins/Timetrackingeditor/Schema/Mysql.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Schema;
+
+const VERSION = 2;
+
+function version_2($pdo)
+{
+ $pdo->exec("ALTER TABLE subtasks add time_billable INT default 0");
+}
+
+function version_1($pdo)
+{
+ $pdo->exec("ALTER TABLE subtask_time_tracking add comment TEXT");
+ $pdo->exec("ALTER TABLE subtask_time_tracking add is_billable TINYINT");
+}
diff --git a/plugins/Timetrackingeditor/Schema/Postgres.php b/plugins/Timetrackingeditor/Schema/Postgres.php
new file mode 100644
index 00000000..b735e931
--- /dev/null
+++ b/plugins/Timetrackingeditor/Schema/Postgres.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Schema;
+
+const VERSION = 2;
+
+function vesion_2($pdo)
+{
+ $pdo->exec("ALTER TABLE subtasks add time_billable INTEGER default 0");
+}
+
+function version_1($pdo)
+{
+ $pdo->exec("ALTER TABLE subtask_time_tracking add comment TEXT");
+ $pdo->exec("ALTER TABLE subtask_time_tracking add is_billable BOOLEAN");
+}
diff --git a/plugins/Timetrackingeditor/Schema/Sqlite.php b/plugins/Timetrackingeditor/Schema/Sqlite.php
new file mode 100644
index 00000000..ffbeac85
--- /dev/null
+++ b/plugins/Timetrackingeditor/Schema/Sqlite.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Schema;
+
+const VERSION = 2;
+
+function version_2($pdo)
+{
+ $pdo->exec("ALTER TABLE subtasks add time_billable NUMERIC default 0");
+}
+
+function version_1($pdo)
+{
+ $pdo->exec("ALTER TABLE subtask_time_tracking add comment TEXT");
+ $pdo->exec("ALTER TABLE subtask_time_tracking add is_billable INTEGER");
+}
diff --git a/plugins/Timetrackingeditor/Template/create.php b/plugins/Timetrackingeditor/Template/create.php
new file mode 100644
index 00000000..362cfde4
--- /dev/null
+++ b/plugins/Timetrackingeditor/Template/create.php
@@ -0,0 +1,41 @@
+<div class="page-header">
+ <h2><?= t('Add a new Time Tracking Event') ?></h2>
+</div>
+<form class="popover-form" method="post" action="<?= $this->url->href('TimeTrackingEditorController', 'save', array('plugin' => 'timetrackingeditor', 'project_id' => $values['project_id'], 'task_id' => $values['task_id'])) ?>" autocomplete="off">
+
+ <?= $this->form->csrf() ?>
+
+ <?= $this->form->hidden('project_id', $values) ?>
+ <?= $this->form->hidden('task_id', $values) ?>
+ <?= $this->form->hidden('opposite_subtask_id', $values) ?>
+
+ <?= $this->form->label(t('Subtask'), 'subtask') ?>
+ <?= $this->form->text(
+ 'subtask',
+ $values,
+ $errors,
+ array(
+ 'required',
+ (!isset($autofocus) || $autofocus == 'subtask' ? 'autofocus' : ''),
+ 'placeholder="'.t('Start to type subtask title...').'"',
+ 'title="'.t('Start to type subtask title...').'"',
+ 'data-dst-field="opposite_subtask_id"',
+ 'data-search-url="'.$this->url->href('SubtaskAjaxController', 'autocomplete', array('plugin' => 'timetrackingeditor', 'task_id' => $values['task_id'])).'"',
+ ),
+ 'autocomplete') ?>
+
+ <?= $this->form->label(t('Time spent'), 'time_spent') ?>
+ <?= $this->form->numeric('time_spent', $values, $errors, array('maxlength="10"', 'required', (isset($autofocus) && $autofocus == "time_spent" ? 'autofocus' : '')), 'form-numeric') ?> hours
+
+ <?= $this->form->label(t('Start Date'), 'start') ?>
+ <?= $this->form->text('start', $values, $errors, array('maxlength="10"', 'required'), 'form-date') ?>
+
+ <?= $this->form->label(t('Comment'), 'comment') ?>
+ <?= $this->form->textarea('comment', $values, $errors, array(), 'markdown-editor') ?>
+
+ <?= $this->form->checkbox('is_billable', t('Billable?'), 1, isset($values['is_billable']) && $values['is_billable'] == 1) ?>
+ <?= $this->form->checkbox('add_another', t('Add another event'), 1, isset($values['add_another']) && $values['add_another'] == 1) ?>
+
+ <?= $this->modal->submitButtons(); ?>
+
+</form>
diff --git a/plugins/Timetrackingeditor/Template/edit.php b/plugins/Timetrackingeditor/Template/edit.php
new file mode 100644
index 00000000..28323812
--- /dev/null
+++ b/plugins/Timetrackingeditor/Template/edit.php
@@ -0,0 +1,41 @@
+<div class="page-header">
+ <h2><?= t('Edit a Time Tracking Event') ?></h2>
+</div>
+<form class="popover-form" method="post" action="<?= $this->url->href('TimeTrackingEditorController', 'update', array('plugin' => 'timetrackingeditor', 'project_id' => $values['project_id'], 'task_id' => $values['task_id'])) ?>" autocomplete="off">
+
+ <?= $this->form->csrf() ?>
+
+ <?= $this->form->hidden('project_id', $values) ?>
+ <?= $this->form->hidden('task_id', $values) ?>
+ <?= $this->form->hidden('opposite_subtask_id', $values) ?>
+ <?= $this->form->hidden('id', $values) ?>
+
+
+ <?= $this->form->label(t('Subtask'), 'subtask') ?>
+ <?= $this->form->text(
+ 'subtask',
+ $values,
+ $errors,
+ array(
+ 'required',
+ 'autofocus',
+ 'placeholder="'.t('Start to type subtask title...').'"',
+ 'title="'.t('Start to type subtask title...').'"',
+ 'data-dst-field="opposite_subtask_id"',
+ 'data-search-url="'.$this->url->href('SubtaskAjaxController', 'autocomplete', array('plugin' => 'timetrackingeditor', 'task_id' => $values['task_id'])).'"',
+ ),
+ 'autocomplete') ?>
+
+ <?= $this->form->label(t('Start Date'), 'start') ?>
+ <?= $this->form->text('start', $values, $errors, array('maxlength="10"', 'required'), 'form-date') ?>
+
+ <?= $this->form->label(t('Time spent'), 'time_spent') ?>
+ <?= $this->form->numeric('time_spent', $values, $errors, array('maxlength="10"', 'required'), 'form-numeric') ?> hours
+
+ <?= $this->form->label(t('Comment'), 'comment') ?>
+ <?= $this->form->textarea('comment', $values, $errors, array(), 'markdown-editor') ?>
+
+ <?= $this->form->checkbox('is_billable', t('Billable?'), 1, $values['is_billable'] == 1) ?>
+
+ <?= $this->modal->submitButtons(); ?>
+</form>
diff --git a/plugins/Timetrackingeditor/Template/menu.php b/plugins/Timetrackingeditor/Template/menu.php
new file mode 100644
index 00000000..fb715c4b
--- /dev/null
+++ b/plugins/Timetrackingeditor/Template/menu.php
@@ -0,0 +1,23 @@
+<div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
+ <ul>
+ <li>
+ <?= $this->modal->medium("pencil-square-o", t('Edit'),
+ 'TimeTrackingEditorController', 'edit',
+ array('plugin' => 'timetrackingeditor',
+ 'task_id' => $task['id'],
+ 'project_id' => $task['project_id'],
+ 'subtask_id' => $subtask_id,
+ 'id' => $id)) ?>
+ </li>
+ <li>
+ <?= $this->modal->medium("trash-o", t('Remove'),
+ 'TimeTrackingEditorController', 'confirm',
+ array('plugin' => 'timetrackingeditor',
+ 'task_id' => $task['id'],
+ 'project_id' => $task['project_id'],
+ 'subtask_id' => $subtask_id,
+ 'id' => $id)) ?>
+ </li>
+ </ul>
+</div>
diff --git a/plugins/Timetrackingeditor/Template/remove.php b/plugins/Timetrackingeditor/Template/remove.php
new file mode 100644
index 00000000..f86ad424
--- /dev/null
+++ b/plugins/Timetrackingeditor/Template/remove.php
@@ -0,0 +1,20 @@
+<div class="page-header">
+ <h2><?= t('Remove a time tracking entry') ?></h2>
+</div>
+
+<div class="confirm">
+ <div class="alert alert-info">
+ <?= t('Do you really want to remove this entry?') ?>
+ <ul>
+ <li>
+ <strong><?= $this->text->e($timetracking['subtask_title']) ?></strong>
+ </li>
+ </ul>
+ </div>
+
+ <div class="form-actions">
+ <?= $this->url->link(t('Yes'), 'TimeTrackingEditorController', 'remove', array('plugin' => 'timetrackingeditor', 'id' => $timetracking['id'], 'project_id' => $timetracking['project_id'], 'subtask_id' => $timetracking['subtask_id']), true, 'btn btn-red') ?>
+ <?= t('or') ?>
+ <?= $this->url->link(t('cancel'), 'TimeTrackingEditorController', 'show', array('plugin' => 'timetrackingeditor','id' => $timetracking['id'], 'project_id' => $timetracking['project_id']), false, 'close-popover') ?>
+ </div>
+</div>
diff --git a/plugins/Timetrackingeditor/Template/start.php b/plugins/Timetrackingeditor/Template/start.php
new file mode 100644
index 00000000..cc67febd
--- /dev/null
+++ b/plugins/Timetrackingeditor/Template/start.php
@@ -0,0 +1,23 @@
+<div class="page-header">
+ <h2><?= t('Start a new Timer') ?></h2>
+</div>
+<form class="popover-form" method="post" action="<?= $this->url->href('TimeTrackingEditorController', 'startsave', array('plugin' => 'timetrackingeditor', 'project_id' => $values['project_id'], 'task_id' => $values['task_id'])) ?>" autocomplete="off">
+
+ <?= $this->form->csrf() ?>
+
+ <?= $this->form->hidden('project_id', $values) ?>
+ <?= $this->form->hidden('task_id', $values) ?>
+ <?= $this->form->hidden('subtask_id', $values) ?>
+
+ <?= t('Subtask') ?>
+ <?= $values['subtask']['title'] ?>
+
+ <?= $this->form->label(t('Comment'), 'comment') ?>
+ <?= $this->form->textarea('comment', $values, $errors, array(), 'markdown-editor') ?>
+
+ <?= $this->form->checkbox('is_billable', t('Billable?'), 1, isset($values['is_billable']) && $values['is_billable'] == 1) ?>
+
+ <div class="form-actions">
+ <?= $this->modal->submitButtons() ?>
+ </div>
+</form>
diff --git a/plugins/Timetrackingeditor/Template/stop.php b/plugins/Timetrackingeditor/Template/stop.php
new file mode 100644
index 00000000..63d3905d
--- /dev/null
+++ b/plugins/Timetrackingeditor/Template/stop.php
@@ -0,0 +1,23 @@
+<div class="page-header">
+ <h2><?= t('Stop a Timer') ?></h2>
+</div>
+<form class="popover-form" method="post" action="<?= $this->url->href('TimeTrackingEditorController', 'stopsave', array('plugin' => 'timetrackingeditor', 'project_id' => $values['project_id'], 'task_id' => $values['task_id'])) ?>" autocomplete="off">
+
+ <?= $this->form->csrf() ?>
+
+ <?= $this->form->hidden('project_id', $values) ?>
+ <?= $this->form->hidden('task_id', $values) ?>
+ <?= $this->form->hidden('subtask_id', $values) ?>
+
+ <?= t('Subtask') ?>
+ <?= $values['subtask']['title'] ?>
+
+ <?= $this->form->label(t('Comment'), 'comment') ?>
+ <?= $this->form->textarea('comment', $values, $errors, array(), 'markdown-editor') ?>
+
+ <?= $this->form->checkbox('is_billable', t('Billable?'), 1, isset($values['is_billable']) && $values['is_billable'] == 1) ?>
+
+ <div class="form-actions">
+ <?= $this->modal->submitButtons() ?>
+ </div>
+</form>
diff --git a/plugins/Timetrackingeditor/Template/subtask/table.php b/plugins/Timetrackingeditor/Template/subtask/table.php
new file mode 100644
index 00000000..fa7f62ff
--- /dev/null
+++ b/plugins/Timetrackingeditor/Template/subtask/table.php
@@ -0,0 +1,89 @@
+<?php if (! empty($subtasks)): ?>
+ <table
+ class="subtasks-table table-stripped"
+ data-save-position-url="<?= $this->url->href('SubtaskController', 'movePosition', array('project_id' => $task['project_id'], 'task_id' => $task['id'])) ?>"
+ >
+ <thead>
+ <tr>
+ <th class="column-40"><?= t('Title') ?></th>
+ <th><?= t('Assignee') ?></th>
+ <th><?= t('Time tracking') ?></th>
+ <?php if ($editable): ?>
+ <th class="column-5"></th>
+ <th class="column-5"></th>
+ <?php endif ?>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($subtasks as $subtask): ?>
+ <tr data-subtask-id="<?= $subtask['id'] ?>">
+ <td>
+ <?php if ($editable): ?>
+ <i class="fa fa-arrows-alt draggable-row-handle" title="<?= t('Change subtask position') ?>"></i>
+ <?= $this->subtask->renderToggleStatus($task, $subtask, "table") ?>
+ <?php else: ?>
+ <?= $this->subtask->getTitle($subtask) ?>
+ <?php endif ?>
+ </td>
+ <td>
+ <?php if (! empty($subtask['username'])): ?>
+ <?= $this->text->e($subtask['name'] ?: $subtask['username']) ?>
+ <?php endif ?>
+ </td>
+ <td>
+ <ul class="no-bullet">
+ <li>
+ <?php if (! empty($subtask['time_spent'])): ?>
+ <strong><?= $this->text->e($subtask['time_spent']).'h' ?></strong> <?= t('spent') ?>
+ <?php endif ?>
+
+ <?php if (! empty($subtask['time_estimated'])): ?>
+ <strong><?= $this->text->e($subtask['time_estimated']).'h' ?></strong> <?= t('estimated') ?>
+ <?php endif ?>
+ <?php if (! empty($subtask['time_billable'])): ?>
+ <strong><?= $this->text->e($subtask['time_billable']).'h' ?></strong> <?= t('billable') ?>
+ <?php endif ?>
+
+ </li>
+ <?php if ($editable && $subtask['user_id'] == $this->user->getId()): ?>
+ <li>
+ <?php if ($subtask['is_timer_started']): ?>
+ <?= $this->modal->medium("pause",t('Stop timer'), 'TimeTrackingEditorController', 'stop',
+ array('plugin' => 'Timetrackingeditor',
+ 'project_id' => $task['project_id'],
+ 'task_id' => $subtask['task_id'],
+ 'subtask_id' => $subtask['id'])) ?>
+ (<?= $this->dt->age($subtask['timer_start_date']) ?>)
+ <?php else: ?>
+ <?= $this->modal->medium("play-circle-o",t('Start timer'), 'TimeTrackingEditorController', 'start',
+ array('plugin' => 'Timetrackingeditor',
+ 'project_id' => $task['project_id'],
+ 'task_id' => $subtask['task_id'],
+ 'subtask_id' => $subtask['id'])) ?>
+ <?php endif ?>
+ </li>
+ <?php endif ?>
+ </ul>
+ </td>
+ <?php if ($editable): ?>
+ <td>
+ <?= $this->render('subtask/menu', array(
+ 'task' => $task,
+ 'subtask' => $subtask,
+ )) ?>
+ </td>
+ <td>
+ <?= $this->modal->medium("clock-o", t('New'), 'TimeTrackingEditorController',
+ 'create', array(
+ 'plugin' => 'Timetrackingeditor',
+ 'task_id' => $task['id'],
+ 'project_id' => $task['project_id'],
+ 'subtask_id' => $subtask['id'])) ?>
+ </td>
+
+ <?php endif ?>
+ </tr>
+ <?php endforeach ?>
+ </tbody>
+ </table>
+<?php endif ?>
diff --git a/plugins/Timetrackingeditor/Template/time_tracking_editor.php b/plugins/Timetrackingeditor/Template/time_tracking_editor.php
new file mode 100644
index 00000000..2457305b
--- /dev/null
+++ b/plugins/Timetrackingeditor/Template/time_tracking_editor.php
@@ -0,0 +1,53 @@
+<div class="task-show-title color-<?= $task['color_id'] ?>">
+ <h2><?= $this->text->e($task['title']) ?></h2>
+</div>
+
+<?= $this->render('task/time_tracking_summary', array('task' => $task)) ?>
+
+<h3><?= t('Subtask timesheet') ?></h3>
+
+<?= $this->modal->medium("plus",t('Add a new timetracking entry'), 'TimeTrackingEditorController',
+ 'create', array(
+ 'plugin' => 'timetrackingeditor',
+ 'task_id' => $task['id'],
+ 'project_id' => $task['project_id'])) ?>
+
+<?php if ($subtask_paginator->isEmpty()): ?>
+ <p class="alert"><?= t('There is nothing to show.') ?></p>
+<?php else: ?>
+ <table class="table-fixed">
+ <tr>
+ <th class="column-15"><?= $subtask_paginator->order(t('User'), 'username') ?></th>
+ <th><?= $subtask_paginator->order(t('Subtask'), 'subtask_title') ?></th>
+ <th class="column-20"><?= $subtask_paginator->order(t('Start'), 'start') ?></th>
+ <th class="column-20"><?= $subtask_paginator->order(t('End'), 'end') ?></th>
+ <th class="column-10 right"><?= $subtask_paginator->order(t('Time spent'), \Kanboard\Model\SubtaskTimeTrackingModel::TABLE.'.time_spent') ?></th>
+ <th class="column-10"></th>
+ </tr>
+ <?php foreach ($subtask_paginator->getCollection() as $record): ?>
+ <tr>
+ <td><?= $this->url->link($this->text->e($record['user_fullname'] ?: $record['username']), 'UserViewController', 'show', array('user_id' => $record['user_id'])) ?>
+ <?php if ($record['is_billable']): ?>
+ <i class='fa fa-cart-plus'></i>
+ <?php endif ?>
+ <?= $this->app->tooltipMarkdown($record['comment']) ?>
+ </td>
+ <td><?= t($record['subtask_title']) ?></td>
+ <td><?= $this->dt->datetime($record['start']) ?></td>
+ <td><?= $this->dt->datetime($record['end']) ?></td>
+ <td class="right"><?= n($record['time_spent']).' '.t('hours') ?></td>
+ <td>
+ <?php if ($this->user->isCurrentUser($record['user_id'])) { ?>
+ <?= $this->render('timetrackingeditor:menu', array(
+ 'task' => $task,
+ 'subtask_id' => $record['subtask_id'],
+ 'id' => $record['id']
+ )) ?>
+ <?php } ?>
+ </td>
+ </tr>
+ <?php endforeach ?>
+ </table>
+
+ <?= $subtask_paginator ?>
+<?php endif ?>
diff --git a/plugins/Timetrackingeditor/Test/PluginTest.php b/plugins/Timetrackingeditor/Test/PluginTest.php
new file mode 100644
index 00000000..e563e9e4
--- /dev/null
+++ b/plugins/Timetrackingeditor/Test/PluginTest.php
@@ -0,0 +1,17 @@
+<?php
+require_once 'tests/units/Base.php';
+use Kanboard\Plugin\Timetable\Plugin;
+class PluginTest extends Base
+{
+ public function testPlugin()
+ {
+ $plugin = new Plugin($this->container);
+ $this->assertSame(null, $plugin->initialize());
+ $this->assertSame(null, $plugin->onStartup());
+ $this->assertNotEmpty($plugin->getPluginName());
+ $this->assertNotEmpty($plugin->getPluginDescription());
+ $this->assertNotEmpty($plugin->getPluginAuthor());
+ $this->assertNotEmpty($plugin->getPluginVersion());
+ $this->assertNotEmpty($plugin->getPluginHomepage());
+ }
+}
diff --git a/plugins/Timetrackingeditor/Test/TimetrackingeditorTest.php b/plugins/Timetrackingeditor/Test/TimetrackingeditorTest.php
new file mode 100644
index 00000000..551d9b10
--- /dev/null
+++ b/plugins/Timetrackingeditor/Test/TimetrackingeditorTest.php
@@ -0,0 +1,48 @@
+
+<?php
+
+require_once 'tests/units/BaseProcedureTest.php';
+
+use Kanboard\Core\Plugin\Loader;
+use Kanboard\
+use Kanboard\Plugin\Timetrackingeditor\SubtasktimetrackingCreationModel;
+use Kanboard\Plugin\Timetrackingeditor\SubtasktimetrackingEditModel;
+
+class TimetrackingeditorTest extends BaseProcedureTest
+{
+ protected $projectName = 'My project to test time tracking';
+ protected $project_id;
+ protected $task_id;
+ protected $subtask_id;
+
+
+ public function setUp()
+ {
+ parent::setUp();
+
+ $plugin = new Load($this->container);
+ $plugin->scan();
+ }
+
+ public function testAll()
+ {
+ $this->assertCreateTeamProject();
+
+ $this->task_id = $this->app->createTask(array('project_id' => $this->projectId, 'title' => 'Task 1'));
+ $this->subtask_id = $this->app->createSubTask(array('project_id' => $this->projectId, 'task_id' => $this->task_id, 'title' => 'Subtask 1'));
+
+ $this->assertNotFalse($this->task_id);
+ $this->assertNotFalse($this->subtask_id);
+
+ $this->testCreateEntry();
+ }
+
+ public function testCreateEntry()
+ {
+
+
+
+ }
+
+
+}
diff --git a/plugins/Timetrackingeditor/Validator/SubtaskTimeTrackingValidator.php b/plugins/Timetrackingeditor/Validator/SubtaskTimeTrackingValidator.php
new file mode 100644
index 00000000..6bddc47a
--- /dev/null
+++ b/plugins/Timetrackingeditor/Validator/SubtaskTimeTrackingValidator.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Kanboard\Plugin\Timetrackingeditor\Validator;
+
+use SimpleValidator\Validator;
+use SimpleValidator\Validators;
+use Kanboard\Validator\BaseValidator;
+
+/**
+ * SubtaskTimetracking Validator
+ *
+ * @package Kanboard\Plugin\Timetrackingeditor\Validator
+ * @author Thomas Stinner
+ */
+class SubtaskTimeTrackingValidator extends BaseValidator
+{
+ /**
+ * Validate creation
+ *
+ * @access public
+ * @param array $values Form values
+ * @return array $valid, $errors [0] = Success or not, [1] = List of errors
+ */
+ public function validateCreation(array $values)
+ {
+ $rules = array ();
+
+
+ $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+ return array(
+ $v->execute(),
+ $v->getErrors()
+ );
+ }
+
+ /**
+ * Validate modification
+ *
+ * @access public
+ * @param array $values Form values
+ * @return array $valid, $errors [0] = Success or not, [1] = List of errors
+ */
+ public function validateModification(array $values)
+ {
+ $rules = array (
+ new Validators\Required('id', t('The Timetracking id is required'))
+ );
+
+ $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+ return array(
+ $v->execute(),
+ $v->getErrors()
+ );
+ }
+
+ /**
+ * Common validation rules, valid for creation and modification
+ *
+ * @access private
+ */
+ private function commonValidationRules()
+ {
+ $rules = array(
+ new Validators\Required('task_id', t('The Task id is required')),
+ new Validators\Required('opposite_subtask_id', t('The subtask is required')),
+ new Validators\Required('start', t('The Start Date is required')),
+ new Validators\Required('time_spent', t('The Time spent is required')),
+ );
+ return $rules;
+ }
+}
diff --git a/plugins/Timetrackingeditor/assets/css/timetrackingeditor.css b/plugins/Timetrackingeditor/assets/css/timetrackingeditor.css
new file mode 100644
index 00000000..f2a9d586
--- /dev/null
+++ b/plugins/Timetrackingeditor/assets/css/timetrackingeditor.css
@@ -0,0 +1,3 @@
+.right {
+ text-align: right;
+}