From 2d71cffe46716a6d4cc1dfafd662d8c89822c1ea Mon Sep 17 00:00:00 2001 From: Aina Sitraka <35221835+aynsix@users.noreply.github.com> Date: Fri, 16 Sep 2022 11:18:07 +0300 Subject: [PATCH] PHRAS-3738 Admin - worker - job tab - add filter on databox_id (name),record_id (#4132) * add databox and record id filter * add entry count * generate translation * fix retrieve count in DB * change string position --- .../WorkerRunningJobRepository.php | 45 ++++- .../AdminConfigurationController.php | 40 ++++- resources/locales/messages.de.xlf | 159 +++++++++-------- resources/locales/messages.en.xlf | 161 ++++++++++-------- resources/locales/messages.fr.xlf | 159 +++++++++-------- resources/locales/messages.nl.xlf | 145 +++++++++------- resources/locales/validators.de.xlf | 2 +- resources/locales/validators.en.xlf | 2 +- resources/locales/validators.fr.xlf | 2 +- resources/locales/validators.nl.xlf | 2 +- .../worker-manager/worker_info.html.twig | 39 ++++- 11 files changed, 458 insertions(+), 298 deletions(-) diff --git a/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php b/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php index 1fbccf86da..3f2c778fb7 100644 --- a/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php +++ b/lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php @@ -379,7 +379,7 @@ class WorkerRunningJobRepository extends EntityRepository return count($qb->getQuery()->getResult()); } - public function findByStatusAndJob(array $status, $jobType, $start = 0, $limit = WorkerRunningJob::MAX_RESULT) + public function findByFilter(array $status, $jobType, $databoxId, $recordId, $start = 0, $limit = WorkerRunningJob::MAX_RESULT) { $qb = $this->createQueryBuilder('w'); @@ -392,15 +392,56 @@ class WorkerRunningJobRepository extends EntityRepository ->setParameter('work', $jobType); } + if (!empty($databoxId)) { + $qb->andWhere('w.databoxId = :databoxId') + ->setParameter('databoxId', $databoxId); + } + + if (!empty($recordId)) { + $qb->andWhere('w.recordId = :recordId') + ->setParameter('recordId', $recordId); + } + + if ($limit !== null) { + $qb->setMaxResults($limit); + } + $qb ->setFirstResult($start) - ->setMaxResults($limit) ->orderBy('w.id', 'DESC') ; return $qb->getQuery()->getResult(); } + public function getJobCount(array $status, $jobType, $databoxId, $recordId) + { + $qb = $this->createQueryBuilder('w'); + $qb->select('count(w)'); + + if (!empty($status)) { + $qb->where($qb->expr()->in('w.status', $status)); + } + + if (!empty($jobType)) { + $qb->andWhere('w.work = :work') + ->setParameter('work', $jobType); + } + + if (!empty($databoxId)) { + $qb->andWhere('w.databoxId = :databoxId') + ->setParameter('databoxId', $databoxId); + } + + if (!empty($recordId)) { + $qb->andWhere('w.recordId = :recordId') + ->setParameter('recordId', $recordId); + } + + return $qb->getQuery()->getSingleScalarResult(); + + } + public function updateStatusRunningToCanceledSinceCreated($hour = 0) { $sql = ' diff --git a/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php b/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php index 57a7ab6972..d6225a0972 100644 --- a/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php +++ b/lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php @@ -106,6 +106,8 @@ class AdminConfigurationController extends Controller $reload = ($request->query->get('reload') == 1); $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'); $filterStatus = []; @@ -122,7 +124,16 @@ class AdminConfigurationController extends Controller $filterStatus[] = WorkerRunningJob::INTERRUPT; } - $workerRunningJob = $repoWorker->findByStatusAndJob($filterStatus, $jobType); + $workerRunningJob = $repoWorker->findByFilter($filterStatus, $jobType, $databoxId, $recordId); + $workerRunningJobTotalCount = $repoWorker->getJobCount($filterStatus, $jobType, $databoxId, $recordId); + // get all row count in the table WorkerRunningJob + $totalCount = $repoWorker->getJobCount([], null, null , null); + + $databoxIds = array_map(function (\databox $databox) { + return $databox->get_sbas_id(); + }, + $this->app->getApplicationBox()->get_databoxes() + ); $types = AMQPConnection::MESSAGES; @@ -131,11 +142,28 @@ class AdminConfigurationController extends Controller $jobTypes = array_keys($types); - return $this->render('admin/worker-manager/worker_info.html.twig', [ - 'workerRunningJob' => $workerRunningJob, - 'reload' => $reload, - 'jobTypes' => $jobTypes - ]); + if ($reload) { + return $this->app->json(['content' => $this->render('admin/worker-manager/worker_info.html.twig', [ + 'workerRunningJob' => $workerRunningJob, + 'reload' => $reload, + 'jobTypes' => $jobTypes, + 'databoxIds' => $databoxIds, + ]), + 'resultCount' => count($workerRunningJob), + 'resultTotal' => $workerRunningJobTotalCount, + 'totalCount' => $totalCount + ]); + } else { + return $this->render('admin/worker-manager/worker_info.html.twig', [ + 'workerRunningJob' => $workerRunningJob, + 'reload' => $reload, + 'jobTypes' => $jobTypes, + 'databoxIds' => $databoxIds, + 'resultCount' => count($workerRunningJob), + 'resultTotal' => $workerRunningJobTotalCount, + 'totalCount' => $totalCount + ]); + } } /** diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 2b2e96af25..37574dd3a4 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 @@ -962,15 +962,15 @@ Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -1033,7 +1033,7 @@ Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php web/admin/statusbit.html.twig @@ -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? @@ -1410,7 +1410,7 @@ Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Bad request, please contact an admin @@ -1564,7 +1564,7 @@ Abbrechen Controller/Prod/LanguageController.php prod/User/Add.html.twig - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig actions/Property/type.html.twig actions/Property/index.html.twig task-manager/task-editor/task.html.twig @@ -2493,7 +2493,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Anzeige und Handlung-Einstellungen admin/fields/templates.html.twig @@ -2756,12 +2756,12 @@ Email is invalid Ungültige Email Adresse - Controller/Prod/PushController.php + Controller/Prod/PushController.php Email is required Email Adresse erforderlich - Controller/Prod/PushController.php + Controller/Prod/PushController.php Email successfully confirmed @@ -3065,7 +3065,7 @@ Error while creating user Fehler bei der Erstellung des Benutzers - Controller/Prod/PushController.php + Controller/Prod/PushController.php Error while saving preference @@ -3076,7 +3076,7 @@ Error while sending the file Fehler beim Datei Senden - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3130,8 +3130,8 @@ Expiration date successfully updated! Ablaufdatum erfolgreich aktualisiert! - Controller/Prod/PushController.php - Controller/Prod/PushController.php + Controller/Prod/PushController.php + Controller/Prod/PushController.php Export @@ -3301,7 +3301,7 @@ First name is required Vorname erforderlich - Controller/Prod/PushController.php + Controller/Prod/PushController.php First/Last Name @@ -3761,7 +3761,7 @@ Invalid file format Ungültiges Datei Format - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3785,7 +3785,7 @@ Invalid labels parameter ungültige Labels Parameter - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3939,7 +3939,7 @@ Last name is required Nachname erforderlich - Controller/Prod/PushController.php + Controller/Prod/PushController.php Last update on %updateTime% @@ -4324,7 +4324,7 @@ Missing labels parameter Labels-Parameter fehlt - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4350,7 +4350,7 @@ Missing view name parameter View Name-Parameter fehlt - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Mode de presentation @@ -4539,7 +4539,7 @@ No document selected Kein ausgewähltes Dokument - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig No elements to push @@ -4746,7 +4746,7 @@ Ok OK - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig admin/fields/templates.html.twig @@ -6394,8 +6394,8 @@ Successful removal erfolgreiches Löschen - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6404,12 +6404,12 @@ Successful update Erfolgreiches Update - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6634,7 +6634,7 @@ The file is too big Datei ist zu gross - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -6650,7 +6650,7 @@ The publication has been stopped Veröffentlichung wurde gestoppt - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -7210,7 +7210,7 @@ User already exists Benutzer existiert schon - Controller/Prod/PushController.php + Controller/Prod/PushController.php User can download HD @@ -7232,7 +7232,7 @@ User successfully created Benutzer wurde erfolgreich erstellt - Controller/Prod/PushController.php + Controller/Prod/PushController.php Users @@ -7661,7 +7661,7 @@ You are not allowed to add users Sie werden nicht erlaubt, Benutzer zu hinzufügen - Controller/Prod/PushController.php + Controller/Prod/PushController.php You are not authorized to do this @@ -7749,7 +7749,7 @@ You do not have rights to remove selected documents Sie besitzen nicht genügend Zugriffsrechte, um die ausgewählte Dokumente zu löschen - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig You do not have the permission to move records to %collection% @@ -8180,7 +8180,7 @@ admin::base: aucun alias Kein Alias - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin/databox/databox.html.twig @@ -8191,7 +8191,7 @@ admin::base: databox not found Databox nicht gefunden - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: envoyer un logo (jpeg 35px de hauteur max) @@ -8252,7 +8252,7 @@ admin::base: vider la base avant de la supprimer Datenbank leeren bevor sie gelöscht wird - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: xml invalide, les changements ne seront pas appliques @@ -9468,22 +9468,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 @@ -9498,7 +9498,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 @@ -9523,12 +9523,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 @@ -9538,12 +9538,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 @@ -9553,12 +9553,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 @@ -9573,7 +9573,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 @@ -9583,12 +9583,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 @@ -9992,7 +9992,7 @@ Bridge/Dailymotion/video_modify.html.twig prod/actions/edit_default.html.twig prod/actions/edit_default.html.twig - admin/collection/create.html.twig + admin/collection/create.html.twig admin/publications/fiche.html.twig web/admin/index.html.twig web/account/reset-email.html.twig @@ -10275,7 +10275,7 @@ prod/Baskets/Update.html.twig admin/collection/suggested_value.html.twig admin/collection/reorder.html.twig - admin/collection/create.html.twig + admin/collection/create.html.twig admin/collection/collection.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig @@ -10309,6 +10309,11 @@ Installation web/setup/step2.html.twig + + button::choose databox + button::choose databox + admin/worker-manager/worker_info.html.twig + button::no Abbrechen @@ -11186,6 +11191,16 @@ Januar classes/module/report.php + + job::tab results + job::tab results + admin/worker-manager/worker_info.html.twig + + + job::tab total entry in DB + job::tab total entry in DB + admin/worker-manager/worker_info.html.twig + juillet Juli @@ -12105,7 +12120,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 @@ -13308,7 +13323,7 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben prod::tools: document Dokument - Controller/Prod/ShareController.php + Controller/Prod/ShareController.php Controller/Prod/ToolsController.php @@ -13370,12 +13385,12 @@ Vorsicht: die aktuelle Werte werden durch die neue Werte überschrieben prod:app trash: record-move-to-trash Datensatz (¨e) in den Papierkorb verschoben - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig prod:app trash: record-to-delete Datensatz(ë) endgültig gelöscht - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig prod:app trash: title-trash @@ -15144,7 +15159,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 0b58a17aa9..0af9543841 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 @@ -963,15 +963,15 @@ Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -1034,7 +1034,7 @@ Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php web/admin/statusbit.html.twig @@ -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? @@ -1411,7 +1411,7 @@ Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Bad request, please contact an admin @@ -1565,7 +1565,7 @@ Cancel Controller/Prod/LanguageController.php prod/User/Add.html.twig - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig actions/Property/type.html.twig actions/Property/index.html.twig task-manager/task-editor/task.html.twig @@ -2496,7 +2496,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Display and action settings admin/fields/templates.html.twig @@ -2759,12 +2759,12 @@ Email is invalid E-mail address is invalid. - Controller/Prod/PushController.php + Controller/Prod/PushController.php Email is required E-mail address is required. - Controller/Prod/PushController.php + Controller/Prod/PushController.php Email successfully confirmed @@ -3068,7 +3068,7 @@ Error while creating user Error while creating user - Controller/Prod/PushController.php + Controller/Prod/PushController.php Error while saving preference @@ -3079,7 +3079,7 @@ Error while sending the file Error while sending the file - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3133,8 +3133,8 @@ Expiration date successfully updated! Expiration date successfully updated! - Controller/Prod/PushController.php - Controller/Prod/PushController.php + Controller/Prod/PushController.php + Controller/Prod/PushController.php Export @@ -3304,7 +3304,7 @@ First name is required First name is required - Controller/Prod/PushController.php + Controller/Prod/PushController.php First/Last Name @@ -3764,7 +3764,7 @@ Invalid file format Invalid file format - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3788,7 +3788,7 @@ Invalid labels parameter Invalid label parameters - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3942,7 +3942,7 @@ Last name is required Last name is mandatory - Controller/Prod/PushController.php + Controller/Prod/PushController.php Last update on %updateTime% @@ -4327,7 +4327,7 @@ Missing labels parameter Labels missing parameter - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4353,7 +4353,7 @@ Missing view name parameter Missing name in view parameter - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Mode de presentation @@ -4542,7 +4542,7 @@ No document selected No document selected - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig No elements to push @@ -4749,7 +4749,7 @@ Ok Ok - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig admin/fields/templates.html.twig @@ -6397,8 +6397,8 @@ Successful removal Successful removal. - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6407,12 +6407,12 @@ Successful update Successful update - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6637,7 +6637,7 @@ The file is too big The file is too large. - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -6653,7 +6653,7 @@ The publication has been stopped The publication has been stopped. - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -7213,7 +7213,7 @@ User already exists User already exists - Controller/Prod/PushController.php + Controller/Prod/PushController.php User can download HD @@ -7235,7 +7235,7 @@ User successfully created User successfully created - Controller/Prod/PushController.php + Controller/Prod/PushController.php Users @@ -7664,7 +7664,7 @@ You are not allowed to add users You are not allowed to create users - Controller/Prod/PushController.php + Controller/Prod/PushController.php You are not authorized to do this @@ -7752,7 +7752,7 @@ You do not have rights to remove selected documents You don't have rights to remove selected documents. - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig You do not have the permission to move records to %collection% @@ -8183,7 +8183,7 @@ admin::base: aucun alias No aliases - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin/databox/databox.html.twig @@ -8194,7 +8194,7 @@ admin::base: databox not found Databox was not found - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: envoyer un logo (jpeg 35px de hauteur max) @@ -8255,7 +8255,7 @@ admin::base: vider la base avant de la supprimer Empty database before delete - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: xml invalide, les changements ne seront pas appliques @@ -8320,7 +8320,7 @@ Confirm collection publication ? admin/collection/collection.html.twig - + admin::base:collection: etes vous sur de vider la collection ? Please confirm that you wish to empty the collection ? admin/collection/collection.html.twig @@ -9471,22 +9471,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 @@ -9501,7 +9501,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 @@ -9526,12 +9526,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 @@ -9541,12 +9541,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 @@ -9556,12 +9556,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 @@ -9576,7 +9576,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 @@ -9586,12 +9586,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 @@ -9995,7 +9995,7 @@ Bridge/Dailymotion/video_modify.html.twig prod/actions/edit_default.html.twig prod/actions/edit_default.html.twig - admin/collection/create.html.twig + admin/collection/create.html.twig admin/publications/fiche.html.twig web/admin/index.html.twig web/account/reset-email.html.twig @@ -10278,7 +10278,7 @@ prod/Baskets/Update.html.twig admin/collection/suggested_value.html.twig admin/collection/reorder.html.twig - admin/collection/create.html.twig + admin/collection/create.html.twig admin/collection/collection.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig @@ -10312,6 +10312,11 @@ Install web/setup/step2.html.twig + + button::choose databox + button::choose databox + admin/worker-manager/worker_info.html.twig + button::no Cancel @@ -11189,6 +11194,16 @@ January classes/module/report.php + + job::tab results + job::tab results + admin/worker-manager/worker_info.html.twig + + + job::tab total entry in DB + job::tab total entry in DB + admin/worker-manager/worker_info.html.twig + juillet July @@ -12108,7 +12123,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 @@ -13315,7 +13330,7 @@ A ” Push” will never expire. prod::tools: document Document - Controller/Prod/ShareController.php + Controller/Prod/ShareController.php Controller/Prod/ToolsController.php @@ -13377,12 +13392,12 @@ A ” Push” will never expire. prod:app trash: record-move-to-trash move record to trash - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig prod:app trash: record-to-delete record(s) permanently deleted - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig prod:app trash: title-trash @@ -15154,7 +15169,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 67bf7d2ac1..33dc9ed858 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 @@ -962,15 +962,15 @@ Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -1033,7 +1033,7 @@ Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php web/admin/statusbit.html.twig @@ -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? @@ -1410,7 +1410,7 @@ Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Bad request, please contact an admin @@ -1564,7 +1564,7 @@ Annuler Controller/Prod/LanguageController.php prod/User/Add.html.twig - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig actions/Property/type.html.twig actions/Property/index.html.twig task-manager/task-editor/task.html.twig @@ -2493,7 +2493,7 @@ Form/Configuration/ActionsFormType.php - Display & action settings + Paramétrage d'affichage et d'action admin/fields/templates.html.twig @@ -2756,12 +2756,12 @@ Email is invalid L'adresse e-mail est invalide - Controller/Prod/PushController.php + Controller/Prod/PushController.php Email is required L'adresse e-mail est obligatoire - Controller/Prod/PushController.php + Controller/Prod/PushController.php Email successfully confirmed @@ -3065,7 +3065,7 @@ Error while creating user Erreur lors de la création de l'utilisateur - Controller/Prod/PushController.php + Controller/Prod/PushController.php Error while saving preference @@ -3076,7 +3076,7 @@ Error while sending the file Erreur lors de l'envoi du fichier - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3130,8 +3130,8 @@ Expiration date successfully updated! Date d'expiration mise à jour avec succès! - Controller/Prod/PushController.php - Controller/Prod/PushController.php + Controller/Prod/PushController.php + Controller/Prod/PushController.php Export @@ -3301,7 +3301,7 @@ First name is required Le prénom est obligatoire - Controller/Prod/PushController.php + Controller/Prod/PushController.php First/Last Name @@ -3761,7 +3761,7 @@ Invalid file format Format de fichier incorrect - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3785,7 +3785,7 @@ Invalid labels parameter Paramètre de label incorrect - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3939,7 +3939,7 @@ Last name is required Le nom est obligatoire - Controller/Prod/PushController.php + Controller/Prod/PushController.php Last update on %updateTime% @@ -4324,7 +4324,7 @@ Missing labels parameter Paramètre de label manquant - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4350,7 +4350,7 @@ Missing view name parameter Paramètre de nom de vue manquant - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Mode de presentation @@ -4539,7 +4539,7 @@ No document selected Aucun document sélectionné - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig No elements to push @@ -4746,7 +4746,7 @@ Ok Ok - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig admin/fields/templates.html.twig @@ -6394,8 +6394,8 @@ Successful removal Suppression effectuée - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6404,12 +6404,12 @@ Successful update Mise à jour réussie - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6634,7 +6634,7 @@ The file is too big Le fichier est trop gros - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -6650,7 +6650,7 @@ The publication has been stopped La publication a été suspendue - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -7210,7 +7210,7 @@ User already exists L'utilisateur existe déjà - Controller/Prod/PushController.php + Controller/Prod/PushController.php User can download HD @@ -7232,7 +7232,7 @@ User successfully created Utilisateur créé avec succès - Controller/Prod/PushController.php + Controller/Prod/PushController.php Users @@ -7661,7 +7661,7 @@ You are not allowed to add users Vous n'êtes pas autorisé à ajouter des utilisateurs - Controller/Prod/PushController.php + Controller/Prod/PushController.php You are not authorized to do this @@ -7749,7 +7749,7 @@ You do not have rights to remove selected documents Vous n'avez pas les droits pour supprimer les documents sélectionnés - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig You do not have the permission to move records to %collection% @@ -8180,7 +8180,7 @@ admin::base: aucun alias Aucun Alias - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin/databox/databox.html.twig @@ -8191,7 +8191,7 @@ admin::base: databox not found Databox non trouvée - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: envoyer un logo (jpeg 35px de hauteur max) @@ -8252,7 +8252,7 @@ admin::base: vider la base avant de la supprimer Vider la base avant de la supprimer - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: xml invalide, les changements ne seront pas appliques @@ -9469,22 +9469,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 @@ -9499,7 +9499,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 @@ -9524,12 +9524,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 @@ -9539,12 +9539,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 @@ -9554,12 +9554,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 @@ -9574,7 +9574,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 @@ -9584,12 +9584,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 @@ -9993,7 +9993,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Bridge/Dailymotion/video_modify.html.twig prod/actions/edit_default.html.twig prod/actions/edit_default.html.twig - admin/collection/create.html.twig + admin/collection/create.html.twig admin/publications/fiche.html.twig web/admin/index.html.twig web/account/reset-email.html.twig @@ -10276,7 +10276,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod/Baskets/Update.html.twig admin/collection/suggested_value.html.twig admin/collection/reorder.html.twig - admin/collection/create.html.twig + admin/collection/create.html.twig admin/collection/collection.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig @@ -10310,6 +10310,11 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Installer web/setup/step2.html.twig + + button::choose databox + button::choose databox + admin/worker-manager/worker_info.html.twig + button::no Annuler @@ -11187,6 +11192,16 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le janvier classes/module/report.php + + job::tab results + job::tab results + admin/worker-manager/worker_info.html.twig + + + job::tab total entry in DB + job::tab total entry in DB + admin/worker-manager/worker_info.html.twig + juillet juillet @@ -12106,7 +12121,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 @@ -13311,7 +13326,7 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles prod::tools: document Document - Controller/Prod/ShareController.php + Controller/Prod/ShareController.php Controller/Prod/ToolsController.php @@ -13373,12 +13388,12 @@ Attention: les valeurs actuellement en place seront écrasées par ces nouvelles prod:app trash: record-move-to-trash Enregistrement(s) déplacé(s) dans la corbeille. - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig prod:app trash: record-to-delete Enregistrement(s) définitivement supprimé(s) - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig prod:app trash: title-trash @@ -15153,7 +15168,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 7947011ed7..d81c25834d 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. @@ -963,15 +963,15 @@ Controller/Prod/ToolsController.php Controller/Prod/StoryController.php Controller/Admin/DataboxesController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -1034,7 +1034,7 @@ Controller/Api/V1Controller.php Controller/Api/V1Controller.php Controller/Admin/SearchEngineController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php web/admin/statusbit.html.twig @@ -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? @@ -1411,7 +1411,7 @@ Controller/Root/AccountController.php Controller/Admin/RootController.php Controller/Admin/RootController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Bad request, please contact an admin @@ -1565,7 +1565,7 @@ Annuleren Controller/Prod/LanguageController.php prod/User/Add.html.twig - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig actions/Property/type.html.twig actions/Property/index.html.twig task-manager/task-editor/task.html.twig @@ -2759,12 +2759,12 @@ Email is invalid Email is niet correct - Controller/Prod/PushController.php + Controller/Prod/PushController.php Email is required Email is verplicth - Controller/Prod/PushController.php + Controller/Prod/PushController.php Email successfully confirmed @@ -3071,7 +3071,7 @@ Error while creating user Fout tijdens het aanmaken van gebruiker - Controller/Prod/PushController.php + Controller/Prod/PushController.php Error while saving preference @@ -3082,7 +3082,7 @@ Error while sending the file Fout bij het versturen van het bestaan - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3136,8 +3136,8 @@ Expiration date successfully updated! Expiration date successfully updated! - Controller/Prod/PushController.php - Controller/Prod/PushController.php + Controller/Prod/PushController.php + Controller/Prod/PushController.php Export @@ -3307,7 +3307,7 @@ First name is required Voornaam is verplicht - Controller/Prod/PushController.php + Controller/Prod/PushController.php First/Last Name @@ -3767,7 +3767,7 @@ Invalid file format Ongeldige bestandsindeling - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3791,7 +3791,7 @@ Invalid labels parameter Ongeldige parameter voor labels - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -3945,7 +3945,7 @@ Last name is required Achternaam is verplicht - Controller/Prod/PushController.php + Controller/Prod/PushController.php Last update on %updateTime% @@ -4330,7 +4330,7 @@ Missing labels parameter Ontbrekende parameter voor labels - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -4356,7 +4356,7 @@ Missing view name parameter Ontbrekende parameter voor weergave - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Mode de presentation @@ -4545,7 +4545,7 @@ No document selected Geen document geselecteerd - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig No elements to push @@ -4752,7 +4752,7 @@ Ok Ok - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig admin/fields/templates.html.twig @@ -6400,8 +6400,8 @@ Successful removal Met succes verwijderd - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6410,12 +6410,12 @@ Successful update Geslaagde update - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php Controller/Admin/CollectionController.php @@ -6640,7 +6640,7 @@ The file is too big Het bestand is te groot - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -6656,7 +6656,7 @@ The publication has been stopped Het programma is gestopt - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php Controller/Admin/CollectionController.php @@ -7216,7 +7216,7 @@ User already exists Gebruiker bestaat reeds - Controller/Prod/PushController.php + Controller/Prod/PushController.php User can download HD @@ -7238,7 +7238,7 @@ User successfully created Gebruiker met succes aangemaakt - Controller/Prod/PushController.php + Controller/Prod/PushController.php Users @@ -7667,7 +7667,7 @@ You are not allowed to add users U hebt geen toestemming om gebruikers toe te voegen - Controller/Prod/PushController.php + Controller/Prod/PushController.php You are not authorized to do this @@ -7755,7 +7755,7 @@ You do not have rights to remove selected documents U hebt geen rechten om de geselecteerde documenten te verwijderen - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig You do not have the permission to move records to %collection% @@ -8186,7 +8186,7 @@ admin::base: aucun alias Geen enkel snelkoppeling - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin/databox/databox.html.twig @@ -8197,7 +8197,7 @@ admin::base: databox not found admin::base: databox not found - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: envoyer un logo (jpeg 35px de hauteur max) @@ -8258,7 +8258,7 @@ admin::base: vider la base avant de la supprimer Maak eerst de database leeg alvorens te verwijderen - Controller/Admin/DataboxController.php + Controller/Admin/DataboxController.php admin::base: xml invalide, les changements ne seront pas appliques @@ -9474,22 +9474,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 @@ -9504,7 +9504,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 @@ -9529,12 +9529,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 @@ -9544,12 +9544,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 @@ -9559,12 +9559,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 @@ -9579,7 +9579,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 @@ -9589,12 +9589,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 @@ -9998,7 +9998,7 @@ Bridge/Dailymotion/video_modify.html.twig prod/actions/edit_default.html.twig prod/actions/edit_default.html.twig - admin/collection/create.html.twig + admin/collection/create.html.twig admin/publications/fiche.html.twig web/admin/index.html.twig web/account/reset-email.html.twig @@ -10281,7 +10281,7 @@ prod/Baskets/Update.html.twig admin/collection/suggested_value.html.twig admin/collection/reorder.html.twig - admin/collection/create.html.twig + admin/collection/create.html.twig admin/collection/collection.html.twig admin/publications/fiche.html.twig admin/publications/list.html.twig @@ -10315,6 +10315,11 @@ Installeer web/setup/step2.html.twig + + button::choose databox + button::choose databox + admin/worker-manager/worker_info.html.twig + button::no button::no @@ -11192,6 +11197,16 @@ januari classes/module/report.php + + job::tab results + job::tab results + admin/worker-manager/worker_info.html.twig + + + job::tab total entry in DB + job::tab total entry in DB + admin/worker-manager/worker_info.html.twig + juillet juli @@ -13313,7 +13328,7 @@ prod::tools: document prod::tools: document - Controller/Prod/ShareController.php + Controller/Prod/ShareController.php Controller/Prod/ToolsController.php @@ -13375,12 +13390,12 @@ prod:app trash: record-move-to-trash prod:app trash: record-move-to-trash - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig prod:app trash: record-to-delete prod:app trash: record-to-delete - prod/actions/delete_records_confirm_form.html.twig + prod/actions/delete_records_confirm_form.html.twig prod:app trash: title-trash diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 54d862021c..811dae67be 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 8c62e29446..c610a74dd1 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 14eb0de535..808eed075b 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 81d657107b..d965be4968 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/templates/web/admin/worker-manager/worker_info.html.twig b/templates/web/admin/worker-manager/worker_info.html.twig index b8d3ec73d7..f2b81ab841 100644 --- a/templates/web/admin/worker-manager/worker_info.html.twig +++ b/templates/web/admin/worker-manager/worker_info.html.twig @@ -12,7 +12,7 @@ - + {{ "admin::workermanager:tab:workerinfo: Warning! Erase all information" |trans }}

@@ -21,7 +21,7 @@ - + {{ "admin::workermanager:tab:workerinfo: Warning! Erase all finished"|trans }} @@ -30,6 +30,10 @@ + + {{ totalCount }} + {{ "job::tab total entry in DB" | trans }} +
+ + + +
@@ -53,6 +66,10 @@ + + {{ resultCount }} / {{ resultTotal }} {{ "job::tab results" | trans }} + +
@@ -125,6 +142,8 @@ var error = 1; var interrupt = 1; var jobType = $("#job-type-filter").val(); + var databoxId = $("#databox-filter").val(); + var recordId = $("#record-filter").val(); if (!$(".running-work").is(":checked")) { @@ -147,10 +166,14 @@ type: "GET", url: "/admin/worker-manager/info?reload=1&running="+running+"&finished="+finished+"&error="+error+"&interrupt="+interrupt, data: { - jobType: jobType + jobType: jobType, + databoxId : databoxId, + recordId : recordId }, success: function (data) { - $(".work-list").empty().html(data); + $(".work-list").empty().html(data.content); + $(".result-count").empty().text(data.resultCount + ' / ' + data.resultTotal); + $(".total-count").empty().text(data.totalCount); } }); } @@ -167,6 +190,14 @@ refreshJobList(); }); + $("#databox-filter").on('change', function () { + refreshJobList(); + }); + + $("#record-filter").on('input', function () { + refreshJobList(); + }); + $(".admintable").on('click', '.change-status-interrupt', function () { var workerId = $(this).attr('data-id');