From 49a0dcabf27fbc9ca43fd1622dea4c78838b3962 Mon Sep 17 00:00:00 2001
From: Aina Sitraka <35221835+aynsix@users.noreply.github.com>
Date: Fri, 21 Oct 2022 19:14:13 +0300
Subject: [PATCH] duration even if not finished (#4157)

---
 .../Phrasea/Model/Repositories/WorkerRunningJobRepository.php | 3 ++-
 templates/web/admin/worker-manager/worker_info.html.twig      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php
index 4c7f9d711a..da456ffaa6 100644
--- a/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php
+++ b/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php
@@ -393,7 +393,8 @@ class WorkerRunningJobRepository extends EntityRepository
         $rsm->addScalarResult('duration', 'duration');
         $rsm->addScalarResult('status', 'status');
 
-        $sql = "SELECT info, databox_id as databoxId, record_id as recordId, work, work_on as workOn, published, created, finished, status, TIMESTAMPDIFF(SECOND, w.created, w.finished) as duration \n"
+        $sql = "SELECT info, databox_id as databoxId, record_id as recordId, work, work_on as workOn, published, created, finished, status, \n"
+            . "IF(w.finished IS NULL, TIMESTAMPDIFF(SECOND, w.created, NOW()), TIMESTAMPDIFF(SECOND, w.created, w.finished))  as duration \n"
             . "FROM WorkerRunningJob w \n"
             . "WHERE 1";
 
diff --git a/templates/web/admin/worker-manager/worker_info.html.twig b/templates/web/admin/worker-manager/worker_info.html.twig
index 6cdf03a26a..7fc32acd86 100644
--- a/templates/web/admin/worker-manager/worker_info.html.twig
+++ b/templates/web/admin/worker-manager/worker_info.html.twig
@@ -134,9 +134,9 @@
             {% endif %}
         </td>
         <td>
-            {% if workerRow.duration is not empty %}
+            <span {% if workerRow.finished is empty%} style="color:#ff8100;" {% endif %}>
                 {{ workerRow.duration|date_duration }}
-            {% endif %}
+            </span>
         </td>
         <td>{{ workerRow.status }}</td>
         <td>