diff --git a/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php index 3f2c778fb7..c862b252dd 100644 --- a/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php +++ b/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php @@ -379,39 +379,71 @@ class WorkerRunningJobRepository extends EntityRepository return count($qb->getQuery()->getResult()); } - public function findByFilter(array $status, $jobType, $databoxId, $recordId, $start = 0, $limit = WorkerRunningJob::MAX_RESULT) + public function findByFilter(array $status, $jobType, $databoxId, $recordId, $dateTimeFilter = null, $start = 0, $limit = WorkerRunningJob::MAX_RESULT) { - $qb = $this->createQueryBuilder('w'); + $rsm = new ResultSetMappingBuilder($this->_em); + $rsm->addScalarResult('info', 'info'); + $rsm->addScalarResult('databoxId', 'databoxId'); + $rsm->addScalarResult('recordId', 'recordId'); + $rsm->addScalarResult('work', 'work'); + $rsm->addScalarResult('workOn', 'workOn'); + $rsm->addScalarResult('published', 'published'); + $rsm->addScalarResult('created', 'created'); + $rsm->addScalarResult('finished', 'finished'); + $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" + . "FROM WorkerRunningJob w \n" + . "WHERE 1"; + + $params = []; + $statusParam = false; if (!empty($status)) { - $qb->where($qb->expr()->in('w.status', $status)); + $sql .= " AND w.status IN (:status)"; + $statusParam = true; } if (!empty($jobType)) { - $qb->andWhere('w.work = :work') - ->setParameter('work', $jobType); + $sql .= " AND w.work = :work"; + $params['work'] = $jobType; } if (!empty($databoxId)) { - $qb->andWhere('w.databoxId = :databoxId') - ->setParameter('databoxId', $databoxId); + $sql .= " AND w.databoxId = :databoxId"; + $params['databoxId'] = $databoxId; } if (!empty($recordId)) { - $qb->andWhere('w.recordId = :recordId') - ->setParameter('recordId', $recordId); + $sql .= " AND w.recordId = :recordId"; + $params['recordId'] = $recordId; } + if ($dateTimeFilter instanceof DateTime) { + // on published because the row is only created whe the job is started + $sql .= " AND w.published >= :dateTimeFilter"; + $params['dateTimeFilter'] = $dateTimeFilter->format('Y-m-d H:i:s'); + } + + $sql .= " ORDER BY w.id DESC"; + if ($limit !== null) { - $qb->setMaxResults($limit); + $sql .= " LIMIT " . $limit; } - $qb - ->setFirstResult($start) - ->orderBy('w.id', 'DESC') - ; + $sql .= " OFFSET " . $start; - return $qb->getQuery()->getResult(); + $q = $this->_em->createNativeQuery($sql, $rsm); + + if (!empty($params)) { + $q->setParameters($params); + } + + if ($statusParam) { + $q->setParameter('status', $status, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY); + } + + return $q->getResult(); } public function getJobCount(array $status, $jobType, $databoxId, $recordId) diff --git a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php index fdf158d1ff..a76cd7555f 100644 --- a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php +++ b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php @@ -24,6 +24,7 @@ class PhraseanetExtension extends \Twig_Extension { return array( new \Twig_SimpleFilter('sort_collections', array(CollectionHelper::class, 'sort')), + new \Twig_SimpleFilter('date_duration', array($this, 'getDuration')), ); } @@ -64,6 +65,12 @@ class PhraseanetExtension extends \Twig_Extension } + public function getDuration(int $interval) + { + $t = round($interval); + return sprintf('%02d h %02d m %02d s', ($t/3600),($t/60 %60), $t%60); + } + /** * get localized field's label * @param RecordInterface $record diff --git a/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php b/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php index d6225a0972..bf16a8638e 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php @@ -7,6 +7,7 @@ use Alchemy\Phrasea\Controller\Controller; use Alchemy\Phrasea\Model\Entities\WorkerRunningJob; use Alchemy\Phrasea\Model\Repositories\WorkerRunningJobRepository; use Alchemy\Phrasea\SearchEngine\Elastic\ElasticsearchOptions; +use Alchemy\Phrasea\Twig\PhraseanetExtension; use Alchemy\Phrasea\WorkerManager\Event\PopulateIndexEvent; use Alchemy\Phrasea\WorkerManager\Event\WorkerEvents; use Alchemy\Phrasea\WorkerManager\Form\WorkerConfigurationType; @@ -108,6 +109,15 @@ class AdminConfigurationController extends Controller $jobType = $request->query->get('jobType'); $databoxId = empty($request->query->get('databoxId')) ? null : $request->query->get('databoxId'); $recordId = empty($request->query->get('recordId')) ? null : $request->query->get('recordId'); + $timeFilter = empty($request->query->get('timeFilter')) ? null : $request->query->get('timeFilter'); + + $dateTimeFilter = null; + if ($timeFilter != null) { + try { + $dateTimeFilter = (new \DateTime())->sub(new \DateInterval($timeFilter)); + } catch (\Exception $e) { + } + } $filterStatus = []; @@ -124,10 +134,18 @@ class AdminConfigurationController extends Controller $filterStatus[] = WorkerRunningJob::INTERRUPT; } - $workerRunningJob = $repoWorker->findByFilter($filterStatus, $jobType, $databoxId, $recordId); + $helpers = new PhraseanetExtension($this->app); + + $workerRunningJob = $repoWorker->findByFilter($filterStatus, $jobType, $databoxId, $recordId, $dateTimeFilter); $workerRunningJobTotalCount = $repoWorker->getJobCount($filterStatus, $jobType, $databoxId, $recordId); + $workerRunningJobTotalCount = number_format($workerRunningJobTotalCount, 0, '.', ' '); + $totalDuration = array_sum(array_column($workerRunningJob, 'duration')); + // format duration + $totalDuration = $helpers->getDuration($totalDuration); + // get all row count in the table WorkerRunningJob $totalCount = $repoWorker->getJobCount([], null, null , null); + $totalCount = number_format($totalCount, 0, '.', ' '); $databoxIds = array_map(function (\databox $databox) { return $databox->get_sbas_id(); @@ -149,9 +167,10 @@ class AdminConfigurationController extends Controller 'jobTypes' => $jobTypes, 'databoxIds' => $databoxIds, ]), - 'resultCount' => count($workerRunningJob), + 'resultCount' => number_format(count($workerRunningJob), 0, '.', ' '), 'resultTotal' => $workerRunningJobTotalCount, - 'totalCount' => $totalCount + 'totalCount' => $totalCount, + 'totalDuration' => $totalDuration ]); } else { return $this->render('admin/worker-manager/worker_info.html.twig', [ @@ -159,9 +178,10 @@ class AdminConfigurationController extends Controller 'reload' => $reload, 'jobTypes' => $jobTypes, 'databoxIds' => $databoxIds, - 'resultCount' => count($workerRunningJob), + 'resultCount' => number_format(count($workerRunningJob), 0, '.', ' '), 'resultTotal' => $workerRunningJobTotalCount, - 'totalCount' => $totalCount + 'totalCount' => $totalCount, + 'totalDuration' => $totalDuration ]); } } diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 6e71438e6f..9455d6d575 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.de.xlf @@ -1,14 +1,14 @@ - + - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -195,7 +195,7 @@ Bridge/Dailymotion/element_informations.html.twig - %number% documents<br/>selectionnes + selectionnes]]> ausgewählt]]> Controller/Prod/QueryController.php @@ -1175,12 +1175,12 @@ Are you sure you want to erase all job informations ? Das Löschen der Jobinformationen bestätigen? - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig Are you sure you want to erase finished job informations ? Das Löschen der abgeschlossene Jobs bestätigen? - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig Are you sure you want to rebuild the sub-definitions of selected records? @@ -1685,7 +1685,7 @@ Certaines donnees du reportage ont change Einige Daten von dem Bericht wurden verändert - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig Certaines publications n'ont pu etre effectuees, verifiez vos parametres @@ -2493,7 +2493,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Anzeige und Handlung-Einstellungen admin/fields/templates.html.twig @@ -3181,7 +3181,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Basket.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig Feedback request by %user_name% until %vote_expires% @@ -7937,7 +7937,7 @@ Verschieben web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : editer @@ -7945,7 +7945,7 @@ prod/preview/caption.html.twig web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : exporter @@ -7961,14 +7961,14 @@ prod/results/record.html.twig prod/results/record.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : outils Werkzeuge web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : print @@ -7979,7 +7979,7 @@ prod/results/record.html.twig prod/results/record.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : publier @@ -7987,21 +7987,21 @@ web/prod/index.html.twig web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : push Push web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : status Eigenschaften web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : supprimer @@ -9503,22 +9503,22 @@ admin::workermanager:tab:workerinfo: Display error work Arbeiten Fehler - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display finished work Abgeschlossene Arbeiten - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display manually interrupt work Arbeiten Unterbrechen - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display running work Laufende Arbeiten - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Erase all finished @@ -9533,7 +9533,7 @@ admin::workermanager:tab:workerinfo: Manually interrupt Unterbrechen - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Refresh list @@ -9558,12 +9558,12 @@ admin::workermanager:tab:workerinfo: created Begonnen - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: databox_name Databox - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: description @@ -9573,12 +9573,12 @@ admin::workermanager:tab:workerinfo: duration Dauer - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: finished Beendet - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: manually mark as canceled job running @@ -9588,12 +9588,12 @@ admin::workermanager:tab:workerinfo: published Erstellt - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: record_id Record ID - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: refresh job count @@ -9608,7 +9608,7 @@ admin::workermanager:tab:workerinfo: status Status - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: title @@ -9618,12 +9618,12 @@ admin::workermanager:tab:workerinfo: work Auftrag - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: work_on Auftrag auf - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin:databases:database:file-size-detail-warning-message @@ -9874,6 +9874,11 @@ actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig + + all + all + admin/worker-manager/worker_info.html.twig + all caches services have been flushed Alle Cache Dienste wurden gespüllt @@ -9907,7 +9912,7 @@ audio Audio - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -9956,13 +9961,13 @@ basket:action:delete record form basket Datensatz vom Sammelkorb entfernen prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig basket:action:delete record form database Datensatz von Datenbank vonlöschen prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig basket:feedback Delete item @@ -10680,7 +10685,7 @@ document Dokument - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11012,7 +11017,7 @@ flash Flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11157,7 +11162,7 @@ image Bild - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11229,7 +11234,17 @@ job::tab results Job(s) - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig + + + job::tab time filter since + job::tab time filter since + admin/worker-manager/worker_info.html.twig + + + job::tab total duration + job::tab total duration + admin/worker-manager/worker_info.html.twig job::tab total entry in DB @@ -12155,7 +12170,7 @@ Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Ihr Benutzerkonto kann nur durch die Administration Anwendung gelöscht werden. web/account/account.html.twig @@ -13370,7 +13385,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben prod::workzone:Actions Aktionen prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig prod::workzone:Basket is WIP @@ -14105,7 +14120,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben prod/results/feeds.html.twig prod/WorkZone/Basket.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig recordtype @@ -14688,8 +14703,8 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben reportage Bericht - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php rotation 90 degres anti-horaires @@ -15194,7 +15209,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 6d3e64354b..3aead7c6b5 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.en.xlf @@ -1,14 +1,14 @@ - + - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -195,7 +195,7 @@ Bridge/Dailymotion/element_informations.html.twig
- %number% documents<br/>selectionnes + selectionnes]]> selected]]> Controller/Prod/QueryController.php @@ -1176,12 +1176,12 @@ Are you sure you want to erase all job informations ? Confirm jobs informations deletion? - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig Are you sure you want to erase finished job informations ? Confirm deletion of finished jobs? - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig Are you sure you want to rebuild the sub-definitions of selected records? @@ -1686,7 +1686,7 @@ Certaines donnees du reportage ont change The story content has been updated - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig Certaines publications n'ont pu etre effectuees, verifiez vos parametres @@ -2496,7 +2496,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Display and action settings admin/fields/templates.html.twig @@ -3184,7 +3184,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Basket.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig Feedback request by %user_name% until %vote_expires% @@ -7940,7 +7940,7 @@ Move web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : editer @@ -7948,7 +7948,7 @@ prod/preview/caption.html.twig web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : exporter @@ -7964,14 +7964,14 @@ prod/results/record.html.twig prod/results/record.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : outils Tools web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : print @@ -7982,7 +7982,7 @@ prod/results/record.html.twig prod/results/record.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : publier @@ -7990,21 +7990,21 @@ web/prod/index.html.twig web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : push Push web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : status Properties web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : supprimer @@ -9506,22 +9506,22 @@ admin::workermanager:tab:workerinfo: Display error work Job in error - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display finished work Display Finished Job(s) - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display manually interrupt work interrupted job - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display running work Running Job(s) - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Erase all finished @@ -9536,7 +9536,7 @@ admin::workermanager:tab:workerinfo: Manually interrupt Manually Acknowledge - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Refresh list @@ -9561,12 +9561,12 @@ admin::workermanager:tab:workerinfo: created Started - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: databox_name Databox - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: description @@ -9576,12 +9576,12 @@ admin::workermanager:tab:workerinfo: duration Duration - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: finished Finished - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: manually mark as canceled job running @@ -9591,12 +9591,12 @@ admin::workermanager:tab:workerinfo: published Created - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: record_id Record ID - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: refresh job count @@ -9611,7 +9611,7 @@ admin::workermanager:tab:workerinfo: status Status - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: title @@ -9621,12 +9621,12 @@ admin::workermanager:tab:workerinfo: work Job - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: work_on Work On - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin:databases:database:file-size-detail-warning-message @@ -9877,6 +9877,11 @@ actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig + + all + all + admin/worker-manager/worker_info.html.twig + all caches services have been flushed All caches services have been flushed @@ -9910,7 +9915,7 @@ audio audio - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -9959,13 +9964,13 @@ basket:action:delete record form basket Delete record from basket prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig basket:action:delete record form database Delete record from database prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig basket:feedback Delete item @@ -10683,7 +10688,7 @@ document document - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11015,7 +11020,7 @@ flash flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11160,7 +11165,7 @@ image Image - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11232,7 +11237,17 @@ job::tab results Job(s) - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig + + + job::tab time filter since + job::tab time filter since + admin/worker-manager/worker_info.html.twig + + + job::tab total duration + job::tab total duration + admin/worker-manager/worker_info.html.twig job::tab total entry in DB @@ -12158,7 +12173,7 @@ Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Your rights do not allow to perform this action. Your account can only be deleted via the Administration interface. web/account/account.html.twig @@ -13377,7 +13392,7 @@ A ” Push” will never expire. prod::workzone:Actions Actions prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig prod::workzone:Basket is WIP @@ -14115,7 +14130,7 @@ It is possible to place several search areas prod/results/feeds.html.twig prod/WorkZone/Basket.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig recordtype @@ -14698,8 +14713,8 @@ It is possible to place several search areas reportage Feature - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php rotation 90 degres anti-horaires @@ -15204,7 +15219,7 @@ It is possible to place several search areas web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index 6390fdbbdf..13a0167b40 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.fr.xlf @@ -1,14 +1,14 @@ - + - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.
- - + + Form/Configuration/EmailFormType.php Form/Login/PhraseaAuthenticationForm.php @@ -195,7 +195,7 @@ Bridge/Dailymotion/element_informations.html.twig
- %number% documents<br/>selectionnes + selectionnes]]> sélectionnés]]> Controller/Prod/QueryController.php @@ -1175,12 +1175,12 @@ Are you sure you want to erase all job informations ? Confirmer l'effacement des informations des travaux? - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig Are you sure you want to erase finished job informations ? Confirmer l'effacement des travaux terminés? - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig Are you sure you want to rebuild the sub-definitions of selected records? @@ -1685,7 +1685,7 @@ Certaines donnees du reportage ont change Certaines données du reportage ont changé - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig Certaines publications n'ont pu etre effectuees, verifiez vos parametres @@ -2493,7 +2493,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Paramétrage d'affichage et d'action admin/fields/templates.html.twig @@ -3181,7 +3181,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Basket.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig Feedback request by %user_name% until %vote_expires% @@ -7937,7 +7937,7 @@ Déplacer web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : editer @@ -7945,7 +7945,7 @@ prod/preview/caption.html.twig web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : exporter @@ -7961,14 +7961,14 @@ prod/results/record.html.twig prod/results/record.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : outils Outils web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : print @@ -7979,7 +7979,7 @@ prod/results/record.html.twig prod/results/record.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : publier @@ -7987,21 +7987,21 @@ web/prod/index.html.twig web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : push Push web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : status Propriétés web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : supprimer @@ -9504,22 +9504,22 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: Display error work Travaux en erreur - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display finished work Travaux terminés - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display manually interrupt work Travaux interrompus - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display running work Travaux en cours - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Erase all finished @@ -9534,7 +9534,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: Manually interrupt Interrompre - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Refresh list @@ -9559,12 +9559,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: created Démarré - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: databox_name Databox - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: description @@ -9574,12 +9574,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: duration Durée - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: finished Terminé - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: manually mark as canceled job running @@ -9589,12 +9589,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: published Créé - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: record_id Record ID - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: refresh job count @@ -9609,7 +9609,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: status Etat - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: title @@ -9619,12 +9619,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin::workermanager:tab:workerinfo: work Travaux - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: work_on Objet - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin:databases:database:file-size-detail-warning-message @@ -9875,6 +9875,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig + + all + all + admin/worker-manager/worker_info.html.twig + all caches services have been flushed Tous les services de caches ont été purgés @@ -9908,7 +9913,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le audio audios - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -9957,13 +9962,13 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le basket:action:delete record form basket Retirer du panier prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig basket:action:delete record form database Supprimer l'enregistrement de la base prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig basket:feedback Delete item @@ -10681,7 +10686,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le document documents - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11013,7 +11018,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le flash Flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11158,7 +11163,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le image images - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11230,7 +11235,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le job::tab results Job(s) - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig + + + job::tab time filter since + job::tab time filter since + admin/worker-manager/worker_info.html.twig + + + job::tab total duration + job::tab total duration + admin/worker-manager/worker_info.html.twig job::tab total entry in DB @@ -12156,7 +12171,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Root/AccountController.php - phraseanet::account: << your account can be deleted via admin interface >> + >]]> Vos droits ne vous permettent pas de réaliser cette action, votre compte ne peut être supprimé que via l'interface d'Administration. web/account/account.html.twig @@ -13373,7 +13388,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles prod::workzone:Actions Actions prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig prod::workzone:Basket is WIP @@ -14114,7 +14129,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles prod/results/feeds.html.twig prod/WorkZone/Basket.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig recordtype @@ -14697,8 +14712,8 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles reportage Reportage - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php rotation 90 degres anti-horaires @@ -15203,7 +15218,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles web/thesaurus/thesaurus.html.twig - thesaurus:: Supprimer cette branche ?&#10;(les termes concernes remonteront en candidats a la prochaine indexation) + web/thesaurus/thesaurus.html.twig diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index 3834c0517e..d9a7904613 100644 --- a/resources/locales/messages.nl.xlf +++ b/resources/locales/messages.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. @@ -1176,12 +1176,12 @@ Are you sure you want to erase all job informations ? Are you sure you want to erase all job informations ? - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig Are you sure you want to erase finished job informations ? Are you sure you want to erase finished job informations ? - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig Are you sure you want to rebuild the sub-definitions of selected records? @@ -1686,7 +1686,7 @@ Certaines donnees du reportage ont change Sommige gegevens van de reportage zijn veranderd - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig Certaines publications n'ont pu etre effectuees, verifiez vos parametres @@ -3187,7 +3187,7 @@ Controller/Prod/LanguageController.php prod/WorkZone/Basket.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig Feedback request by %user_name% until %vote_expires% @@ -7943,7 +7943,7 @@ Collectie web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : editer @@ -7951,7 +7951,7 @@ prod/preview/caption.html.twig web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : exporter @@ -7967,14 +7967,14 @@ prod/results/record.html.twig prod/results/record.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : outils Gereedschappen web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : print @@ -7985,7 +7985,7 @@ prod/results/record.html.twig prod/results/record.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : publier @@ -7993,21 +7993,21 @@ web/prod/index.html.twig web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : push Push web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : status Status web/prod/toolbar.html.twig prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig action : supprimer @@ -9509,22 +9509,22 @@ admin::workermanager:tab:workerinfo: Display error work admin::workermanager:tab:workerinfo: Display error work - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display finished work admin::workermanager:tab:workerinfo: Display finished work - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display manually interrupt work admin::workermanager:tab:workerinfo: Display manually interrupt work - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Display running work admin::workermanager:tab:workerinfo: Display running work - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Erase all finished @@ -9539,7 +9539,7 @@ admin::workermanager:tab:workerinfo: Manually interrupt admin::workermanager:tab:workerinfo: Manually interrupt - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: Refresh list @@ -9564,12 +9564,12 @@ admin::workermanager:tab:workerinfo: created admin::workermanager:tab:workerinfo: created - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: databox_name admin::workermanager:tab:workerinfo: databox_name - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: description @@ -9579,12 +9579,12 @@ admin::workermanager:tab:workerinfo: duration admin::workermanager:tab:workerinfo: duration - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: finished admin::workermanager:tab:workerinfo: finished - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: manually mark as canceled job running @@ -9594,12 +9594,12 @@ admin::workermanager:tab:workerinfo: published admin::workermanager:tab:workerinfo: published - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: record_id admin::workermanager:tab:workerinfo: record_id - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: refresh job count @@ -9614,7 +9614,7 @@ admin::workermanager:tab:workerinfo: status admin::workermanager:tab:workerinfo: status - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: title @@ -9624,12 +9624,12 @@ admin::workermanager:tab:workerinfo: work admin::workermanager:tab:workerinfo: work - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin::workermanager:tab:workerinfo: work_on admin::workermanager:tab:workerinfo: work_on - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig admin:databases:database:file-size-detail-warning-message @@ -9880,6 +9880,11 @@ actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig + + all + all + admin/worker-manager/worker_info.html.twig + all caches services have been flushed Alle caches services zijn geflushed @@ -9913,7 +9918,7 @@ audio Audio - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -9962,13 +9967,13 @@ basket:action:delete record form basket basket:action:delete record form basket prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig basket:action:delete record form database basket:action:delete record form database prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig basket:feedback Delete item @@ -10686,7 +10691,7 @@ document document - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11018,7 +11023,7 @@ flash flash - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11163,7 +11168,7 @@ image Beeld - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php web/admin/subdefs.html.twig task-manager/task-editor/subdefs.html.twig @@ -11235,7 +11240,17 @@ job::tab results job::tab results - admin/worker-manager/worker_info.html.twig + admin/worker-manager/worker_info.html.twig + + + job::tab time filter since + job::tab time filter since + admin/worker-manager/worker_info.html.twig + + + job::tab total duration + job::tab total duration + admin/worker-manager/worker_info.html.twig job::tab total entry in DB @@ -13375,7 +13390,7 @@ prod::workzone:Actions prod::workzone:Actions prod/WorkZone/Basket.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig prod::workzone:Basket is WIP @@ -14110,7 +14125,7 @@ prod/results/feeds.html.twig prod/WorkZone/Basket.html.twig prod/WorkZone/Macros.html.twig - prod/WorkZone/Story.html.twig + prod/WorkZone/Story.html.twig recordtype @@ -14693,8 +14708,8 @@ reportage Reportage - Phrasea/Twig/PhraseanetExtension.php - Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php + Phrasea/Twig/PhraseanetExtension.php rotation 90 degres anti-horaires diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index dde28ab2dd..ead2b5b571 100644 --- a/resources/locales/validators.de.xlf +++ b/resources/locales/validators.de.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.en.xlf b/resources/locales/validators.en.xlf index 89e8e4a095..a8e885efb4 100644 --- a/resources/locales/validators.en.xlf +++ b/resources/locales/validators.en.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.fr.xlf b/resources/locales/validators.fr.xlf index dc31889953..a868882414 100644 --- a/resources/locales/validators.fr.xlf +++ b/resources/locales/validators.fr.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/locales/validators.nl.xlf b/resources/locales/validators.nl.xlf index cfb306171b..f602f430e9 100644 --- a/resources/locales/validators.nl.xlf +++ b/resources/locales/validators.nl.xlf @@ -1,6 +1,6 @@ - +
The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index 5358de3eff..b41623b2d5 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -1010,6 +1010,23 @@ span.simplecolorpicker.picker { min-width: 161px; margin-right: 15px; } + .time-filter { + margin-right: 20px; + padding: 5px 10px; + background-color: #ebebeb; + a { + padding: 5px 3px; + text-decoration: none; + color: #08c; + &:hover { + color: #2125d3; + } + &.active { + background-color: #08c; + color: white; + } + } + } } /**Phraseanet service setting**/ diff --git a/templates/web/admin/worker-manager/worker_info.html.twig b/templates/web/admin/worker-manager/worker_info.html.twig index f2b81ab841..6cdf03a26a 100644 --- a/templates/web/admin/worker-manager/worker_info.html.twig +++ b/templates/web/admin/worker-manager/worker_info.html.twig @@ -51,6 +51,22 @@ + + +
@@ -70,6 +86,10 @@ {{ resultCount }} / {{ resultTotal }} {{ "job::tab results" | trans }} + + {{ totalDuration }} {{ "job::tab total duration" | trans }} + +
@@ -114,12 +134,8 @@ {% endif %} - {% set duration = workerRow.finished.diff(workerRow.created) %} - - {% if duration.days %} - {{ duration.format("%d days %H:%I:%S") }} - {% else %} - {{ duration.format("%H:%I:%S") }} + {% if workerRow.duration is not empty %} + {{ workerRow.duration|date_duration }} {% endif %} {{ workerRow.status }} @@ -144,6 +160,7 @@ var jobType = $("#job-type-filter").val(); var databoxId = $("#databox-filter").val(); var recordId = $("#record-filter").val(); + var timeFilter = $(".time-filter a.active").attr("data-value"); if (!$(".running-work").is(":checked")) { @@ -168,12 +185,14 @@ data: { jobType: jobType, databoxId : databoxId, - recordId : recordId + recordId : recordId, + timeFilter: timeFilter }, success: function (data) { $(".work-list").empty().html(data.content); $(".result-count").empty().text(data.resultCount + ' / ' + data.resultTotal); $(".total-count").empty().text(data.totalCount); + $(".total-duration").empty().text(data.totalDuration); } }); } @@ -198,6 +217,12 @@ refreshJobList(); }); + $(".time-filter a").on('click', function () { + $(".time-filter a").removeClass('active'); + $(this).addClass('active'); + refreshJobList (); + }); + $(".admintable").on('click', '.change-status-interrupt', function () { var workerId = $(this).attr('data-id');