From e6c4efd95f2c72252dadb3078fbc1d93e274e949 Mon Sep 17 00:00:00 2001
From: Franky Van Liedekerke <liedekef@localhost.localdomain>
Date: Thu, 2 Apr 2020 13:09:49 +0200
Subject: [PATCH 1/6] make SubtaskTimeTrackingExportCommand work and export to
 CSV, not html

---
 Console/AllSubtaskTimeTrackingExportCommand.php | 4 ++--
 Console/SubtaskTimeTrackingExportCommand.php    | 5 +++--
 Export/SubtaskTimeTrackingExport.php            | 6 ++++--
 Plugin.php                                      | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Console/AllSubtaskTimeTrackingExportCommand.php b/Console/AllSubtaskTimeTrackingExportCommand.php
index 6a56aa2..b148b34 100644
--- a/Console/AllSubtaskTimeTrackingExportCommand.php
+++ b/Console/AllSubtaskTimeTrackingExportCommand.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Plugin\Timetrackingeditor\Console;
 
-use Kanboard\Plugin\Timetrackingeditor\Html;
+use Kanboard\Core\Csv;
 use Kanboard\Model\SubtaskTimeTrackingModel;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -23,7 +23,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $data = $this->subtaskTimeTrackingExport->exportAll();
 
         if (is_array($data)) {
-            Html::output($data);
+            Csv::output($data);
         }
     }
 }
diff --git a/Console/SubtaskTimeTrackingExportCommand.php b/Console/SubtaskTimeTrackingExportCommand.php
index 4f6e638..e8d1376 100644
--- a/Console/SubtaskTimeTrackingExportCommand.php
+++ b/Console/SubtaskTimeTrackingExportCommand.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace Kanboard\Console;
+namespace Kanboard\Plugin\Timetrackingeditor\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;
+use Kanboard\Console\BaseCommand;
 
 class SubtaskTimeTrackingExportCommand extends BaseCommand
 {
@@ -29,7 +30,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         );
 
         if (is_array($data)) {
-            Html::output($data);
+            Csv::output($data);
         }
     }
 }
diff --git a/Export/SubtaskTimeTrackingExport.php b/Export/SubtaskTimeTrackingExport.php
index 30e5dbc..9634b56 100644
--- a/Export/SubtaskTimeTrackingExport.php
+++ b/Export/SubtaskTimeTrackingExport.php
@@ -41,7 +41,7 @@ public function export($project_id, $from, $to)
     public function exportAll()
     {
       $subtaskstt = $this->getAllSubtasksTimeTracking();
-      $results = array($this->getFormats());
+      $results = array();
       $results[] = $this->getColumns();
 
       foreach ($subtaskstt as $subtasktt) {
@@ -124,7 +124,8 @@ public function format(array $subtasktt)
         $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[] = str_replace(".",",",$subtasktt['time_spent']);
+        $values[] = $subtasktt['time_spent'];
         $values[] = $subtasktt['is_billable'];
         $values[] = $this->helper->text->markdown($subtasktt['comment']);
         $values[] = $subtasktt['task_id'];
@@ -175,6 +176,7 @@ public function getSubtasksTimeTracking($project_id, $from, $to)
                             ProjectModel::TABLE.'.name AS project_name',
                             TaskModel::TABLE.'.title AS task_title',
                             TaskModel::TABLE.'.color_id',
+                            TaskModel::TABLE.'.reference as reference',
                             UserModel::TABLE.'.username',
                             UserModel::TABLE.'.name AS user_fullname'
                         )
diff --git a/Plugin.php b/Plugin.php
index 6ea81f8..b244d47 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -17,6 +17,7 @@ public function initialize()
 
       $this->helper->register("subtaskPermission", "Kanboard\Plugin\Timetrackingeditor\Helper\SubtaskPermissionHelper");
 
+      $this->container["cli"]->add(new SubtaskTimeTrackingExportCommand($this->container));
       $this->container["cli"]->add(new AllSubtaskTimeTrackingExportCommand($this->container));
     }
 

From 36ebf2efb05941c711d5a5e9ade2d17fe9beda81 Mon Sep 17 00:00:00 2001
From: Franky Van Liedekerke <liedekef@localhost.localdomain>
Date: Thu, 2 Apr 2020 13:14:25 +0200
Subject: [PATCH 2/6] remove css part that interferes with latest kanboard code
 to set timespend immediately

---
 assets/css/timetrackingeditor.css | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/assets/css/timetrackingeditor.css b/assets/css/timetrackingeditor.css
index 8947a9f..f2a9d58 100644
--- a/assets/css/timetrackingeditor.css
+++ b/assets/css/timetrackingeditor.css
@@ -1,9 +1,3 @@
 .right {
   text-align: right;
 }
-
-:not(.timetracking) > #form-time_spent {
-    border-color: grey;
-    background-color: lightgrey;
-    pointer-events:none;
-}
\ No newline at end of file

