hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

duration even if not finished (#4157)

Browse Source
This commit is contained in:
Aina Sitraka
2022-10-21 19:14:13 +03:00
committed by GitHub
parent 42f44717c6
commit 49a0dcabf2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php
View File

@@ -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";

4
templates/web/admin/worker-manager/worker_info.html.twig
View File

@@ -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>