From e543f8477e506449d9865b9cfbaa30b97a3c0eb2 Mon Sep 17 00:00:00 2001
From: Franky Van Liedekerke <liedekef@localhost.localdomain>
Date: Mon, 20 Apr 2020 17:11:18 +0200
Subject: [PATCH 3/6] use timer template override, so you can easily add time
 entries from within the main overview too

---
 Template/subtask/table.php | 89 --------------------------------------
 Template/subtask/timer.php | 22 ++++++++++
 2 files changed, 22 insertions(+), 89 deletions(-)
 delete mode 100644 Template/subtask/table.php
 create mode 100644 Template/subtask/timer.php

diff --git a/Template/subtask/table.php b/Template/subtask/table.php
deleted file mode 100644
index fa7f62f..0000000
--- a/Template/subtask/table.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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/Template/subtask/timer.php b/Template/subtask/timer.php
new file mode 100644
index 0000000..bc37f37
--- /dev/null
+++ b/Template/subtask/timer.php
@@ -0,0 +1,22 @@
+<span class="subtask-time-tracking">
+    <?php if (! empty($subtask['time_spent'])): ?>
+        <?= t('%sh spent', n($subtask['time_spent'])) ?>
+    <?php endif ?>
+
+    <?php if (! empty($subtask['time_spent']) && ! empty($subtask['time_estimated'])): ?>/<?php endif ?>
+
+    <?php if (! empty($subtask['time_estimated'])): ?>
+        <?= t('%sh estimated', n($subtask['time_estimated'])) ?>
+    <?php endif ?>
+
+    <?php if ($this->user->hasProjectAccess('SubtaskController', 'edit', $task['project_id']) && $subtask['user_id'] == $this->user->getId()): ?>
+        <?= $this->subtask->renderTimer($task, $subtask) ?>
+        <?= $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'])) ?>
+
+    <?php endif ?>
+</span>

From e376133abb0d7eaaebff37fdc9ef602ba3e24f4d Mon Sep 17 00:00:00 2001
From: Franky Van Liedekerke <liedekef@localhost.localdomain>
Date: Thu, 21 May 2020 10:10:23 +0200
Subject: [PATCH 4/6] add missing use of SubtaskTimeTrackingExportCommand

---
 Plugin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Plugin.php b/Plugin.php
index b244d47..9a2f71d 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -5,6 +5,7 @@
 use Kanboard\Core\Translator;
 use Kanboard\Core\Plugin\Base;
 use Kanboard\Plugin\Timetrackingeditor\Model\SubtaskTimeTrackingModel;
+use Kanboard\Plugin\Timetrackingeditor\Console\SubtaskTimeTrackingExportCommand;
 use Kanboard\Plugin\Timetrackingeditor\Console\AllSubtaskTimeTrackingExportCommand;
 
 class Plugin extends Base
@@ -13,7 +14,7 @@ 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->template->setTemplateOverride('subtask/timer', 'timetrackingeditor:subtask/timer');
 
       $this->helper->register("subtaskPermission", "Kanboard\Plugin\Timetrackingeditor\Helper\SubtaskPermissionHelper");
 

From 5c32709c3659cb6e008f9f20359176ccf4322d5c Mon Sep 17 00:00:00 2001
From: Franky Van Liedekerke <liedekef@localhost.localdomain>
Date: Mon, 25 May 2020 15:55:47 +0200
Subject: [PATCH 5/6] export to datetime

---
 Export/SubtaskTimeTrackingExport.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Export/SubtaskTimeTrackingExport.php b/Export/SubtaskTimeTrackingExport.php
index 9634b56..fffbca0 100644
--- a/Export/SubtaskTimeTrackingExport.php
+++ b/Export/SubtaskTimeTrackingExport.php
@@ -122,8 +122,8 @@ public function format(array $subtasktt)
         $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[] = $this->helper->dt->datetime($subtasktt['start']);
+        $values[] = $this->helper->dt->datetime($subtasktt['end']);
         #$values[] = str_replace(".",",",$subtasktt['time_spent']);
         $values[] = $subtasktt['time_spent'];
         $values[] = $subtasktt['is_billable'];

From 91b819748be2c8ec638b7eb6420b88443577fd6b Mon Sep 17 00:00:00 2001
From: Franky Van Liedekerke <liedekef@localhost.localdomain>
Date: Mon, 25 May 2020 15:56:01 +0200
Subject: [PATCH 6/6] add SubtaskTimeTrackingExportCommand to getClasses

---
 Plugin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Plugin.php b/Plugin.php
index 9a2f71d..f94682e 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -44,6 +44,7 @@ public function getClasses()
           'SubtaskTitleFilter'
         ),
         'Plugin\Timetrackingeditor\Console' => array(
+          'SubtaskTimeTrackingExportCommand',
           'AllSubtaskTimeTrackingExportCommand'
         ),
         'Plugin\Timetrackingeditor\Controller' => array(