diff --git a/Makefile b/Makefile index f8a5978138..b66b5a375e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ install: make install_assets install_composer: - composer install + composer install --ignore-platform-reqs install_asset_dependencies: yarn upgrade diff --git a/Vagrantfile b/Vagrantfile index 863b1be769..bca737d028 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -70,6 +70,9 @@ def config_net(config) vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"] end end + + config.vm.network :public_network, bridge:"en0: Ethernet" + config.hostmanager.ip_resolver = proc do |vm, resolving_vm| if vm.id if $env == "mac" || $env == "linux" diff --git a/lib/Alchemy/Phrasea/Application/RouteLoader.php b/lib/Alchemy/Phrasea/Application/RouteLoader.php index 6e313b6b37..2542ff25d1 100644 --- a/lib/Alchemy/Phrasea/Application/RouteLoader.php +++ b/lib/Alchemy/Phrasea/Application/RouteLoader.php @@ -65,8 +65,6 @@ class RouteLoader '/prod/upload/' => Providers\Prod\Upload::class, '/prod/WorkZone' => Providers\Prod\WorkZone::class, '/prod/' => Providers\Prod\Root::class, - '/report/activity' => Providers\Report\Activity::class, - '/report/informations' => Providers\Report\Information::class, '/report/' => Providers\Report\Root::class, '/session/' => Providers\Root\Session::class, '/setup' => Providers\Setup::class, diff --git a/lib/Alchemy/Phrasea/Controller/Report/ActivityController.php b/lib/Alchemy/Phrasea/Controller/Report/ActivityController.php deleted file mode 100644 index ca00f5871f..0000000000 --- a/lib/Alchemy/Phrasea/Controller/Report/ActivityController.php +++ /dev/null @@ -1,802 +0,0 @@ -app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - $activity->setBound("user", true); - - //set Limit - if ($activity->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $activity->setLimit($page, $limit); - } else { - $activity->setLimit(false, false); - } - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->getConnexionBase(false, $request->request->get('on', 'user')); - - return $this->getCSVResponse($activity, 'activity_connection_base'); - } - - $report = $activity->getConnexionBase(false, $request->request->get('on', 'user')); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => false, - 'title' => false, - ]); - } - - /** - * Display download report group by user - * - * @param Request $request - * @return JsonResponse - */ - public function doReportDownloadsByUsers(Request $request) - { - $conf = [ - 'user' => [$this->app->trans('report:: utilisateur'), 0, 1, 0, 0], - 'nbdoc' => [$this->app->trans('report:: nombre de documents'), 0, 0, 0, 0], - 'nbprev' => [$this->app->trans('report:: nombre de preview'), 0, 0, 0, 0], - ]; - - $activity = new \module_report_activity( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - //set Limit - if ($activity->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $activity->setLimit($page, $limit); - } else { - $activity->setLimit(false, false); - } - - $report = $activity->getDetailDownload($conf, $request->request->get('on')); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - - return $this->getCSVResponse($activity, 'activity_detail_download'); - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => false, - 'title' => false, - ]); - } - - /** - * Display the most asked question - * - * @param Request $request - * @return JsonResponse - */ - public function doReportBestOfQuestions(Request $request) - { - $conf = [ - 'search' => [$this->app->trans('report:: question'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'nb_rep' => [$this->app->trans('report:: nombre de reponses'), 0, 0, 0, 0] - ]; - - $activity = new \module_report_activity( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setLimit(1, $request->request->get('limit', 20)); - $activity->setTop(20); - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $activity->getTopQuestion($conf); - - return $this->getCSVResponse($activity, 'activity_questions_best_of'); - } - - $report = $activity->getTopQuestion($conf); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => false - ]); - } - - /** - * Display report about questions that return no result - * - * @param Request $request - * @return JsonResponse - */ - public function doReportNoBestOfQuestions(Request $request) - { - $conf = [ - 'search' => [$this->app->trans('report:: question'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'nb_rep' => [$this->app->trans('report:: nombre de reponses'), 0, 0, 0, 0] - ]; - - $activity = new \module_report_activity( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - //set Limit - if ($activity->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $activity->setLimit($page, $limit); - } else { - $activity->setLimit(false, false); - } - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $activity->getTopQuestion($conf, true); - - return $this->getCSVResponse($activity, 'activity_top_ten_questions'); - } - - $report = $activity->getTopQuestion($conf, true); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => false - ]); - } - - /** - * Display an overview of connexion among hours of the da - * - * @param Request $request - * @return JsonResponse - */ - public function doReportSiteActiviyPerHours(Request $request) - { - $activity = new \module_report_activity( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $activity->getActivityPerHours(); - - return $this->getCSVResponse($activity, 'activity_per_hours'); - } - - $report = $activity->getActivityPerHours(); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => true, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => false - ]); - } - - /** - * Display an overview of downloaded document grouped by day - * - * @param Request $request - * @return JsonResponse - */ - public function doReportSiteActivityPerDays(Request $request) - { - $conf = [ - 'ddate' => [$this->app->trans('report:: jour'), 0, 0, 0, 0], - 'total' => [$this->app->trans('report:: total des telechargements'), 0, 0, 0, 0], - 'preview' => [$this->app->trans('report:: preview'), 0, 0, 0, 0], - 'document' => [$this->app->trans('report:: document'), 0, 0, 0, 0] - ]; - - $activity = new \module_report_activity( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - //set Limit - if ($activity->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $activity->setLimit($page, $limit); - } else { - $activity->setLimit(false, false); - } - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $activity->getDownloadByBaseByDay($conf); - - return $this->getCSVResponse($activity, 'activity_db_by_base_by_day'); - } - - $report = $activity->getDownloadByBaseByDay($conf); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => false, - 'title' => false, - ]); - } - - /** - * Display report about pushed documents - * - * @param Request $request - * @return JsonResponse - */ - public function doReportPushedDocuments(Request $request) - { - $conf = [ - 'user' => ['', 1, 0, 1, 1], - 'getter' => ["Destinataire", 1, 0, 1, 1], - 'date' => ['', 1, 0, 1, 1], - 'record_id' => ['', 1, 1, 1, 1], - 'file' => ['', 1, 0, 1, 1], - 'mime' => ['', 1, 0, 1, 1], - ]; - - $activity = new \module_report_push( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $this->doReport($request, $activity, $conf); - - return $this->getCSVResponse($activity, 'activity_pushed_documents'); - } - - $report = $this->doReport($request, $activity, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'], - ]); - } - - /** - * Display report about added documents - * - * @param Request $request - * @return JsonResponse - */ - public function doReportAddedDocuments(Request $request) - { - $conf = [ - 'user' => ['', 1, 0, 1, 1], - 'date' => ['', 1, 0, 1, 1], - 'record_id' => ['', 1, 1, 1, 1], - 'file' => ['', 1, 0, 1, 1], - 'mime' => ['', 1, 0, 1, 1], - ]; - - $activity = new \module_report_add( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $this->doReport($request, $activity, $conf); - - return $this->getCSVResponse($activity, 'activity_added_documents'); - } - - $report = $this->doReport($request, $activity, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'], - ]); - } - - /** - * Display report about edited documents - * - * @param Request $request - * @return JsonResponse - */ - public function doReportEditedDocuments(Request $request) - { - $conf = [ - 'user' => ['', 1, 0, 1, 1], - 'date' => ['', 1, 0, 1, 1], - 'record_id' => ['', 1, 1, 1, 1], - 'file' => ['', 1, 0, 1, 1], - 'mime' => ['', 1, 0, 1, 1], - ]; - - $activity = new \module_report_edit( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $this->doReport($request, $activity, $conf); - - return $this->getCSVResponse($activity, 'activity_edited_documents'); - } - - $report = $this->doReport($request, $activity, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'], - ]); - } - - /** - * Display report about validated documents - * - * @param Request $request - * @return JsonResponse - */ - public function doReportValidatedDocuments(Request $request) - { - $conf = [ - 'user' => ['', 1, 0, 1, 1], - 'getter' => ["Destinataire", 1, 0, 1, 1], - 'date' => ['', 1, 0, 1, 1], - 'record_id' => ['', 1, 1, 1, 1], - 'file' => ['', 1, 0, 1, 1], - 'mime' => ['', 1, 0, 1, 1], - ]; - - $activity = new \module_report_validate( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $this->doReport($request, $activity, $conf); - - return $this->getCSVResponse($activity, 'activity_validated_documents'); - } - - $report = $this->doReport($request, $activity, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'], - ]); - } - - /** - * Display report about documents sent by mail - * - * @param Request $request - * @return JsonResponse - */ - public function doReportSentDocuments(Request $request) - { - $conf = [ - 'user' => ['', 1, 0, 1, 1], - 'date' => ['', 1, 0, 1, 1], - 'record_id' => ['', 1, 1, 1, 1], - 'file' => ['', 1, 0, 1, 1], - 'mime' => ['', 1, 0, 1, 1], - 'comment' => [$this->app->trans('Receiver'), 1, 0, 1, 1], - ]; - - $activity = new \module_report_sent( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $activity->setConfig(false); - - if ($request->request->get('printcsv') == 'on') { - $activity->setHasLimit(false); - $activity->setPrettyString(false); - - $this->doReport($request, $activity, $conf); - - return $this->getCSVResponse($activity, 'activity_send_documents'); - } - - $report = $this->doReport($request, $activity, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'], - ]); - } - - /** - * Set Report configuration according to request parameters - * - * @param Request $request A request instance - * @param \module_report $report A report instance - * @param Array $conf A report column configuration - * @param Boolean $what Whether to group on a particular field or not - * @return Array - */ - private function doReport(Request $request, \module_report $report, $conf, $what = false) - { - if ($this->getConf()->get(['registry', 'modules', 'anonymous-report'])) { - if (isset($conf['user'])) { - unset($conf['user']); - } - - if (isset($conf['ip'])) { - unset($conf['ip']); - } - } - //save initial conf - $base_conf = $conf; - //format conf according user preferences - if ('' !== $columnsList = $request->request->get('list_column', '')) { - $new_conf = $conf; - $columns = explode(",", $columnsList); - - foreach (array_keys($conf) as $col) { - if (!in_array($col, $columns)) { - unset($new_conf[$col]); - } - } - - $conf = $new_conf; - } - - //display content of a table column when user click on it - if ($request->request->get('conf') == 'on') { - return $this->app->json(['liste' => $this->render('report/listColumn.html.twig', [ - 'conf' => $base_conf - ]), "title" => $this->app->trans("configuration")]); - } - - //set order - if (('' !== $order = $request->request->get('order', '')) && ('' !== $field = $request->request->get('champ', ''))) { - $report->setOrder($field, $order); - } - - //work on filters - $mapColumnTitleToSqlField = $report->getTransQueryString(); - - $currentfilter = []; - - if ('' !== $serializedFilter = $request->request->get('liste_filter', '')) { - $currentfilter = @unserialize(urldecode($serializedFilter)); - } - - $filter = new \module_report_filter($this->app, $currentfilter, $mapColumnTitleToSqlField); - - if ('' !== $filterColumn = $request->request->get('filter_column', '')) { - $field = current(explode(' ', $filterColumn)); - $value = $request->request->get('filter_value', ''); - - if ($request->request->get('liste') == 'on') { - return $this->app->json(['diag' => $this->render('report/colFilter.html.twig', [ - 'result' => $report->colFilter($field), - 'field' => $field - ]), "title" => $this->app->trans('filtrer les resultats sur la colonne %colonne%', ['%colonne%' => $field])]); - } - - if ($field === $value) { - $filter->removeFilter($field); - } else { - $filter->addFilter($field, '=', $value); - } - } - - //set new request filter if user asking for them - if ($request->request->get('precise') == 1) { - $filter->addFilter('xml', 'LIKE', $request->request->get('word', '')); - } elseif ($request->request->get('precise') == 2) { - $filter->addFilter('record_id', '=', $request->request->get('word', '')); - } - - //set filters to current report - $report->setFilter($filter->getTabFilter()); - $report->setActiveColumn($filter->getActiveColumn()); - $report->setPostingFilter($filter->getPostingFilter()); - - // display a new arraywhere results are group - if ('' !== $groupby = $request->request->get('groupby', '')) { - $report->setConfig(false); - $groupby = current(explode(' ', $groupby)); - - $reportArray = $report->buildReport(false, $groupby); - - if (count($reportArray['allChamps']) > 0 && count($reportArray['display']) > 0) { - $groupField = isset($reportArray['display'][$reportArray['allChamps'][0]]['title']) ? $reportArray['display'][$reportArray['allChamps'][0]]['title'] : ''; - } else { - $groupField = isset($conf[strtolower($groupby)]['title']) ? $conf[strtolower($groupby)]['title'] : ''; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => true, - 'is_plot' => false, - 'is_doc' => false, - ]), - 'display_nav' => false, - 'title' => $this->app->trans('Groupement des resultats sur le champ %name%', ['%name%' => $groupField]), - ]); - } - - //set Limit - if ($report->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $report->setLimit($page, $limit); - } else { - $report->setLimit(false, false); - } - - //time to build our report - if (false === $what) { - $reportArray = $report->buildReport($conf); - } else { - $reportArray = $report->buildReport($conf, $what, $request->request->get('tbl', false)); - } - - return $reportArray; - } - - private function getCSVResponse(\module_report $report, $type) - { - // set headers - $headers = []; - foreach (array_keys($report->getDisplay()) as $k) { - $headers[$k] = $k; - } - // set headers as first row - $result = $report->getResult(); - array_unshift($result, $headers); - - $collection = new CallbackCollection($result, function ($row) use ($report) { - // restrict to displayed fields - return array_map('strip_tags', array_intersect_key($row, $report->getDisplay())); - }); - - $filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd')); - /** @var Exporter $exporter */ - $exporter = $this->app['csv.exporter']; - $response = new CSVFileResponse($filename, function () use ($exporter, $collection) { - $exporter->export('php://output', $collection); - }); - - return $response; - } -} diff --git a/lib/Alchemy/Phrasea/Controller/Report/InformationController.php b/lib/Alchemy/Phrasea/Controller/Report/InformationController.php deleted file mode 100644 index 6868292743..0000000000 --- a/lib/Alchemy/Phrasea/Controller/Report/InformationController.php +++ /dev/null @@ -1,502 +0,0 @@ - [ - 'photo' => [$this->app->trans('report:: document'), 0, 0, 0, 0], - 'record_id' => [$this->app->trans('report:: record id'), 0, 0, 0, 0], - 'date' => [$this->app->trans('report:: date'), 0, 0, 0, 0], - 'type' => [$this->app->trans('phrseanet:: sous definition'), 0, 0, 0, 0], - 'titre' => [$this->app->trans('report:: titre'), 0, 0, 0, 0], - 'taille' => [$this->app->trans('report:: poids'), 0, 0, 0, 0] - ], - 'conf' => [ - 'identifiant' => [$this->app->trans('report:: identifiant'), 0, 0, 0, 0], - 'nom' => [$this->app->trans('report:: nom'), 0, 0, 0, 0], - 'mail' => [$this->app->trans('report:: email'), 0, 0, 0, 0], - 'adresse' => [$this->app->trans('report:: adresse'), 0, 0, 0, 0], - 'tel' => [$this->app->trans('report:: telephone'), 0, 0, 0, 0] - ], - 'config_cnx' => [ - 'ddate' => [$this->app->trans('report:: date'), 0, 0, 0, 0], - 'appli' => [$this->app->trans('report:: modules'), 0, 0, 0, 0], - ], - 'config_dl' => [ - 'ddate' => [$this->app->trans('report:: date'), 0, 0, 0, 0], - 'record_id' => [$this->app->trans('report:: record id'), 0, 1, 0, 0], - 'final' => [$this->app->trans('phrseanet:: sous definition'), 0, 0, 0, 0], - 'coll_id' => [$this->app->trans('report:: collections'), 0, 0, 0, 0], - 'comment' => [$this->app->trans('report:: commentaire'), 0, 0, 0, 0], - ], - 'config_ask' => [ - 'search' => [$this->app->trans('report:: question'), 0, 0, 0, 0], - 'ddate' => [$this->app->trans('report:: date'), 0, 0, 0, 0] - ] - ]; - - $report = null; - $html = $html_info = ''; - $from = $request->request->get('from', ''); - $on = $request->request->get('on', ''); - $selectValue = $request->request->get('user', ''); - - if ('' === $selectValue) { - $this->app->abort(400); - } - - if ('' !== $on && $this->getConf()->get(['registry', 'modules', 'anonymous-report']) == true) { - $conf['conf'] = [ - $on => [$on, 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0] - ]; - } - - if ($from == 'CNXU' || $from == 'CNX') { - $report = new \module_report_connexion( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - $conf_array = $conf['config_cnx']; - $title = $this->app->trans('report:: historique des connexions'); - } elseif ($from == 'USR' || $from == 'GEN') { - $report = new \module_report_download( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - $conf_array = $conf['config_dl']; - $title = $this->app->trans('report:: historique des telechargements'); - } elseif ($from == 'ASK') { - $report = new \module_report_question( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - $conf_array = $conf['config_ask']; - $title = $this->app->trans('report:: historique des questions'); - } - - if ($report) { - $mapColumnTitleToSqlField = $report->getTransQueryString(); - - $currentfilter = []; - - if ('' !== $serializedFilter = $request->request->get('liste_filter', '')) { - $currentfilter = @unserialize(urldecode($serializedFilter)); - } - - $filter = new \module_report_filter($this->app, $currentfilter, $mapColumnTitleToSqlField); - - if ('' !== $filterColumn = $request->request->get('filter_column', '')) { - $field = current(explode(' ', $filterColumn)); - $value = $request->request->get('filter_value', ''); - - if ($request->request->get('liste') == 'on') { - return $this->app->json([ - 'diag' => $this->render('report/colFilter.html.twig', [ - 'result' => $report->colFilter($field), - 'field' => $field - ]), - 'title' => $this->app->trans('filtrer les resultats sur la colonne %colonne%', ['%colonne%' => $field])]); - } - - if ($field === $value) { - $filter->removeFilter($field); - } else { - $filter->addFilter($field, '=', $value); - } - } - - if ('' !== $selectValue && '' !== $from) { - $filter->addfilter('usrid', '=', $selectValue); - } elseif ('' !== $on && '' !== $selectValue) { - $filter->addfilter($on, '=', $selectValue); - } - - if ($report instanceof \module_report_download) { - $report->setIsInformative(true); - } - - $report->setFilter($filter->getTabFilter()); - $report->setOrder('ddate', 'DESC'); - $report->setConfig(false); - $report->setTitle($title); - $report->setHasLimit(false); - - $reportArray = $report->buildReport($conf_array); - - if ($request->request->get('printcsv') == 'on') { - $report->setPrettyString(false); - - return $this->getCSVResponse($report, 'info_user'); - } - - $html = $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => $report instanceof \module_report_download, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]); - } - - $info = new \module_report_nav( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $info->setPeriode(''); - $info->setCsv(false); - - $infoArray = $info->buildTabGrpInfo( - null !== $report ? $report->getReq() : '', - null !== $report ? $report->getParams() : [], - $selectValue, - $conf['conf'], - $on - ); - - if (false == $this->app['conf']->get(['registry', 'modules', 'anonymous-report'])) { - $html_info = $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($infoArray['report']) ? $infoArray['report'] : $infoArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]); - - $title = ('' === $on && isset($infoArray['result'])) ? $infoArray['result'][0]['identifiant'] : $selectValue; - } else { - $title = $selectValue; - } - - return $this->app->json([ - 'rs' => sprintf('%s%s', $html_info, $html), - 'display_nav' => false, - 'title' => $title - ]); - } - - /** - * Display a browser version - * - * @param Request $request - * @return JsonResponse - */ - public function doReportInformationBrowser(Request $request) - { - $conf = [ - 'version' => [$this->app->trans('report::version'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0] - ]; - - $info = new \module_report_nav( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $info->setCsv(false); - $info->setConfig(false); - - if ('' === $browser = $request->request->get('user', '')) { - $this->app->abort(400); - } - - $reportArray = $info->buildTabInfoNav($conf, $browser); - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => $browser - ]); - } - - /** - * Display information about a document - * - * @param Request $request - * @return JsonResponse - */ - public function doReportInformationDocument(Request $request) - { - $config = [ - 'photo' => [$this->app->trans('report:: document'), 0, 0, 0, 0], - 'record_id' => [$this->app->trans('report:: record id'), 0, 0, 0, 0], - 'date' => [$this->app->trans('report:: date'), 0, 0, 0, 0], - 'type' => [$this->app->trans('phrseanet:: sous definition'), 0, 0, 0, 0], - 'titre' => [$this->app->trans('report:: titre'), 0, 0, 0, 0], - 'taille' => [$this->app->trans('report:: poids'), 0, 0, 0, 0] - ]; - - $config_dl = [ - 'ddate' => [$this->app->trans('report:: date'), 0, 0, 0, 0], - 'user' => [$this->app->trans('report:: utilisateurs'), 0, 0, 0, 0], - 'final' => [$this->app->trans('phrseanet:: sous definition'), 0, 0, 0, 0], - 'coll_id' => [$this->app->trans('report:: collections'), 0, 0, 0, 0], - 'comment' => [$this->app->trans('report:: commentaire'), 0, 0, 0, 0], - 'fonction' => [$this->app->trans('report:: fonction'), 0, 0, 0, 0], - 'activite' => [$this->app->trans('report:: activite'), 0, 0, 0, 0], - 'pays' => [$this->app->trans('report:: pays'), 0, 0, 0, 0], - 'societe' => [$this->app->trans('report:: societe'), 0, 0, 0, 0] - ]; - - //format conf according user preferences - if ('' !== $columnsList = $request->request->get('list_column', '')) { - $new_conf = $config_dl; - $columns = explode(',', $columnsList); - - foreach (array_keys($config_dl) as $col) { - if (!in_array($col, $columns)) { - unset($new_conf[$col]); - } - } - - $config_dl = $new_conf; - } - - try { - $record = new \record_adapter( - $this->app, - $request->request->get('sbasid'), - $request->request->get('rid') - ); - } catch (\Exception $e) { - $this->app->abort(404); - } - - $what = new \module_report_nav( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $what->setPeriode(''); - $what->setCsv(false); - $what->setPrint(false); - - /** @var \record_adapter $record */ - $reportArray = $what->buildTabUserWhat( - $record->getBaseId(), - $record->getRecordId(), - $config - ); - - $title = $what->getTitle(); - - $html = $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]); - - $from = $request->request->get('from', ''); - - if ('TOOL' === $from) { - $what->setTitle(''); - - return $this->app->json([ - 'rs' => $html, - 'display_nav' => false, - 'title' => $title - ]); - } - - if ('DASH' !== $from && 'PUSHDOC' !== $from) { - $download = new \module_report_download( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $mapColumnTitleToSqlField = $download->getTransQueryString(); - - $currentfilter = []; - - if ('' !== $serializedFilter = $request->request->get('liste_filter', '')) { - $currentfilter = @unserialize(urldecode($serializedFilter)); - } - - $filter = new \module_report_filter($this->app, $currentfilter, $mapColumnTitleToSqlField); - - if ('' !== $filterColumn = $request->request->get('filter_column', '')) { - $field = current(explode(' ', $filterColumn)); - $value = $request->request->get('filter_value', ''); - - if ($request->request->get('liste') == 'on') { - return $this->app->json([ - 'diag' => $this->render('report/colFilter.html.twig', [ - 'result' => $download->colFilter($field), - 'field' => $field - ]), - 'title' => $this->app->trans('filtrer les resultats sur la colonne %colonne%', ['%colonne%' => $field]) - ]); - } - - if ($field === $value) { - $filter->removeFilter($field); - } else { - $filter->addFilter($field, '=', $value); - } - } - - $filter->addfilter('record_id', '=', $record->getRecordId()); - - $download->setFilter($filter->getTabFilter()); - $download->setOrder('ddate', 'DESC'); - $download->setTitle($this->app->trans('report:: historique des telechargements')); - $download->setConfig(false); - - $reportArray = $download->buildReport($config_dl); - - if ($request->request->get('printcsv') == 'on') { - $download->setPrettyString(false); - - return $this->getCSVResponse($download, 'info_document'); - } - - $html .= $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]); - - return $this->app->json([ - 'rs' => $html, - 'display_nav' => false, - 'title' => $title - ]); - } - - if ($this->getConf()->get(['registry', 'modules', 'anonymous-report']) == false && $from !== 'DOC' && $from !== 'DASH' && $from !== 'GEN' && $from !== 'PUSHDOC') { - $conf = [ - 'identifiant' => [$this->app->trans('report:: identifiant'), 0, 0, 0, 0], - 'nom' => [$this->app->trans('report:: nom'), 0, 0, 0, 0], - 'mail' => [$this->app->trans('report:: email'), 0, 0, 0, 0], - 'adresse' => [$this->app->trans('report:: adresse'), 0, 0, 0, 0], - 'tel' => [$this->app->trans('report:: telephone'), 0, 0, 0, 0] - ]; - - $info = new \module_report_nav( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $info->setPeriode(''); - $info->setConfig(false); - $info->setTitle($this->app->trans('report:: utilisateur')); - - $reportArray = $info->buildTabGrpInfo(false, [], $request->request->get('user'), $conf, false); - - if ($request->request->get('printcsv') == 'on' && isset($download)) { - return $this->getCSVResponse($this->app, $info, 'info_user'); - } - - $html .= $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]); - - return $this->app->json([ - 'rs' => $html, - 'display_nav' => false, - 'title' => $title - ]); - } - - return $this->app->json([ - 'rs' => $html, - 'display_nav' => false, - 'title' => $title - ]); - } - - private function getCSVResponse(\module_report $report, $type) - { - // set headers - $headers = []; - foreach (array_keys($report->getDisplay()) as $k) { - $headers[$k] = $k; - } - // set headers as first row - $result = $report->getResult(); - array_unshift($result, $headers); - - $collection = new CallbackCollection($result, function ($row) use ($report) { - // restrict fields to the displayed ones - return array_map('strip_tags', array_intersect_key($row, $report->getDisplay())); - }); - - /** @var Exporter $exporter */ - $exporter = $this->app['csv.exporter']; - $filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd')); - $response = new CSVFileResponse($filename, function () use ($exporter, $collection) { - $exporter->export('php://output', $collection); - }); - - return $response; - } -} diff --git a/lib/Alchemy/Phrasea/Controller/Report/RootController.php b/lib/Alchemy/Phrasea/Controller/Report/RootController.php index 8bb9006402..f212a2fd75 100644 --- a/lib/Alchemy/Phrasea/Controller/Report/RootController.php +++ b/lib/Alchemy/Phrasea/Controller/Report/RootController.php @@ -10,12 +10,8 @@ namespace Alchemy\Phrasea\Controller\Report; use Alchemy\Phrasea\Controller\Controller; -use Alchemy\Phrasea\Core\Response\CSVFileResponse; -use Goodby\CSV\Export\Standard\Collection\CallbackCollection; -use Goodby\CSV\Export\Standard\Exporter; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; class RootController extends Controller { @@ -53,22 +49,34 @@ class RootController extends Controller $granted = []; - foreach ($this->getAclForUser()->get_granted_base([\ACL::CANREPORT]) as $collection) { - if (!isset($granted[$collection->get_sbas_id()])) { - $granted[$collection->get_sbas_id()] = [ - 'id' => $collection->get_sbas_id(), - 'name' => $collection->get_databox()->get_viewname(), - 'collections' => [] + $acl = $this->getAclForUser(); + foreach ($acl->get_granted_base([\ACL::CANREPORT]) as $collection) { + $sbas_id = $collection->get_sbas_id(); + if (!isset($granted[$sbas_id])) { + $granted[$sbas_id] = [ + 'id' => $sbas_id, + 'name' => $collection->get_databox()->get_viewname(), + 'collections' => [], + 'metas' => [] ]; + + foreach ($collection->get_databox()->get_meta_structure() as $meta) { + // skip the fields that can't be reported + if (!$meta->is_report() || ($meta->isBusiness() && !$acl->can_see_business_fields($collection->get_databox()))) { + continue; + } + $granted[$sbas_id]['metas'][] = $meta->get_name(); + } } - $granted[$collection->get_sbas_id()]['collections'][] = [ - 'id' => $collection->get_coll_id(), + $granted[$sbas_id]['collections'][] = [ + 'id' => $collection->get_coll_id(), 'base_id' => $collection->get_base_id(), - 'name' => $collection->get_name() + 'name' => $collection->get_name(), ]; } $conf = $this->getConf(); + return $this->render('report/report_layout_child.html.twig', [ 'ajax_dash' => true, 'dashboard' => null, @@ -82,594 +90,4 @@ class RootController extends Controller 'ajax_chart' => false ]); } - - /** - * Gets available collections where current user can see report and - * format date - * - * @param Request $request - * @return JsonResponse - */ - public function initReport(Request $request) - { - $popbases = $request->request->get('popbases', []); - - if ('' === $dmin = $request->request->get('dmin', '')) { - $dmin = date('Y') . '-' . date('m') . '-01'; - } - - if ('' === $dmax = $request->request->get('dmax', '')) { - $dmax = date('Y') . '-' . date('m') . '-' . date('d'); - } - - $dmin = \DateTime::createFromFormat('Y-m-d H:i:s', sprintf('%s 00:00:00', $dmin)); - $dmax = \DateTime::createFromFormat('Y-m-d H:i:s', sprintf('%s 23:59:59', $dmax)); - - //get user's sbas & collections selection from popbases - $selection = []; - $liste = $id_sbas = ''; - $i = 0; - foreach (array_fill_keys($popbases, 0) as $key => $val) { - $exp = explode('_', $key); - if ($exp[0] != $id_sbas && $i != 0) { - $selection[$id_sbas]['liste'] = $liste; - $liste = ''; - } - $selection[$exp[0]][] = $exp[1]; - $liste .= (empty($liste) ? '' : ',') . $exp[1]; - $id_sbas = $exp[0]; - $i ++; - } - //fill the last entry - $selection[$id_sbas]['liste'] = $liste; - - return $this->render('report/ajax_report_content.html.twig', [ - 'selection' => $selection, - 'anonymous' => $this->getConf()->get(['registry', 'modules', 'anonymous-report']), - 'ajax' => true, - 'dmin' => $dmin->format('Y-m-d H:i:s'), - 'dmax' => $dmax->format('Y-m-d H:i:s'), - ]); - } - - /** - * Display instance connexion report - * - * @param Request $request - * @return JsonResponse - */ - public function doReportConnexions(Request $request) - { - $cnx = new \module_report_connexion( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $conf = [ - 'user' => [$this->app->trans('phraseanet::utilisateurs'), 1, 1, 1, 1], - 'ddate' => [$this->app->trans('report:: date'), 1, 0, 1, 1], - 'ip' => [$this->app->trans('report:: IP'), 1, 0, 0, 0], - 'appli' => [$this->app->trans('report:: modules'), 1, 0, 0, 0], - 'fonction' => [$this->app->trans('report::fonction'), 1, 1, 1, 1], - 'activite' => [$this->app->trans('report::activite'), 1, 1, 1, 1], - 'pays' => [$this->app->trans('report::pays'), 1, 1, 1, 1], - 'societe' => [$this->app->trans('report::societe'), 1, 1, 1, 1] - ]; - - if ($request->request->get('printcsv') == 'on') { - $cnx->setHasLimit(false); - $cnx->setPrettyString(false); - - $this->doReport($request, $cnx, $conf); - - return $this->getCSVResponse($cnx, 'connections'); - } - - $report = $this->doReport($request, $cnx, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'] - ]); - } - - /** - * Display instance questions report - * - * @param Request $request - * @return JsonResponse - */ - public function doReportQuestions(Request $request) - { - $questions = new \module_report_question( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $conf = [ - 'user' => [$this->app->trans('report:: utilisateur'), 1, 1, 1, 1], - 'search' => [$this->app->trans('report:: question'), 1, 0, 1, 1], - 'ddate' => [$this->app->trans('report:: date'), 1, 0, 1, 1], - 'fonction' => [$this->app->trans('report:: fonction'), 1, 1, 1, 1], - 'activite' => [$this->app->trans('report:: activite'), 1, 1, 1, 1], - 'pays' => [$this->app->trans('report:: pays'), 1, 1, 1, 1], - 'societe' => [$this->app->trans('report:: societe'), 1, 1, 1, 1] - ]; - - if ($request->request->get('printcsv') == 'on') { - $questions->setHasLimit(false); - $questions->setPrettyString(false); - - $this->doReport($request, $questions, $conf); - - return $this->getCSVResponse($questions, 'questions'); - } - - $report = $this->doReport($request, $questions, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'] - ]); - } - - /** - * Display instance download report - * - * @param Request $request - * @return JsonResponse - */ - public function doReportDownloads(Request $request) - { - $download = new \module_report_download( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $conf_pref = []; - - foreach (\module_report::getPreff($this->app, $request->request->get('sbasid')) as $field) { - $conf_pref[strtolower($field)] = [$field, 0, 0, 0, 0]; - } - - $conf = array_merge([ - 'user' => [$this->app->trans('report:: utilisateurs'), 1, 1, 1, 1], - 'ddate' => [$this->app->trans('report:: date'), 1, 0, 1, 1], - 'record_id' => [$this->app->trans('report:: record id'), 1, 1, 1, 1], - 'final' => [$this->app->trans('phrseanet:: sous definition'), 1, 0, 1, 1], - 'coll_id' => [$this->app->trans('report:: collections'), 1, 0, 1, 1], - 'comment' => [$this->app->trans('report:: commentaire'), 1, 0, 0, 0], - 'fonction' => [$this->app->trans('report:: fonction'), 1, 1, 1, 1], - 'activite' => [$this->app->trans('report:: activite'), 1, 1, 1, 1], - 'pays' => [$this->app->trans('report:: pays'), 1, 1, 1, 1], - 'societe' => [$this->app->trans('report:: societe'), 1, 1, 1, 1] - ], $conf_pref); - - if ($request->request->get('printcsv') == 'on') { - $download->setHasLimit(false); - $download->setPrettyString(false); - - $this->doReport($request, $download, $conf); - - $r = $this->getCSVResponse($download, 'download'); - - return $r; - } - - $report = $this->doReport($request, $download, $conf); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'] - ]); - } - - /** - * Display instance document report - * - * @param Request $request - * @return JsonResponse - */ - public function doReportDocuments(Request $request) - { - $document = new \module_report_download( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $conf_pref = []; - - foreach (\module_report::getPreff($this->app, $request->request->get('sbasid')) as $field) { - $conf_pref[$field] = array($field, 0, 0, 0, 0); - } - - $conf = array_merge([ - 'telechargement' => [$this->app->trans('report:: telechargements'), 1, 0, 0, 0], - 'record_id' => [$this->app->trans('report:: record id'), 1, 1, 1, 0], - 'final' => [$this->app->trans('phraseanet:: sous definition'), 1, 0, 1, 1], - 'file' => [$this->app->trans('report:: fichier'), 1, 0, 0, 1], - 'mime' => [$this->app->trans('report:: type'), 1, 0, 1, 1], - 'size' => [$this->app->trans('report:: taille'), 1, 0, 1, 1] - ], $conf_pref); - - if ($request->request->get('printcsv') == 'on') { - $document->setHasLimit(false); - $document->setPrettyString(false); - - $this->doReport($request, $document, $conf, 'record_id'); - - $r = $this->getCSVResponse($document, 'documents'); - - return $r; - } - - $report = $this->doReport($request, $document, $conf, 'record_id'); - - if ($report instanceof Response) { - return $report; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => true - ]), - 'display_nav' => $report['display_nav'], // do we display the prev and next button ? - 'next' => $report['next_page'], //Number of the next page - 'prev' => $report['previous_page'], //Number of the previoous page - 'page' => $report['page'], //The current page - 'filter' => ((sizeof($report['filter']) > 0) ? serialize($report['filter']) : ''), //the serialized filters - 'col' => $report['active_column'], //all the columns where a filter is applied - 'limit' => $report['nb_record'] - ]); - } - - /** - * Display information about client (browser, resolution etc ...) - * - * @param Request $request - * @return JsonResponse - */ - public function doReportClients(Request $request) - { - $nav = new \module_report_nav( - $this->app, - $request->request->get('dmin'), - $request->request->get('dmax'), - $request->request->get('sbasid'), - $request->request->get('collection') - ); - - $conf_nav = [ - 'nav' => [$this->app->trans('report:: navigateur'), 0, 1, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'pourcent' => [$this->app->trans('report:: pourcentage'), 0, 0, 0, 0] - ]; - - $conf_combo = [ - 'combo' => [$this->app->trans('report:: navigateurs et plateforme'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'pourcent' => [$this->app->trans('report:: pourcentage'), 0, 0, 0, 0] - ]; - $conf_os = [ - 'os' => [$this->app->trans('report:: plateforme'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'pourcent' => [$this->app->trans('report:: pourcentage'), 0, 0, 0, 0] - ]; - $conf_res = [ - 'res' => [$this->app->trans('report:: resolution'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'pourcent' => [$this->app->trans('report:: pourcentage'), 0, 0, 0, 0] - ]; - $conf_mod = [ - 'appli' => [$this->app->trans('report:: module'), 0, 0, 0, 0], - 'nb' => [$this->app->trans('report:: nombre'), 0, 0, 0, 0], - 'pourcent' => [$this->app->trans('report:: pourcentage'), 0, 0, 0, 0] - ]; - - $report = [ - 'nav' => $nav->buildTabNav($conf_nav), - 'os' => $nav->buildTabOs($conf_os), - 'res' => $nav->buildTabRes($conf_res), - 'mod' => $nav->buildTabModule($conf_mod), - 'combo' => $nav->buildTabCombo($conf_combo) - ]; - - if ($request->request->get('printcsv') == 'on') { - $result = []; - - $result[] = array_keys($conf_nav); - foreach ($report['nav']['result'] as $row) { - $result[] = array_values($row); - }; - $result[] = array_keys($conf_os); - foreach ($report['os']['result'] as $row) { - $result[] = array_values($row); - }; - $result[] = array_keys($conf_res); - foreach ($report['res']['result'] as $row) { - $result[] = array_values($row); - }; - $result[] = array_keys($conf_mod); - foreach ($report['mod']['result'] as $row) { - $result[] = array_values($row); - }; - $result[] = array_keys($conf_combo); - foreach ($report['combo']['result'] as $row) { - $result[] = array_values($row); - }; - - /** @var Exporter $exporter */ - $exporter = $this->app['csv.exporter']; - $filename = sprintf('report_export_info_%s.csv', date('Ymd')); - $response = new CSVFileResponse($filename, function () use ($exporter, $result) { - $exporter->export('php://output', $result); - }); - - return $response; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($report['report']) ? $report['report'] : $report, - 'is_infouser' => false, - 'is_nav' => true, - 'is_groupby' => false, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => false - ]); - } - - /** - * Set Report configuration according to request parameters - * - * @param Request $request A request instance - * @param \module_report $report A report instance - * @param Array $conf A report column configuration - * @param Boolean $what Whether to group on a particular field or not - * @return Array - */ - private function doReport(Request $request, \module_report $report, $conf, $what = false) - { - if ($this->getConf()->get(['registry', 'modules', 'anonymous-report']) == true) { - if (isset($conf['user'])) { - unset($conf['user']); - } - - if (isset($conf['ip'])) { - unset($conf['ip']); - } - } - - //save initial conf - $base_conf = $conf; - //format conf according user preferences - if ('' !== $columnsList = $request->request->get('list_column', '')) { - $new_conf = $conf; - $columns = explode(',', $columnsList); - - foreach (array_keys($conf) as $col) { - if (!in_array($col, $columns)) { - unset($new_conf[$col]); - } - } - - $conf = $new_conf; - } - - //display content of a table column when user click on it - if ($request->request->get('conf') == 'on') { - return $this->app->json(['liste' => $this->render('report/listColumn.html.twig', [ - 'conf' => $base_conf - ]), 'title' => $this->app->trans('configuration')]); - } - - //set order - if (('' !== $order = $request->request->get('order', '')) && ('' !== $field = $request->request->get('champ', ''))) { - $report->setOrder($field, $order); - } - - //work on filters - $mapColumnTitleToSqlField = $report->getTransQueryString(); - - $currentfilter = []; - - if ('' !== $serializedFilter = $request->request->get('liste_filter', '')) { - $currentfilter = @unserialize(urldecode($serializedFilter)); - } - - $filter = new \module_report_filter($this->app, $currentfilter, $mapColumnTitleToSqlField); - - if ('' !== $filterColumn = $request->request->get('filter_column', '')) { - $field = current(explode(' ', $filterColumn)); - $value = $request->request->get('filter_value', ''); - - if ($request->request->get('liste') == 'on') { - return $this->app->json(['diag' => $this->render('report/colFilter.html.twig', [ - 'result' => $report->colFilter($field), - 'field' => $field - ]), 'title' => $this->app->trans('filtrer les resultats sur la colonne %colonne%', ['%colonne%' => $field])]); - } - - if ($field === $value) { - $filter->removeFilter($field); - } else { - $filter->addFilter($field, '=', $value); - } - } - - //set new request filter if user asking for them - if ($request->request->get('precise') == 1) { - $filter->addFilter('xml', 'LIKE', $request->request->get('word', '')); - } elseif ($request->request->get('precise') == 2) { - $filter->addFilter('record_id', '=', $request->request->get('word', '')); - } - - //set filters to current report - $report->setFilter($filter->getTabFilter()); - $report->setActiveColumn($filter->getActiveColumn()); - $report->setPostingFilter($filter->getPostingFilter()); - - // display a new arraywhere results are group - if ('' !== $groupby = $request->request->get('groupby', '')) { - - $report->setConfig(false); - $groupby = current(explode(' ', $groupby)); - - $reportArray = $report->buildReport(false, $groupby); - - if (count($reportArray['allChamps']) > 0 && count($reportArray['display']) > 0) { - $groupField = isset($reportArray['display'][$reportArray['allChamps'][0]]['title']) ? $reportArray['display'][$reportArray['allChamps'][0]]['title'] : ''; - } else { - $groupField = isset($conf[strtolower($groupby)]['title']) ? $conf[strtolower($groupby)]['title'] : ''; - } - - return $this->app->json([ - 'rs' => $this->render('report/ajax_data_content.html.twig', [ - 'result' => isset($reportArray['report']) ? $reportArray['report'] : $reportArray, - 'is_infouser' => false, - 'is_nav' => false, - 'is_groupby' => true, - 'is_plot' => false, - 'is_doc' => false - ]), - 'display_nav' => false, - 'title' => $this->app->trans('Groupement des resultats sur le champ %name%', ['%name%' => $groupField]) - ]); - } - - //set Limit - if ($report->getEnableLimit() - && ('' !== $page = $request->request->get('page', '')) - && ('' !== $limit = $request->request->get('limit', ''))) { - $report->setLimit($page, $limit); - } else { - $report->setLimit(false, false); - } - - //time to build our report - if (false === $what) { - $reportArray = $report->buildReport($conf); - } else { - $reportArray = $report->buildReport($conf, $what, $request->request->get('tbl', false)); - } - - return $reportArray; - } - - /** - * Prefix the method to call with the controller class name - * - * @param string $method The method to call - * @return string - */ - private function call($method) - { - return sprintf('%s::%s', __CLASS__, $method); - } - - private function getCSVResponse(\module_report $report, $type) - { - // set headers - $headers = []; - foreach (array_keys($report->getDisplay()) as $k) { - $headers[$k] = $k; - } - // set headers as first row - $result = $report->getResult(); - - array_unshift($result, $headers); - - $collection = new CallbackCollection($result, function ($row) use ($headers) { - // restrict fields to the displayed ones - // return array_map("strip_tags", array_intersect_key($row, $report->getDisplay())); - $ret = array(); - foreach($headers as $f) { - $ret[$f] = array_key_exists($f, $row) ? strip_tags($row[$f]) : ''; - } - return $ret; - }); - - $filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd')); - - /** @var Exporter $exporter */ - $exporter = $this->app['csv.exporter']; - $cb = function () use ($exporter, $collection) { - $exporter->export('php://output', $collection); - }; - - $response = new CSVFileResponse($filename, $cb); - - return $response; - } } diff --git a/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php b/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php index 4b325ec3c3..4cbec52624 100644 --- a/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php +++ b/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php @@ -88,8 +88,6 @@ class ControllerProviderServiceProvider implements ServiceProviderInterface Prod\Upload::class => [], Prod\UsrLists::class => [], Prod\WorkZone::class => [], - Report\Activity::class => [], - Report\Information::class => [], Report\Root::class => [], Root\Account::class => [], Root\Developers::class => [], diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Report/Activity.php b/lib/Alchemy/Phrasea/ControllerProvider/Report/Activity.php deleted file mode 100644 index 5baf14bf2a..0000000000 --- a/lib/Alchemy/Phrasea/ControllerProvider/Report/Activity.php +++ /dev/null @@ -1,81 +0,0 @@ -share(function (PhraseaApplication $app) { - return new ActivityController($app); - }); - } - - public function boot(Application $app) - { - // no-op - } - - public function connect(Application $app) - { - $controllers = $this->createAuthenticatedCollection($app); - $firewall = $this->getFirewall($app); - - $controllers->before(function () use ($firewall) { - $firewall->requireAccessToModule('report'); - }); - - $controllers->post('/users/connexions', 'controller.report.activity:doReportConnexionsByUsers') - ->bind('report_activity_users_connexions'); - - $controllers->post('/users/downloads', 'controller.report.activity:doReportDownloadsByUsers') - ->bind('report_activity_users_downloads');; - - $controllers->post('/questions/best-of', 'controller.report.activity:doReportBestOfQuestions') - ->bind('report_activity_questions_bestof'); - - $controllers->post('/questions/no-best-of', 'controller.report.activity:doReportNoBestOfQuestions') - ->bind('report_activity_questions_nobestof'); - - $controllers->post('/instance/hours', 'controller.report.activity:doReportSiteActiviyPerHours') - ->bind('report_activity_instance_hours'); - - $controllers->post('/instance/days', 'controller.report.activity:doReportSiteActivityPerDays') - ->bind('report_activity_instance_days'); - - $controllers->post('/documents/pushed', 'controller.report.activity:doReportPushedDocuments') - ->bind('report_activity_documents_pushed'); - - $controllers->post('/documents/added', 'controller.report.activity:doReportAddedDocuments') - ->bind('report_activity_documents_added'); - - $controllers->post('/documents/edited', 'controller.report.activity:doReportEditedDocuments') - ->bind('report_activity_documents_edited'); - - $controllers->post('/documents/validated', 'controller.report.activity:doReportValidatedDocuments') - ->bind('report_activity_documents_validated'); - - $controllers->post('/documents/sent', 'controller.report.activity:doReportSentDocuments') - ->bind('report_activity_documents_sent'); - - return $controllers; - } -} diff --git a/lib/Alchemy/Phrasea/ControllerProvider/Report/Information.php b/lib/Alchemy/Phrasea/ControllerProvider/Report/Information.php deleted file mode 100644 index e52ee37ea1..0000000000 --- a/lib/Alchemy/Phrasea/ControllerProvider/Report/Information.php +++ /dev/null @@ -1,57 +0,0 @@ -share(function (PhraseaApplication $app) { - return new InformationController($app); - }); - } - - public function boot(Application $app) - { - // no-op - } - - public function connect(Application $app) - { - $controllers = $this->createAuthenticatedCollection($app); - $firewall = $this->getFirewall($app); - - $controllers->before(function () use ($firewall) { - $firewall->requireAccessToModule('report'); - }); - - $controllers->post('/user', 'controller.report.information:doReportInformationUser') - ->bind('report_infomations_user'); - - $controllers->post('/browser', 'controller.report.information:doReportInformationBrowser') - ->bind('report_infomations_browser'); - - $controllers->post('/document', 'controller.report.information:doReportInformationDocument') - ->bind('report_infomations_document'); - - return $controllers; - } -} diff --git a/lib/Alchemy/Phrasea/Report/Controller/ProdReportController.php b/lib/Alchemy/Phrasea/Report/Controller/ProdReportController.php index fdd4ec2b67..90e9aa807a 100644 --- a/lib/Alchemy/Phrasea/Report/Controller/ProdReportController.php +++ b/lib/Alchemy/Phrasea/Report/Controller/ProdReportController.php @@ -9,6 +9,7 @@ */ namespace Alchemy\Phrasea\Report\Controller; +use Alchemy\Phrasea\Controller\Controller; use Alchemy\Phrasea\Report\Report; use Alchemy\Phrasea\Report\ReportConnections; use Alchemy\Phrasea\Report\ReportDownloads; @@ -16,10 +17,11 @@ use Alchemy\Phrasea\Report\ReportFactory; use Alchemy\Phrasea\Report\ReportRecords; use Doctrine\Common\Collections\ArrayCollection; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\StreamedResponse; -class ProdReportController +class ProdReportController extends Controller { private static $mapFromExtension = [ 'csv' => [ @@ -55,6 +57,19 @@ class ProdReportController $this->acl = $acl; } + /** + * route prod/report/connections + * + * @param Request $request + * @return Response + */ + public function indexAction(Request $request) + { + return new Response($this->render('prod/report/index.html.twig', [ + 'truc' => "hello" + ])); + } + /** * route prod/report/connections * diff --git a/lib/Alchemy/Phrasea/Report/ControllerProvider/ProdReportControllerProvider.php b/lib/Alchemy/Phrasea/Report/ControllerProvider/ProdReportControllerProvider.php index 4a1a208b00..b5d7bb5839 100644 --- a/lib/Alchemy/Phrasea/Report/ControllerProvider/ProdReportControllerProvider.php +++ b/lib/Alchemy/Phrasea/Report/ControllerProvider/ProdReportControllerProvider.php @@ -58,20 +58,27 @@ class ProdReportControllerProvider implements ControllerProviderInterface, Servi public function connect(Application $app) { $controllers = $this->createAuthenticatedCollection($app); + + $controllers + ->get('/', 'controller.prod.report:indexAction') + ; $controllers ->get('/connections/{sbasId}/', 'controller.prod.report:connectionsAction') ->assert('sbasId', '\d+') + ->bind('report2_connections') ; $controllers ->get('/downloads/{sbasId}/', 'controller.prod.report:downloadsAction') ->assert('sbasId', '\d+') + ->bind('report2_downloads') ; $controllers ->get('/records/{sbasId}/', 'controller.prod.report:recordsAction') ->assert('sbasId', '\d+') + ->bind('report2_records') ; return $controllers; diff --git a/lib/Alchemy/Phrasea/Report/ReportRecords.php b/lib/Alchemy/Phrasea/Report/ReportRecords.php index b100281c4e..7e4eb1c7d7 100644 --- a/lib/Alchemy/Phrasea/Report/ReportRecords.php +++ b/lib/Alchemy/Phrasea/Report/ReportRecords.php @@ -72,8 +72,6 @@ class ReportRecords extends Report . " AND r.record_id >= " . $row['from'] . " AND r.record_id <= " . $row['to'] . "\n" . "GROUP BY `record_id`\n"; - // file_put_contents("/tmp/phraseanet-log.txt", sprintf("%s (%d) %s\n", __FILE__, __LINE__, var_export($sql, true)), FILE_APPEND); - $stmt = $this->databox->get_connection()->executeQuery($sql, []); $rows = $stmt->fetchAll(); $stmt->closeCursor(); diff --git a/resources/gulp/components/report.js b/resources/gulp/components/report.js index 12fbea870a..f67944a667 100644 --- a/resources/gulp/components/report.js +++ b/resources/gulp/components/report.js @@ -8,13 +8,7 @@ gulp.task('copy-report-images', function(){ .pipe(gulp.dest( config.paths.build + 'report/images')); }); -gulp.task('build-report-print-css', function(){ - return utils.buildCssGroup([ - config.paths.src + 'report/styles/main-print.scss' - ], 'print', 'report/css/', debugMode); -}); - -gulp.task('build-report-css', ['build-report-print-css'], function(){ +gulp.task('build-report-css', function(){ return utils.buildCssGroup([ config.paths.src + 'report/styles/main.scss' ], 'report', 'report/css/', debugMode); @@ -22,10 +16,6 @@ gulp.task('build-report-css', ['build-report-print-css'], function(){ gulp.task('build-report-js', function(){ var reportGroup = [ - config.paths.src + 'report/js/jquery.print.js', - config.paths.src + 'report/js/jquery.cluetip.js', - config.paths.src + 'report/js/jquery.nicoslider.js', - config.paths.src + 'report/js/jquery.gvChart-0.1.js', config.paths.src + 'report/js/report.js' ]; return utils.buildJsGroup(reportGroup, 'report', 'report/js', debugMode); diff --git a/resources/locales/messages.de.xlf b/resources/locales/messages.de.xlf index 2a44a68d72..055b51ae1b 100644 --- a/resources/locales/messages.de.xlf +++ b/resources/locales/messages.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. @@ -289,11 +289,6 @@ %total% Ergebnisse Controller/Prod/QueryController.php - - %total_count% results - %total_count% Ergebnisse - web/report/generate_tab.html.twig - %user% a envoye son rapport de validation de %title% %user% hat seinen Bestätigungsbericht von %title% gesendet @@ -409,7 +404,6 @@ 1 Ergebnis WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig - web/report/generate_tab.html.twig 10 tags maximum @@ -1057,7 +1051,7 @@ Aperture Blende - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1269,12 +1263,12 @@ Audio Samplerate Audio Samplerate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1539,15 +1533,10 @@ Felder web/admin/tree.html.twig - - CSV export - CSV Export - web/report/generate_tab.html.twig - Camera Model Kameramodell - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1791,11 +1780,6 @@ die ganze Spalte markieren web/admin/index.html.twig - - Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report - Markieren Sie die Felder, die Sie im Report sehen möchten - web/report/listColumn.html.twig - Code d'acces Zugangscode @@ -1848,7 +1832,7 @@ Colorspace Colorspace - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -2460,7 +2444,8 @@ Alle abwählen actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Design of personalization logo section @@ -3287,11 +3272,6 @@ Filtern web/admin/users.html.twig - - Filtrer - Filtern - web/report/generate_tab.html.twig - First Name Vorname @@ -3318,7 +3298,7 @@ FlashFired FlashFired - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3377,7 +3357,7 @@ FrameRate FrameRate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -3409,16 +3389,6 @@ Allgemeine Einstellungen web/admin/dashboard.html.twig - - Generate - Erstellen - web/report/report_layout_child.html.twig - - - Generate dashboard - Dashboard erstellen - web/report/report_layout_child.html.twig - Generates a flexpaper flash file Erstellt eine Flexpaper Flash Datei @@ -3535,17 +3505,6 @@ Großartig Controller/Root/LoginController.php - - Groupement des resultats sur le champ %name% - Ergebnisse Gruppierung auf Feld %name% - Controller/Report/RootController.php - Controller/Report/ActivityController.php - - - Grouper - Gruppieren - web/report/generate_tab.html.twig - Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson" Gruppieren Sie 2 oder mehrere Wörter mit Anführungszeichen : "Michael Jackson" @@ -3627,7 +3586,7 @@ ISO ISO - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php ISO sensibility @@ -4299,7 +4258,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4826,7 +4785,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -5441,11 +5400,6 @@ WorkZone/Browser/Basket.html.twig WorkZone/Browser/Results.html.twig - - Receiver - Empfänger - Controller/Report/ActivityController.php - Reception d'un rapport de validation Empfang eines Bestätigungsberichtes @@ -5656,11 +5610,6 @@ Report admin/fields/templates.html.twig - - Report generation may take a long time to generate, depending on the number of collections and the period selected. - Report Erzeugung kann lange dauern, anhängig von der Anzahl von Kollektionen und der ausgewählten Zeit - web/report/report_layout_child.html.twig - Request access Zugriff anfordern @@ -5979,7 +5928,8 @@ Alle auswählen actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Select all collections @@ -6036,11 +5986,6 @@ Auf Twitter teilen prod/Share/record.html.twig - - Sent - gesendet - web/report/report_layout_child.html.twig - Sent documents (mail) versendete Dokumente (E-Mail) @@ -6133,7 +6078,7 @@ Shutter speed Verschlusszeit - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -6889,12 +6834,6 @@ prod/upload/upload-flash.html.twig prod/upload/upload.html.twig - - Trier - Ordnen - web/report/generate_tab.html.twig - web/report/generate_tab.html.twig - Trier par Sortieren nach @@ -7346,7 +7285,7 @@ Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -7630,6 +7569,12 @@ Meta schreiben web/admin/subdefs.html.twig + + YYYY-MM-DD + YYYY-MM-DD + web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig + YYYY/MM/DD YYYY/MM/DD @@ -9121,7 +9066,7 @@ web/common/dialog_export.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig @@ -9201,7 +9146,7 @@ web/thesaurus/export-topics.html.twig web/lightbox/sc_note.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig boutton::generer @@ -9409,7 +9354,7 @@ admin/statusbit/edit.html.twig web/admin/dashboard.html.twig web/admin/setup.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig web/account/account.html.twig web/account/access.html.twig @@ -9521,11 +9466,6 @@ web/admin/subdefs.html.twig web/admin/subdefs.html.twig - - cocher tout - Alles aktivieren - web/report/listColumn.html.twig - collection.label.unknown Unbekannte Kollektion @@ -9542,12 +9482,6 @@ prod/orders/order_item.html.twig web/common/dialog_export.html.twig - - configuration - Konfiguration - Controller/Report/RootController.php - Controller/Report/ActivityController.php - copyClipboardLabel in der Zwischenablage kopieren @@ -9801,14 +9735,6 @@ Controller/Prod/ToolsController.php Controller/Prod/ToolsController.php - - filtrer les resultats sur la colonne %colonne% - die Ergebnisse auf die Spalte %colonne% filtern - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - flash Flash @@ -9878,12 +9804,6 @@ Änderungen wurden hergestellt admin/databox/databox.html.twig - - from - von - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - help::help-section-bullet: check-spelling help::help-section-bullet: check-spelling @@ -10719,7 +10639,6 @@ Unterauflösung module/report/filter.php classes/module/report.php - Controller/Report/RootController.php phraseanet:: thesaurus @@ -10925,16 +10844,6 @@ phraseanet::utilisateurs Benutzer module/report/filter.php - Controller/Report/RootController.php - - - phrseanet:: sous definition - Dokumenttyp - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php preview @@ -11203,17 +11112,17 @@ prod::facet:base_label Datenbanken - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:collection_label Kollektionen - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:doctype_label Dokumenttyp - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -11631,108 +11540,48 @@ ohne Titel classes/record/adapter.php - - report :: aucun resultat trouve - keine Filter - web/report/generate_tab.html.twig - - - report :: configurer le tableau - Tabelle konfigurieren - web/report/generate_tab.html.twig - - - report :: filtrer - filter - web/report/generate_tab.html.twig - - - report :: grouper - Gruppe - web/report/generate_tab.html.twig - - - report :: imprimer le tableau - Tabelle drucken - web/report/generate_tab.html.twig - - - report:: (connexions) Globales - Allgemeine - web/report/report_layout_child.html.twig - - - report:: (connexions) OS et navigateurs - pro Plattform und Webbrowser - web/report/report_layout_child.html.twig - - - report:: (connexions) Par utilisateurs - pro Benutzer - web/report/report_layout_child.html.twig - - - report:: (telechargement) Global - Allgemeine - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par documents sur la base - pro Dokument, auf der Datenbank - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par jours base par base - täglich - web/report/report_layout_child.html.twig - report:: 1 - Periode 1 - Zeit - web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig - - report:: 2 - Bases - 2 - Datenbanken - web/report/form_date_and_base.html.twig + + report:: 2 - Base + report:: 2 - Base + web/report/form_date_and_base.html.twig + + + report:: 3 - Collections + report:: 3 - Collections + web/report/form_date_and_base.html.twig report:: 3 - Type de report 3 - Bericht Typ - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + + + report:: 4 - Fields + report:: 4 - Fields + web/report/report_layout_child.html.twig report:: Au (date) bis - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig + web/report/form_date_and_base.html.twig report:: Connexion Verbindungen classes/module/report.php - web/report/report_layout.html.twig - web/report/ajax_data_content.html.twig - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig + web/report/report_layout.html.twig + web/report/all_content.html.twig - - - - web/report/ajax_dashboard_content_child.html.twig - - - report:: Dashboard - Dashboard - web/report/report_layout.html.twig - web/report/ajax_dashboard_content.html.twig - web/report/ajax_report_dashboard.html.twig + + report:: Databox content + report:: Databox content + web/report/report_layout.html.twig report:: Detail des connexions @@ -11747,30 +11596,17 @@ report:: Du (date) von - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig - - - report:: Enlever le filtre - Titel - web/report/colFilter.html.twig - - - report:: Grouper par - von - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig report:: Heures Stunden - web/report/all_content.html.twig + web/report/all_content.html.twig report:: IP IP module/report/filter.php - Controller/Report/RootController.php report:: Information sur l'enregistrement numero %number% @@ -11792,97 +11628,37 @@ Information über die Benutzer entsprechend %critere% module/report/nav.php - - report:: Les questions les plus posees - Meist gestellten Fragen - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig + + report:: Phraseanet report + report:: Phraseanet report + web/report/report_layout.html.twig report:: Plateforme Plattform module/report/nav.php - - report:: Utilisateurs les plus actifs - Aktivsten Benutzer - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: Volumetrie des questions posees sur %home_title% - Meist Suchabfragen in %home_title% - web/report/dashboard_macro.html.twig - report:: activite Aktivität classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: activite document ajoute - Hinzugefügte Dokumente - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite document edite - Bearbeitete Dokumente - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite du site - Tätigkeit der Webseite - web/report/report_layout_child.html.twig - web/report/report_layout.html.twig report:: activite par heure Aktivität pro Stunde module/report/activity.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite par jour - Aktivität pro Tag - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig - - - report:: adresse - Addresse - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: ajoute - hinzugefügt - web/report/report_layout_child.html.twig report:: collections Kollektionen module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: commentaire Kommentar module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: copyright @@ -11895,160 +11671,52 @@ module/report/filter.php classes/module/report.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: document - Dokument - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: document ajoute hinzugefügte Dokumente module/report/add.php - - report:: documents les plus telecharges - Meist heruntergeladene Dokumente - web/report/ajax_dashboard_content_child.html.twig - - - report:: edite - bearbeitet - web/report/report_layout_child.html.twig - report:: edited documents Bearbeitete Dokumente module/report/edit.php - - report:: email - E Mail - Controller/Report/InformationController.php - Controller/Report/InformationController.php - report:: fichier Datei classes/module/report.php - Controller/Report/RootController.php report:: fonction Beruf classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: historique des connexions - Historie von Verbindungen - Controller/Report/InformationController.php - - - report:: historique des questions - Suchabfragen Historie - Controller/Report/InformationController.php - - - report:: historique des telechargements - Historie der downloads - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: identifiant - Benutzer Id - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: jour Tag - Controller/Report/ActivityController.php - web/report/all_content.html.twig - - - report:: module - Module - Controller/Report/RootController.php + web/report/all_content.html.twig report:: modules Module module/report/nav.php module/report/filter.php - Controller/Report/RootController.php - Controller/Report/InformationController.php report:: navigateur Webbrowser module/report/nav.php - Controller/Report/RootController.php report:: navigateurs et plateforme Webbrowser und Plattformen module/report/nav.php - Controller/Report/RootController.php - - - report:: nom - Name - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: nombre Anzahl classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de documents - Anzahl von Dokumenten - Controller/Report/ActivityController.php - - - report:: nombre de preview - Anzahl von Miniaturansichten - Controller/Report/ActivityController.php - - - report:: nombre de reponses - Durchschnittszahl der Ergebnisse - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de vue - Anzahl von Ansichten - web/report/ajax_dashboard_content_child.html.twig report:: non-renseigne @@ -12068,8 +11736,6 @@ module/report/validate.php module/report/edit.php module/report/sent.php - web/report/colFilter.html.twig - web/report/colFilter.html.twig report:: page d'accueil @@ -12083,68 +11749,15 @@ von %user_infos% prod/preview/short_history.html.twig - - report:: par utilisateurs - Allgemein - web/report/report_layout_child.html.twig - report:: pays Staat classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: plateforme - Plattform - Controller/Report/RootController.php - - - report:: poids - Größe - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: poids document - Gewicht von heruntergeladenen Dokumenten - web/report/ajax_dashboard_content_child.html.twig - - - report:: poids preview - Gewicht von heruntergeladenen Unterauflösungen - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: pourcentage % classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - - - report:: preview - Unterauflösungen - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: preview les plus telecharges - Meist heruntergeladene Ansichten - web/report/ajax_dashboard_content_child.html.twig - - - report:: pushe - Pushed - web/report/report_layout_child.html.twig report:: pushed documents @@ -12157,12 +11770,6 @@ module/report/question.php module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: questions @@ -12178,55 +11785,27 @@ report:: questions sans reponses Anfragen ohne Ergebnis module/report/activity.php - web/report/report_layout_child.html.twig report:: record id record id module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: recordid - recordid - web/report/report_layout_child.html.twig report:: resolution Bildschirmauflösung module/report/nav.php - Controller/Report/RootController.php - - - report:: site - Website - web/report/ajax_dashboard_content_child.html.twig - - - report:: site d'ou les photo sont les plus consultees - Website, wo die Dokumente am häufigsten angesehen sind (Referer) - web/report/ajax_dashboard_content_child.html.twig report:: societe Unternehmen classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig report:: taille Gesamtzahl classes/module/report.php - Controller/Report/RootController.php report:: telechargement @@ -12237,54 +11816,17 @@ report:: telechargements Download module/report/download.php - Controller/Report/RootController.php - web/report/report_layout.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: telechargements document - Heruntergeladene Dokumente - web/report/ajax_dashboard_content_child.html.twig + web/report/report_layout.html.twig report:: telechargements par jour Download pro Tag module/report/activity.php - - report:: telechargements preview - Heruntergeladene Unterauflösungen - web/report/ajax_dashboard_content_child.html.twig - - - report:: telephone - Telefon - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: titre - Titel - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: total des telechargements - Allgemeine downloads - Controller/Report/ActivityController.php - - - report:: toutes les questions - häufigsten Suchabfragen - web/report/report_layout_child.html.twig - report:: type Bildschirmtyp classes/module/report.php - Controller/Report/RootController.php report:: type d'action @@ -12295,31 +11837,12 @@ report:: utilisateur Benutzer classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - - - report:: utilisateurs - Benutzer - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: validated documents Bestätigte Dokumente module/report/validate.php - - report:: valide - Bestätigt - web/report/report_layout_child.html.twig - report:: visualiseur cooliris Cooliris Viewer @@ -12332,11 +11855,6 @@ Kollektion Verschiebung zu : %coll_name% prod/preview/short_history.html.twig - - report::Connexion - Verbindungen - web/report/ajax_dashboard_content_child.html.twig - report::Connexions Verbindungen @@ -12360,8 +11878,7 @@ report::Heures Module - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig report::Impression des formats : %format% @@ -12376,17 +11893,17 @@ report::Nombre de connexions Verbindungen - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document ajoute Anzahl von hinzugefügten Dokumenten - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document edite Anzahl von bearbeiteten Dokumenten - web/report/all_content.html.twig + web/report/all_content.html.twig report::Publication de %dest% @@ -12423,51 +11940,32 @@ report::activite Aktivität module/report/filter.php - Controller/Report/RootController.php report::ajout du documentt Dokument hinzugefügt prod/preview/short_history.html.twig - - report::aucune precision - keine Filter - web/report/report_layout_child.html.twig - report::fonction Funktion module/report/filter.php - Controller/Report/RootController.php - - - report::la description contient - Die Beschreibung beinhaltet - web/report/report_layout_child.html.twig report::pays Land module/report/filter.php - Controller/Report/RootController.php report::societe Unternehmen module/report/filter.php - Controller/Report/RootController.php report::supression du document Dokument löschen prod/preview/short_history.html.twig - - report::version - Version - Controller/Report/InformationController.php - reportage Bericht @@ -13386,17 +12884,6 @@ actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig - - to - to - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - tout decocher - Alles deaktivieren - web/report/listColumn.html.twig - tout le monde Alle @@ -13496,7 +12983,7 @@ veuillez choisir au minimum une collection Mindestens eine Kollektion muss ausgewählt werden - web/report/all_content.html.twig + web/report/all_content.html.twig video diff --git a/resources/locales/messages.en.xlf b/resources/locales/messages.en.xlf index 79817d23f9..3ada712ed0 100644 --- a/resources/locales/messages.en.xlf +++ b/resources/locales/messages.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. @@ -289,11 +289,6 @@ %total% responses Controller/Prod/QueryController.php - - %total_count% results - %total_count% results - web/report/generate_tab.html.twig - %user% a envoye son rapport de validation de %title% %user% has sent his feedback report for %title% @@ -409,7 +404,6 @@ 1 result WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig - web/report/generate_tab.html.twig 10 tags maximum @@ -1057,7 +1051,7 @@ Aperture Aperture - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1269,12 +1263,12 @@ Audio Samplerate Audio Samplerate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1539,15 +1533,10 @@ Fields setup web/admin/tree.html.twig - - CSV export - CSV export - web/report/generate_tab.html.twig - Camera Model Camera model - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1791,11 +1780,6 @@ Check all boxes from column web/admin/index.html.twig - - Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report - Select the columns to be displayed in report - web/report/listColumn.html.twig - Code d'acces Access code @@ -1848,7 +1832,7 @@ Colorspace Colorspace - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -2460,7 +2444,8 @@ Deselect all actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Design of personalization logo section @@ -3287,11 +3272,6 @@ Filter web/admin/users.html.twig - - Filtrer - Filter - web/report/generate_tab.html.twig - First Name First name @@ -3318,7 +3298,7 @@ FlashFired FlashFired - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3377,7 +3357,7 @@ FrameRate FrameRate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -3409,16 +3389,6 @@ General settings web/admin/dashboard.html.twig - - Generate - Generate - web/report/report_layout_child.html.twig - - - Generate dashboard - Generate dashboard - web/report/report_layout_child.html.twig - Generates a flexpaper flash file Creates a flexpaper flash file @@ -3535,17 +3505,6 @@ Great Controller/Root/LoginController.php - - Groupement des resultats sur le champ %name% - Group results on the field %name% - Controller/Report/RootController.php - Controller/Report/ActivityController.php - - - Grouper - Regroup - web/report/generate_tab.html.twig - Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson" Group 2 or more words with quotes: "Michael Jackson" @@ -3627,7 +3586,7 @@ ISO ISO - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php ISO sensibility @@ -4299,7 +4258,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4826,7 +4785,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -5441,11 +5400,6 @@ WorkZone/Browser/Basket.html.twig WorkZone/Browser/Results.html.twig - - Receiver - Recipient - Controller/Report/ActivityController.php - Reception d'un rapport de validation Incoming feedback report @@ -5656,11 +5610,6 @@ Report admin/fields/templates.html.twig - - Report generation may take a long time to generate, depending on the number of collections and the period selected. - Depending on the number of collections and the period selected, Report may take time to be generate. - web/report/report_layout_child.html.twig - Request access Access request @@ -5979,7 +5928,8 @@ Select all actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Select all collections @@ -6036,11 +5986,6 @@ Send to Twitter prod/Share/record.html.twig - - Sent - Sent - web/report/report_layout_child.html.twig - Sent documents (mail) Sent documents @@ -6133,7 +6078,7 @@ Shutter speed Shutter speed - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -6889,12 +6834,6 @@ prod/upload/upload-flash.html.twig prod/upload/upload.html.twig - - Trier - Sort - web/report/generate_tab.html.twig - web/report/generate_tab.html.twig - Trier par Sort by @@ -7346,7 +7285,7 @@ Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -7630,6 +7569,12 @@ Write Metadatas web/admin/subdefs.html.twig + + YYYY-MM-DD + YYYY-MM-DD + web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig + YYYY/MM/DD YYYY/MM/DD @@ -9121,7 +9066,7 @@ web/common/dialog_export.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig @@ -9201,7 +9146,7 @@ web/thesaurus/export-topics.html.twig web/lightbox/sc_note.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig boutton::generer @@ -9409,7 +9354,7 @@ admin/statusbit/edit.html.twig web/admin/dashboard.html.twig web/admin/setup.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig web/account/account.html.twig web/account/access.html.twig @@ -9521,11 +9466,6 @@ web/admin/subdefs.html.twig web/admin/subdefs.html.twig - - cocher tout - Select all - web/report/listColumn.html.twig - collection.label.unknown Unknown collection @@ -9542,12 +9482,6 @@ prod/orders/order_item.html.twig web/common/dialog_export.html.twig - - configuration - Configuration - Controller/Report/RootController.php - Controller/Report/ActivityController.php - copyClipboardLabel Copy to clipboard @@ -9801,14 +9735,6 @@ Controller/Prod/ToolsController.php Controller/Prod/ToolsController.php - - filtrer les resultats sur la colonne %colonne% - filter results on %colonne% column - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - flash flash @@ -9878,12 +9804,6 @@ Modifications done admin/databox/databox.html.twig - - from - from - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - help::help-section-bullet: check-spelling Check that there are no misspellings or typing errors. @@ -10720,7 +10640,6 @@ See documentation for more examples https://docs.phraseanet.com Subview module/report/filter.php classes/module/report.php - Controller/Report/RootController.php phraseanet:: thesaurus @@ -10926,16 +10845,6 @@ See documentation for more examples https://docs.phraseanet.com phraseanet::utilisateurs Users module/report/filter.php - Controller/Report/RootController.php - - - phrseanet:: sous definition - Document type - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php preview @@ -11204,17 +11113,17 @@ See documentation for more examples https://docs.phraseanet.com prod::facet:base_label Base - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:collection_label Collection - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:doctype_label Document type - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -11635,108 +11544,48 @@ It is possible to place several search areas Untitled classes/record/adapter.php - - report :: aucun resultat trouve - No Result - web/report/generate_tab.html.twig - - - report :: configurer le tableau - Setup table - web/report/generate_tab.html.twig - - - report :: filtrer - Filter - web/report/generate_tab.html.twig - - - report :: grouper - Group - web/report/generate_tab.html.twig - - - report :: imprimer le tableau - Print table - web/report/generate_tab.html.twig - - - report:: (connexions) Globales - All connections - web/report/report_layout_child.html.twig - - - report:: (connexions) OS et navigateurs - - web/report/report_layout_child.html.twig - - - report:: (connexions) Par utilisateurs - Per users - web/report/report_layout_child.html.twig - - - report:: (telechargement) Global - All downloads - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par documents sur la base - Per documents, from database - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par jours base par base - Daily - web/report/report_layout_child.html.twig - report:: 1 - Periode 1 - Time space - web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig - - report:: 2 - Bases - 2 - Databases - web/report/form_date_and_base.html.twig + + report:: 2 - Base + report:: 2 - Base + web/report/form_date_and_base.html.twig + + + report:: 3 - Collections + report:: 3 - Collections + web/report/form_date_and_base.html.twig report:: 3 - Type de report 3 - Type of report - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + + + report:: 4 - Fields + report:: 4 - Fields + web/report/report_layout_child.html.twig report:: Au (date) To - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig + web/report/form_date_and_base.html.twig report:: Connexion Connections classes/module/report.php - web/report/report_layout.html.twig - web/report/ajax_data_content.html.twig - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig + web/report/report_layout.html.twig + web/report/all_content.html.twig - - - Cumulated connexions and downloads - web/report/ajax_dashboard_content_child.html.twig - - - report:: Dashboard - Dashboard - web/report/report_layout.html.twig - web/report/ajax_dashboard_content.html.twig - web/report/ajax_report_dashboard.html.twig + + report:: Databox content + report:: Databox content + web/report/report_layout.html.twig report:: Detail des connexions @@ -11751,30 +11600,17 @@ It is possible to place several search areas report:: Du (date) From - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig - - - report:: Enlever le filtre - Remove filter - web/report/colFilter.html.twig - - - report:: Grouper par - Group by %s - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig report:: Heures Hours - web/report/all_content.html.twig + web/report/all_content.html.twig report:: IP IP module/report/filter.php - Controller/Report/RootController.php report:: Information sur l'enregistrement numero %number% @@ -11796,97 +11632,37 @@ It is possible to place several search areas Users information corresponding to %critere% module/report/nav.php - - report:: Les questions les plus posees - Top questions - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig + + report:: Phraseanet report + report:: Phraseanet report + web/report/report_layout.html.twig report:: Plateforme Platform module/report/nav.php - - report:: Utilisateurs les plus actifs - Most active users - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: Volumetrie des questions posees sur %home_title% - Questions asked - web/report/dashboard_macro.html.twig - report:: activite Activity classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: activite document ajoute - Added documents - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite document edite - Edited documents - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite du site - Site activity - web/report/report_layout_child.html.twig - web/report/report_layout.html.twig report:: activite par heure Hourly Activity (average) module/report/activity.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite par jour - Daily Activity - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig - - - report:: adresse - Address - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: ajoute - Added - web/report/report_layout_child.html.twig report:: collections Collections module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: commentaire Comments module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: copyright @@ -11899,160 +11675,52 @@ It is possible to place several search areas module/report/filter.php classes/module/report.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: document - document - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: document ajoute Documents added module/report/add.php - - report:: documents les plus telecharges - Most downloaded assets - web/report/ajax_dashboard_content_child.html.twig - - - report:: edite - Caption Edited - web/report/report_layout_child.html.twig - report:: edited documents Edited documents module/report/edit.php - - report:: email - E-mail - Controller/Report/InformationController.php - Controller/Report/InformationController.php - report:: fichier File classes/module/report.php - Controller/Report/RootController.php report:: fonction Job classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: historique des connexions - Connections - Controller/Report/InformationController.php - - - report:: historique des questions - Query log - Controller/Report/InformationController.php - - - report:: historique des telechargements - Downloads - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: identifiant - User id - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: jour Day - Controller/Report/ActivityController.php - web/report/all_content.html.twig - - - report:: module - Modules - Controller/Report/RootController.php + web/report/all_content.html.twig report:: modules Modules module/report/nav.php module/report/filter.php - Controller/Report/RootController.php - Controller/Report/InformationController.php report:: navigateur Browser module/report/nav.php - Controller/Report/RootController.php report:: navigateurs et plateforme Browsers and Platform module/report/nav.php - Controller/Report/RootController.php - - - report:: nom - Name - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: nombre Number classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de documents - Occurrences - Controller/Report/ActivityController.php - - - report:: nombre de preview - number of preview(s) - Controller/Report/ActivityController.php - - - report:: nombre de reponses - Average hits - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de vue - Number of displays - web/report/ajax_dashboard_content_child.html.twig report:: non-renseigne @@ -12072,8 +11740,6 @@ It is possible to place several search areas module/report/validate.php module/report/edit.php module/report/sent.php - web/report/colFilter.html.twig - web/report/colFilter.html.twig report:: page d'accueil @@ -12087,68 +11753,15 @@ It is possible to place several search areas By %user_infos% prod/preview/short_history.html.twig - - report:: par utilisateurs - Per Users - web/report/report_layout_child.html.twig - report:: pays Country classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: plateforme - Platform - Controller/Report/RootController.php - - - report:: poids - Size - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: poids document - Original document filesize - web/report/ajax_dashboard_content_child.html.twig - - - report:: poids preview - Preview filesize - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: pourcentage Percentage classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - - - report:: preview - Subviews - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: preview les plus telecharges - Most downloaded preview files - web/report/ajax_dashboard_content_child.html.twig - - - report:: pushe - Pushed - web/report/report_layout_child.html.twig report:: pushed documents @@ -12161,12 +11774,6 @@ It is possible to place several search areas module/report/question.php module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: questions @@ -12182,55 +11789,27 @@ It is possible to place several search areas report:: questions sans reponses Unanswered questions module/report/activity.php - web/report/report_layout_child.html.twig report:: record id recordId module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: recordid - recordId - web/report/report_layout_child.html.twig report:: resolution Screen resolution module/report/nav.php - Controller/Report/RootController.php - - - report:: site - Site - web/report/ajax_dashboard_content_child.html.twig - - - report:: site d'ou les photo sont les plus consultees - Consultation site - web/report/ajax_dashboard_content_child.html.twig report:: societe Company classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig report:: taille Size classes/module/report.php - Controller/Report/RootController.php report:: telechargement @@ -12241,54 +11820,17 @@ It is possible to place several search areas report:: telechargements Downloads module/report/download.php - Controller/Report/RootController.php - web/report/report_layout.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: telechargements document - Downloads for documents - web/report/ajax_dashboard_content_child.html.twig + web/report/report_layout.html.twig report:: telechargements par jour Downloads module/report/activity.php - - report:: telechargements preview - Downloads for previews - web/report/ajax_dashboard_content_child.html.twig - - - report:: telephone - Phone - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: titre - Title - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: total des telechargements - Total downloads - Controller/Report/ActivityController.php - - - report:: toutes les questions - Top questions - web/report/report_layout_child.html.twig - report:: type Screen type classes/module/report.php - Controller/Report/RootController.php report:: type d'action @@ -12299,31 +11841,12 @@ It is possible to place several search areas report:: utilisateur User classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - - - report:: utilisateurs - Users - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: validated documents Validated documents module/report/validate.php - - report:: valide - Leave feedback - web/report/report_layout_child.html.twig - report:: visualiseur cooliris Cooliris viewer @@ -12336,11 +11859,6 @@ It is possible to place several search areas documents moved to : %coll_name% prod/preview/short_history.html.twig - - report::Connexion - Connection - web/report/ajax_dashboard_content_child.html.twig - report::Connexions Connections @@ -12364,8 +11882,7 @@ It is possible to place several search areas report::Heures Hours - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig report::Impression des formats : %format% @@ -12380,17 +11897,17 @@ It is possible to place several search areas report::Nombre de connexions Connections - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document ajoute Number of documents added - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document edite Number of documents edited - web/report/all_content.html.twig + web/report/all_content.html.twig report::Publication de %dest% @@ -12427,51 +11944,32 @@ It is possible to place several search areas report::activite Activity module/report/filter.php - Controller/Report/RootController.php report::ajout du documentt Add document prod/preview/short_history.html.twig - - report::aucune precision - No filters - web/report/report_layout_child.html.twig - report::fonction Fonction module/report/filter.php - Controller/Report/RootController.php - - - report::la description contient - Caption includes - web/report/report_layout_child.html.twig report::pays Country module/report/filter.php - Controller/Report/RootController.php report::societe Company module/report/filter.php - Controller/Report/RootController.php report::supression du document Delete document prod/preview/short_history.html.twig - - report::version - Version - Controller/Report/InformationController.php - reportage Feature @@ -13390,17 +12888,6 @@ It is possible to place several search areas actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig - - to - to - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - tout decocher - Unselect all - web/report/listColumn.html.twig - tout le monde Everyone @@ -13500,7 +12987,7 @@ It is possible to place several search areas veuillez choisir au minimum une collection At least one collection must be selected - web/report/all_content.html.twig + web/report/all_content.html.twig video diff --git a/resources/locales/messages.fr.xlf b/resources/locales/messages.fr.xlf index ab71c44c4b..374eb3f9e3 100644 --- a/resources/locales/messages.fr.xlf +++ b/resources/locales/messages.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. @@ -289,11 +289,6 @@ %total% réponses Controller/Prod/QueryController.php - - %total_count% results - %total_count% résultats - web/report/generate_tab.html.twig - %user% a envoye son rapport de validation de %title% %user% a envoyé son rapport de validation pour %title% @@ -409,7 +404,6 @@ 1 résultat WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig - web/report/generate_tab.html.twig 10 tags maximum @@ -1056,7 +1050,7 @@ Aperture Ouverture - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1268,12 +1262,12 @@ Audio Samplerate Fréquence d'échantillonnage - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1538,15 +1532,10 @@ Champs web/admin/tree.html.twig - - CSV export - Export CSV - web/report/generate_tab.html.twig - Camera Model Type d'appareil numérique - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1789,11 +1778,6 @@ Cocher toute la colonne web/admin/index.html.twig - - Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report - Cochez les cases correspondantes aux colonnes que vous désirez voir apparaître dans le Report - web/report/listColumn.html.twig - Code d'acces Code d'accès @@ -1846,7 +1830,7 @@ Colorspace Espace colorimétrique - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -2457,7 +2441,8 @@ Tout désélectionner actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Design of personalization logo section @@ -3284,11 +3269,6 @@ Filtrer web/admin/users.html.twig - - Filtrer - Filtrer - web/report/generate_tab.html.twig - First Name Prénom @@ -3315,7 +3295,7 @@ FlashFired Avec Flash - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3374,7 +3354,7 @@ FrameRate Cadence - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -3406,16 +3386,6 @@ Paramètres généraux web/admin/dashboard.html.twig - - Generate - Générer - web/report/report_layout_child.html.twig - - - Generate dashboard - Générer le tableau de bord - web/report/report_layout_child.html.twig - Generates a flexpaper flash file Générer un fichier flexpaper flash @@ -3532,17 +3502,6 @@ Excellente Controller/Root/LoginController.php - - Groupement des resultats sur le champ %name% - Groupement des résultats sur le champ %name% - Controller/Report/RootController.php - Controller/Report/ActivityController.php - - - Grouper - Grouper - web/report/generate_tab.html.twig - Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson" Groupez deux ou plusieurs mots avec des guillemets : "Michael Jackson" @@ -3624,7 +3583,7 @@ ISO ISO - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php ISO sensibility @@ -4296,7 +4255,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4823,7 +4782,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -5440,11 +5399,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis WorkZone/Browser/Basket.html.twig WorkZone/Browser/Results.html.twig - - Receiver - Destinataire - Controller/Report/ActivityController.php - Reception d'un rapport de validation Réception d'un rapport de validation @@ -5655,11 +5609,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Afficher dans Phraseanet Report admin/fields/templates.html.twig - - Report generation may take a long time to generate, depending on the number of collections and the period selected. - En fonction du nombre de collections et de l'intervalle de dates, la génération du Report peut prendre du temps. - web/report/report_layout_child.html.twig - Request access Demande d'accès @@ -5978,7 +5927,8 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Tout sélectionner actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Select all collections @@ -6035,11 +5985,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Envoyer vers Twitter prod/Share/record.html.twig - - Sent - Envoyé - web/report/report_layout_child.html.twig - Sent documents (mail) Documents envoyés (par e-mail) @@ -6132,7 +6077,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Shutter speed Vitesse d'obturateur - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -6888,12 +6833,6 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis prod/upload/upload-flash.html.twig prod/upload/upload.html.twig - - Trier - Trier - web/report/generate_tab.html.twig - web/report/generate_tab.html.twig - Trier par Trier par @@ -7345,7 +7284,7 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -7629,6 +7568,12 @@ Pour les utilisateurs authentifiés, la demande de validation est également dis Ecriture des métadonnées web/admin/subdefs.html.twig + + YYYY-MM-DD + YYYY-MM-DD + web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig + YYYY/MM/DD YYYY/MM/DD @@ -9121,7 +9066,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/common/dialog_export.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig @@ -9201,7 +9146,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/thesaurus/export-topics.html.twig web/lightbox/sc_note.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig boutton::generer @@ -9409,7 +9354,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le admin/statusbit/edit.html.twig web/admin/dashboard.html.twig web/admin/setup.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig web/account/account.html.twig web/account/access.html.twig @@ -9521,11 +9466,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le web/admin/subdefs.html.twig web/admin/subdefs.html.twig - - cocher tout - Tout cocher - web/report/listColumn.html.twig - collection.label.unknown Collection inconnue @@ -9542,12 +9482,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod/orders/order_item.html.twig web/common/dialog_export.html.twig - - configuration - Configuration - Controller/Report/RootController.php - Controller/Report/ActivityController.php - copyClipboardLabel Copier dans le presse-papier @@ -9801,14 +9735,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Controller/Prod/ToolsController.php Controller/Prod/ToolsController.php - - filtrer les resultats sur la colonne %colonne% - filtrer les résultats sur la colonne %colonne% - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - flash Flash @@ -9878,12 +9804,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Modifications effectuées admin/databox/databox.html.twig - - from - De - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - help::help-section-bullet: check-spelling help::help-section-bullet: check-spelling @@ -10719,7 +10639,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Sous-définition module/report/filter.php classes/module/report.php - Controller/Report/RootController.php phraseanet:: thesaurus @@ -10925,16 +10844,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le phraseanet::utilisateurs Utilisateurs module/report/filter.php - Controller/Report/RootController.php - - - phrseanet:: sous definition - Sous-définition - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php preview @@ -11203,17 +11112,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le prod::facet:base_label Bases - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:collection_label Collections - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:doctype_label Types de documents - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -11631,108 +11540,48 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Sans titre classes/record/adapter.php - - report :: aucun resultat trouve - Aucun résultat trouvé - web/report/generate_tab.html.twig - - - report :: configurer le tableau - Configurer le tableau - web/report/generate_tab.html.twig - - - report :: filtrer - Filtrer - web/report/generate_tab.html.twig - - - report :: grouper - Grouper - web/report/generate_tab.html.twig - - - report :: imprimer le tableau - Imprimer le tableau - web/report/generate_tab.html.twig - - - report:: (connexions) Globales - Toutes les connexions - web/report/report_layout_child.html.twig - - - report:: (connexions) OS et navigateurs - Plateformes et navigateurs - web/report/report_layout_child.html.twig - - - report:: (connexions) Par utilisateurs - Groupé par utilisateurs - web/report/report_layout_child.html.twig - - - report:: (telechargement) Global - Tous les téléchargements - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par documents sur la base - Par document, sur la base - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par jours base par base - Par Jour - web/report/report_layout_child.html.twig - report:: 1 - Periode 1 - Période - web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig - - report:: 2 - Bases - 2 - Bases - web/report/form_date_and_base.html.twig + + report:: 2 - Base + report:: 2 - Base + web/report/form_date_and_base.html.twig + + + report:: 3 - Collections + report:: 3 - Collections + web/report/form_date_and_base.html.twig report:: 3 - Type de report 3 - Type de report - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + + + report:: 4 - Fields + report:: 4 - Fields + web/report/report_layout_child.html.twig report:: Au (date) Au - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig + web/report/form_date_and_base.html.twig report:: Connexion Connexions classes/module/report.php - web/report/report_layout.html.twig - web/report/ajax_data_content.html.twig - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig + web/report/report_layout.html.twig + web/report/all_content.html.twig - - - Téléchargements et connexions - web/report/ajax_dashboard_content_child.html.twig - - - report:: Dashboard - Tableau de bord - web/report/report_layout.html.twig - web/report/ajax_dashboard_content.html.twig - web/report/ajax_report_dashboard.html.twig + + report:: Databox content + report:: Databox content + web/report/report_layout.html.twig report:: Detail des connexions @@ -11747,30 +11596,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report:: Du (date) Du - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig - - - report:: Enlever le filtre - Enlever le filtre - web/report/colFilter.html.twig - - - report:: Grouper par - Grouper par - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig report:: Heures Heures - web/report/all_content.html.twig + web/report/all_content.html.twig report:: IP IP module/report/filter.php - Controller/Report/RootController.php report:: Information sur l'enregistrement numero %number% @@ -11792,97 +11628,37 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Information sur les utilisateurs correspondant à %critere% module/report/nav.php - - report:: Les questions les plus posees - Questions les plus posées - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig + + report:: Phraseanet report + report:: Phraseanet report + web/report/report_layout.html.twig report:: Plateforme Plateforme module/report/nav.php - - report:: Utilisateurs les plus actifs - Utilisateurs les plus actifs - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: Volumetrie des questions posees sur %home_title% - Volumétrie des questions posées sur %home_title% - web/report/dashboard_macro.html.twig - report:: activite Activité classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: activite document ajoute - Documents ajoutés - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite document edite - Documents édités - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite du site - Activité du site - web/report/report_layout_child.html.twig - web/report/report_layout.html.twig report:: activite par heure Activité par heure (moyenne) module/report/activity.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite par jour - Activité par jour - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig - - - report:: adresse - Adresse - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: ajoute - Ajouté - web/report/report_layout_child.html.twig report:: collections Collections module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: commentaire Commentaire module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: copyright @@ -11895,160 +11671,52 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le module/report/filter.php classes/module/report.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: document - Documents - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: document ajoute Documents ajoutés module/report/add.php - - report:: documents les plus telecharges - Documents les plus téléchargés - web/report/ajax_dashboard_content_child.html.twig - - - report:: edite - Edité - web/report/report_layout_child.html.twig - report:: edited documents Documents édités module/report/edit.php - - report:: email - E-mail - Controller/Report/InformationController.php - Controller/Report/InformationController.php - report:: fichier Fichier classes/module/report.php - Controller/Report/RootController.php report:: fonction Fonction classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: historique des connexions - Historique des connexions - Controller/Report/InformationController.php - - - report:: historique des questions - Historique des questions - Controller/Report/InformationController.php - - - report:: historique des telechargements - Historique des téléchargements - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: identifiant - Identifiant - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: jour Jour - Controller/Report/ActivityController.php - web/report/all_content.html.twig - - - report:: module - Module - Controller/Report/RootController.php + web/report/all_content.html.twig report:: modules Modules module/report/nav.php module/report/filter.php - Controller/Report/RootController.php - Controller/Report/InformationController.php report:: navigateur Navigateur module/report/nav.php - Controller/Report/RootController.php report:: navigateurs et plateforme Navigateurs et Plateformes module/report/nav.php - Controller/Report/RootController.php - - - report:: nom - Nom - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: nombre Nombre classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de documents - Nombre de documents - Controller/Report/ActivityController.php - - - report:: nombre de preview - Nombre de sous-définitions - Controller/Report/ActivityController.php - - - report:: nombre de reponses - Nombre de réponses - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de vue - Nombre de vues - web/report/ajax_dashboard_content_child.html.twig report:: non-renseigne @@ -12068,8 +11736,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le module/report/validate.php module/report/edit.php module/report/sent.php - web/report/colFilter.html.twig - web/report/colFilter.html.twig report:: page d'accueil @@ -12083,68 +11749,15 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le par %user_infos% prod/preview/short_history.html.twig - - report:: par utilisateurs - Par utilisateur - web/report/report_layout_child.html.twig - report:: pays Pays classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: plateforme - Plateforme - Controller/Report/RootController.php - - - report:: poids - Poids - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: poids document - Poids des documents téléchargés - web/report/ajax_dashboard_content_child.html.twig - - - report:: poids preview - Poids des sous-définitions téléchargées - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: pourcentage Pourcentage classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - - - report:: preview - Sous-définitions - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: preview les plus telecharges - Sous-définitions les plus téléchargées - web/report/ajax_dashboard_content_child.html.twig - - - report:: pushe - Poussé - web/report/report_layout_child.html.twig report:: pushed documents @@ -12157,12 +11770,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le module/report/question.php module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: questions @@ -12178,55 +11785,27 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report:: questions sans reponses Questions sans réponses module/report/activity.php - web/report/report_layout_child.html.twig report:: record id recordId module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: recordid - recordId - web/report/report_layout_child.html.twig report:: resolution Définition module/report/nav.php - Controller/Report/RootController.php - - - report:: site - Site - web/report/ajax_dashboard_content_child.html.twig - - - report:: site d'ou les photo sont les plus consultees - Site d'où les documents sont les plus consultés (Référent) - web/report/ajax_dashboard_content_child.html.twig report:: societe Société classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig report:: taille Taille classes/module/report.php - Controller/Report/RootController.php report:: telechargement @@ -12237,54 +11816,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report:: telechargements Téléchargements module/report/download.php - Controller/Report/RootController.php - web/report/report_layout.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: telechargements document - Documents téléchargés - web/report/ajax_dashboard_content_child.html.twig + web/report/report_layout.html.twig report:: telechargements par jour Téléchargements par jour module/report/activity.php - - report:: telechargements preview - Sous-définitions téléchargées - web/report/ajax_dashboard_content_child.html.twig - - - report:: telephone - Téléphone - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: titre - Titre - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: total des telechargements - Total des téléchargements - Controller/Report/ActivityController.php - - - report:: toutes les questions - Historique des questions - web/report/report_layout_child.html.twig - report:: type Définition classes/module/report.php - Controller/Report/RootController.php report:: type d'action @@ -12295,31 +11837,12 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report:: utilisateur Utilisateur classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - - - report:: utilisateurs - Utilisateurs - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: validated documents Documents validés module/report/validate.php - - report:: valide - Validé - web/report/report_layout_child.html.twig - report:: visualiseur cooliris Visualiseur Cooliris @@ -12332,11 +11855,6 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le Changement de collection vers : %coll_name% prod/preview/short_history.html.twig - - report::Connexion - Connexions - web/report/ajax_dashboard_content_child.html.twig - report::Connexions Connexions @@ -12360,8 +11878,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report::Heures Heures - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig report::Impression des formats : %format% @@ -12376,17 +11893,17 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report::Nombre de connexions Nombre de connexions - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document ajoute Nombre de documents ajoutés - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document edite Nombre de documents édités - web/report/all_content.html.twig + web/report/all_content.html.twig report::Publication de %dest% @@ -12423,51 +11940,32 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le report::activite Activité module/report/filter.php - Controller/Report/RootController.php report::ajout du documentt Ajout du document prod/preview/short_history.html.twig - - report::aucune precision - Aucun filtre - web/report/report_layout_child.html.twig - report::fonction Fonction module/report/filter.php - Controller/Report/RootController.php - - - report::la description contient - la description contient - web/report/report_layout_child.html.twig report::pays Pays module/report/filter.php - Controller/Report/RootController.php report::societe Société module/report/filter.php - Controller/Report/RootController.php report::supression du document Suppression du document prod/preview/short_history.html.twig - - report::version - Version - Controller/Report/InformationController.php - reportage Reportage @@ -13386,17 +12884,6 @@ 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 - - to - to - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - tout decocher - Tout décocher - web/report/listColumn.html.twig - tout le monde Tout le monde @@ -13496,7 +12983,7 @@ Si vous recevez cet e-mail sans l'avoir sollicité, merci de l'ignorer ou de le veuillez choisir au minimum une collection Veuillez choisir au moins une collection - web/report/all_content.html.twig + web/report/all_content.html.twig video diff --git a/resources/locales/messages.nl.xlf b/resources/locales/messages.nl.xlf index b90ce31c02..91dd2b0b8d 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. @@ -293,11 +293,6 @@ %total% reponses Controller/Prod/QueryController.php - - %total_count% results - %total_count% resultaten - web/report/generate_tab.html.twig - %user% a envoye son rapport de validation de %title% %user% a envoye son rapport de validation de %title% @@ -413,7 +408,6 @@ 1 resultaat WorkZone/Browser/Results.html.twig WorkZone/Browser/Results.html.twig - web/report/generate_tab.html.twig 10 tags maximum @@ -1061,7 +1055,7 @@ Aperture Diafragma - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1273,12 +1267,12 @@ Audio Samplerate Audio Samplerate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Audio codec Audio codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php AudioSamplerate @@ -1543,15 +1537,10 @@ VELDEN web/admin/tree.html.twig - - CSV export - CSV export - web/report/generate_tab.html.twig - Camera Model Cameramodel - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -1795,11 +1784,6 @@ Verberg de hele kolom web/admin/index.html.twig - - Cochez les cases correspondantes aux colonnes que vous desirez voire apparaitre dans le report - Schakel de selectievakjes die overeenkomen met de kolommen die u wilt of zelfs opgenomen zijn het rapport uit - web/report/listColumn.html.twig - Code d'acces Toegangs code @@ -1852,7 +1836,7 @@ Colorspace Colorspace - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Commande @@ -2464,7 +2448,8 @@ Alles deselecteren actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Design of personalization logo section @@ -3291,11 +3276,6 @@ Filter web/admin/users.html.twig - - Filtrer - Filteren - web/report/generate_tab.html.twig - First Name Voornaam @@ -3322,7 +3302,7 @@ FlashFired FlashFired - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Flatten layers @@ -3381,7 +3361,7 @@ FrameRate FrameRate - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Frequence d'echantillonage @@ -3413,16 +3393,6 @@ Algemene instellingen web/admin/dashboard.html.twig - - Generate - Generate - web/report/report_layout_child.html.twig - - - Generate dashboard - Generate dashboard - web/report/report_layout_child.html.twig - Generates a flexpaper flash file Genereerd een flexpaper flash file @@ -3539,17 +3509,6 @@ Uitstekend Controller/Root/LoginController.php - - Groupement des resultats sur le champ %name% - Groupement des resultats sur le champ %name% - Controller/Report/RootController.php - Controller/Report/ActivityController.php - - - Grouper - Groeperen - web/report/generate_tab.html.twig - Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson" Groupez 2 ou plusieurs mots avec des guillemets: "Michael Jackson" @@ -3631,7 +3590,7 @@ ISO ISO - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php ISO sensibility @@ -4303,7 +4262,7 @@ MimeType MimeType - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Minimum number of letters before truncation @@ -4830,7 +4789,7 @@ Orientation Orientation - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Original name @@ -5445,11 +5404,6 @@ WorkZone/Browser/Basket.html.twig WorkZone/Browser/Results.html.twig - - Receiver - Ontvanger - Controller/Report/ActivityController.php - Reception d'un rapport de validation Ontvangst van een goedkeuringsrapport @@ -5660,11 +5614,6 @@ Overzicht admin/fields/templates.html.twig - - Report generation may take a long time to generate, depending on the number of collections and the period selected. - Report generation may take a long time to generate, depending on the number of collections and the period selected. - web/report/report_layout_child.html.twig - Request access Aanvraag toegang @@ -5983,7 +5932,8 @@ Alles selecteren actions/Feedback/list.html.twig prod/actions/Push.html.twig - web/report/form_date_and_base.html.twig + web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig Select all collections @@ -6040,11 +5990,6 @@ Verstuur naar Twitter prod/Share/record.html.twig - - Sent - Verstuurd - web/report/report_layout_child.html.twig - Sent documents (mail) Verstuurde documenten (mail) @@ -6137,7 +6082,7 @@ Shutter speed Sluitersnelheid - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php web/common/technical_datas.html.twig @@ -6893,12 +6838,6 @@ prod/upload/upload-flash.html.twig prod/upload/upload.html.twig - - Trier - Sorteren - web/report/generate_tab.html.twig - web/report/generate_tab.html.twig - Trier par Sorteren op @@ -7350,7 +7289,7 @@ Video codec Video codec - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php Videos @@ -7634,6 +7573,12 @@ Schrijf Metas web/admin/subdefs.html.twig + + YYYY-MM-DD + YYYY-MM-DD + web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig + YYYY/MM/DD YYYY/MM/DD @@ -9125,7 +9070,7 @@ web/common/dialog_export.html.twig web/common/dialog_export.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig @@ -9205,7 +9150,7 @@ web/thesaurus/export-topics.html.twig web/lightbox/sc_note.html.twig web/common/dialog_export.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig boutton::generer @@ -9413,7 +9358,7 @@ admin/statusbit/edit.html.twig web/admin/dashboard.html.twig web/admin/setup.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig web/account/reset-email.html.twig web/account/account.html.twig web/account/access.html.twig @@ -9525,11 +9470,6 @@ web/admin/subdefs.html.twig web/admin/subdefs.html.twig - - cocher tout - alles uitschakelen - web/report/listColumn.html.twig - collection.label.unknown collection.label.unknown @@ -9546,12 +9486,6 @@ prod/orders/order_item.html.twig web/common/dialog_export.html.twig - - configuration - Configuratie - Controller/Report/RootController.php - Controller/Report/ActivityController.php - copyClipboardLabel copyClipboardLabel @@ -9805,14 +9739,6 @@ Controller/Prod/ToolsController.php Controller/Prod/ToolsController.php - - filtrer les resultats sur la colonne %colonne% - filtrer les resultats sur la colonne %colonne% - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - flash flash @@ -9882,12 +9808,6 @@ Bewerking correct uitgevoerd admin/databox/databox.html.twig - - from - from - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - help::help-section-bullet: check-spelling help::help-section-bullet: check-spelling @@ -10723,7 +10643,6 @@ Per definitie module/report/filter.php classes/module/report.php - Controller/Report/RootController.php phraseanet:: thesaurus @@ -10929,16 +10848,6 @@ phraseanet::utilisateurs Gebruikers module/report/filter.php - Controller/Report/RootController.php - - - phrseanet:: sous definition - Per definitie - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php preview @@ -11207,17 +11116,17 @@ prod::facet:base_label prod::facet:base_label - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:collection_label prod::facet:collection_label - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::facet:doctype_label prod::facet:doctype_label - SearchEngine/Elastic/ElasticsearchOptions.php + SearchEngine/Elastic/ElasticsearchOptions.php prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee. @@ -11635,108 +11544,48 @@ Documenten zonder titel classes/record/adapter.php - - report :: aucun resultat trouve - geen enkel resultaat gevonden - web/report/generate_tab.html.twig - - - report :: configurer le tableau - Configureer het paneel - web/report/generate_tab.html.twig - - - report :: filtrer - Filteren - web/report/generate_tab.html.twig - - - report :: grouper - Groeperen - web/report/generate_tab.html.twig - - - report :: imprimer le tableau - Print het panel - web/report/generate_tab.html.twig - - - report:: (connexions) Globales - Globalen - web/report/report_layout_child.html.twig - - - report:: (connexions) OS et navigateurs - OS en browsers - web/report/report_layout_child.html.twig - - - report:: (connexions) Par utilisateurs - Per gebruikers - web/report/report_layout_child.html.twig - - - report:: (telechargement) Global - Algemeen - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par documents sur la base - Per document in database - web/report/report_layout_child.html.twig - - - report:: (telechargement) Par jours base par base - Per dag database per database - web/report/report_layout_child.html.twig - report:: 1 - Periode 1 - Periode - web/report/form_date_and_base.html.twig + web/report/form_date_and_base.html.twig - - report:: 2 - Bases - 2 - Databases - web/report/form_date_and_base.html.twig + + report:: 2 - Base + report:: 2 - Base + web/report/form_date_and_base.html.twig + + + report:: 3 - Collections + report:: 3 - Collections + web/report/form_date_and_base.html.twig report:: 3 - Type de report 3 - Rapport type - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + web/report/report_layout_child.html.twig + + + report:: 4 - Fields + report:: 4 - Fields + web/report/report_layout_child.html.twig report:: Au (date) Au (datum) - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig + web/report/form_date_and_base.html.twig report:: Connexion Verbinding classes/module/report.php - web/report/report_layout.html.twig - web/report/ajax_data_content.html.twig - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig + web/report/report_layout.html.twig + web/report/all_content.html.twig - - - - web/report/ajax_dashboard_content_child.html.twig - - - report:: Dashboard - Dashboard - web/report/report_layout.html.twig - web/report/ajax_dashboard_content.html.twig - web/report/ajax_report_dashboard.html.twig + + report:: Databox content + report:: Databox content + web/report/report_layout.html.twig report:: Detail des connexions @@ -11751,30 +11600,17 @@ report:: Du (date) Du (datum) - web/report/form_date_and_base.html.twig - web/report/ajax_report_dashboard.html.twig - - - report:: Enlever le filtre - De filter verwijderen - web/report/colFilter.html.twig - - - report:: Grouper par - Grouperen per - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig + web/report/form_date_and_base.html.twig report:: Heures Uren - web/report/all_content.html.twig + web/report/all_content.html.twig report:: IP IP module/report/filter.php - Controller/Report/RootController.php report:: Information sur l'enregistrement numero %number% @@ -11796,97 +11632,37 @@ report:: Information sur les utilisateurs correspondant a %critere% module/report/nav.php - - report:: Les questions les plus posees - De meest gestelde vragen - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig + + report:: Phraseanet report + report:: Phraseanet report + web/report/report_layout.html.twig report:: Plateforme Platform module/report/nav.php - - report:: Utilisateurs les plus actifs - report:: Utilisateurs les plus actifs - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: Volumetrie des questions posees sur %home_title% - Volumetrie van de vragen over %home_title% - web/report/dashboard_macro.html.twig - report:: activite Activiteit classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: activite document ajoute - report:: activite document ajoute - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite document edite - report:: activite document edite - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite du site - Activiteit van de site - web/report/report_layout_child.html.twig - web/report/report_layout.html.twig report:: activite par heure Activitiet per uur module/report/activity.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: activite par jour - Activiteit per dag - web/report/ajax_dashboard_content_child.html.twig - web/report/chart.html.twig - web/report/chart.html.twig - - - report:: adresse - Adres - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: ajoute - Voeg toe - web/report/report_layout_child.html.twig report:: collections Collecties module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: commentaire Commentaar module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: copyright @@ -11899,160 +11675,52 @@ module/report/filter.php classes/module/report.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: document - Document - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - web/report/report_layout_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: document ajoute Document toegevoegd module/report/add.php - - report:: documents les plus telecharges - report:: documents les plus telecharges - web/report/ajax_dashboard_content_child.html.twig - - - report:: edite - Bewerk - web/report/report_layout_child.html.twig - report:: edited documents Bewerkte documenten module/report/edit.php - - report:: email - Email - Controller/Report/InformationController.php - Controller/Report/InformationController.php - report:: fichier Document classes/module/report.php - Controller/Report/RootController.php report:: fonction Functie classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: historique des connexions - Historie van de verbindingen - Controller/Report/InformationController.php - - - report:: historique des questions - Historie van de vragen - Controller/Report/InformationController.php - - - report:: historique des telechargements - Historie van de downloads - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: identifiant - ID - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: jour Dag - Controller/Report/ActivityController.php - web/report/all_content.html.twig - - - report:: module - Module - Controller/Report/RootController.php + web/report/all_content.html.twig report:: modules Modules module/report/nav.php module/report/filter.php - Controller/Report/RootController.php - Controller/Report/InformationController.php report:: navigateur Browser module/report/nav.php - Controller/Report/RootController.php report:: navigateurs et plateforme Browsers en platform module/report/nav.php - Controller/Report/RootController.php - - - report:: nom - Naam - Controller/Report/InformationController.php - Controller/Report/InformationController.php report:: nombre Aantal classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de documents - Aantal documenten - Controller/Report/ActivityController.php - - - report:: nombre de preview - Aantal voorvertoningen - Controller/Report/ActivityController.php - - - report:: nombre de reponses - Aantal antwoorden - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - - - report:: nombre de vue - report:: nombre de vue - web/report/ajax_dashboard_content_child.html.twig report:: non-renseigne @@ -12072,8 +11740,6 @@ module/report/validate.php module/report/edit.php module/report/sent.php - web/report/colFilter.html.twig - web/report/colFilter.html.twig report:: page d'accueil @@ -12087,68 +11753,15 @@ per %user_infos% prod/preview/short_history.html.twig - - report:: par utilisateurs - per gebruikers - web/report/report_layout_child.html.twig - report:: pays Land classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - report:: plateforme - Platform - Controller/Report/RootController.php - - - report:: poids - Gewicht - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: poids document - report:: poids document - web/report/ajax_dashboard_content_child.html.twig - - - report:: poids preview - report:: poids preview - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: pourcentage Percentage classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/RootController.php - - - report:: preview - Voorvertoning - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - - - report:: preview les plus telecharges - report:: preview les plus telecharges - web/report/ajax_dashboard_content_child.html.twig - - - report:: pushe - Stuur door - web/report/report_layout_child.html.twig report:: pushed documents @@ -12161,12 +11774,6 @@ module/report/question.php module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - Controller/Report/ActivityController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: questions @@ -12182,55 +11789,27 @@ report:: questions sans reponses Vragen zonder antwoord module/report/activity.php - web/report/report_layout_child.html.twig report:: record id Record id module/report/filter.php classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: recordid - recordid - web/report/report_layout_child.html.twig report:: resolution Resolutie module/report/nav.php - Controller/Report/RootController.php - - - report:: site - report:: site - web/report/ajax_dashboard_content_child.html.twig - - - report:: site d'ou les photo sont les plus consultees - report:: site d'ou les photo sont les plus consultees - web/report/ajax_dashboard_content_child.html.twig report:: societe Bedrijf classes/module/report.php - Controller/Report/RootController.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig report:: taille Grootte classes/module/report.php - Controller/Report/RootController.php report:: telechargement @@ -12241,54 +11820,17 @@ report:: telechargements Downloads module/report/download.php - Controller/Report/RootController.php - web/report/report_layout.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - - - report:: telechargements document - report:: telechargements document - web/report/ajax_dashboard_content_child.html.twig + web/report/report_layout.html.twig report:: telechargements par jour Downloads per dag module/report/activity.php - - report:: telechargements preview - report:: telechargements preview - web/report/ajax_dashboard_content_child.html.twig - - - report:: telephone - Telefoon - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: titre - Titel - Controller/Report/InformationController.php - Controller/Report/InformationController.php - - - report:: total des telechargements - Totaal van de downloads - Controller/Report/ActivityController.php - - - report:: toutes les questions - Alle vragen - web/report/report_layout_child.html.twig - report:: type Type classes/module/report.php - Controller/Report/RootController.php report:: type d'action @@ -12299,31 +11841,12 @@ report:: utilisateur Gebruiker classes/module/report.php - Controller/Report/RootController.php - Controller/Report/InformationController.php - Controller/Report/ActivityController.php - - - report:: utilisateurs - Gebruikers - Controller/Report/RootController.php - Controller/Report/InformationController.php - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig - web/report/ajax_dashboard_content_child.html.twig report:: validated documents Gevalideerde documenten module/report/validate.php - - report:: valide - OK - web/report/report_layout_child.html.twig - report:: visualiseur cooliris Cooliris voorvertoning @@ -12336,11 +11859,6 @@ Verandering van de collectie naar : %coll_name% prod/preview/short_history.html.twig - - report::Connexion - report::Connexion - web/report/ajax_dashboard_content_child.html.twig - report::Connexions Connecties @@ -12364,8 +11882,7 @@ report::Heures Uren - web/report/ajax_data_content.html.twig - web/report/all_content.html.twig + web/report/all_content.html.twig report::Impression des formats : %format% @@ -12380,17 +11897,17 @@ report::Nombre de connexions Aantal connecties - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document ajoute Aantel toegevoegde documenten - web/report/all_content.html.twig + web/report/all_content.html.twig report::Nombre de document edite Aantal bewerkte documenten - web/report/all_content.html.twig + web/report/all_content.html.twig report::Publication de %dest% @@ -12427,51 +11944,32 @@ report::activite Activiteit module/report/filter.php - Controller/Report/RootController.php report::ajout du documentt Toevoegen van het document prod/preview/short_history.html.twig - - report::aucune precision - geen enkele precisie - web/report/report_layout_child.html.twig - report::fonction Functie module/report/filter.php - Controller/Report/RootController.php - - - report::la description contient - de beschrijving bevat - web/report/report_layout_child.html.twig report::pays Land module/report/filter.php - Controller/Report/RootController.php report::societe Bedrijf module/report/filter.php - Controller/Report/RootController.php report::supression du document Verwijderen van het document prod/preview/short_history.html.twig - - report::version - Versie - Controller/Report/InformationController.php - reportage Reportage @@ -13390,17 +12888,6 @@ actions/Tools/index.html.twig actions/Tools/videoEditor.html.twig - - to - to - web/report/report_layout_child.html.twig - web/report/report_layout_child.html.twig - - - tout decocher - alles inschakelen - web/report/listColumn.html.twig - tout le monde iedereen @@ -13500,7 +12987,7 @@ veuillez choisir au minimum une collection wilt u minimum één collectie kiezen - web/report/all_content.html.twig + web/report/all_content.html.twig video diff --git a/resources/locales/validators.de.xlf b/resources/locales/validators.de.xlf index 5cf06c05dc..dda5c3a166 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 5283c2ea2a..88e9e76063 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 afd7987c40..89f3c26df6 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 582677aede..e3ac896d04 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/common/images/icons/calendar-grey.png b/resources/www/common/images/icons/calendar-grey.png new file mode 100644 index 0000000000..880f700607 Binary files /dev/null and b/resources/www/common/images/icons/calendar-grey.png differ diff --git a/resources/www/common/images/icons/calendar-white.png b/resources/www/common/images/icons/calendar-white.png new file mode 100644 index 0000000000..665b9e6298 Binary files /dev/null and b/resources/www/common/images/icons/calendar-white.png differ diff --git a/resources/www/common/images/icons/checked.png b/resources/www/common/images/icons/checked.png new file mode 100644 index 0000000000..a225313d00 Binary files /dev/null and b/resources/www/common/images/icons/checked.png differ diff --git a/resources/www/common/images/icons/double-arrow-white.png b/resources/www/common/images/icons/double-arrow-white.png new file mode 100644 index 0000000000..4374b7fcba Binary files /dev/null and b/resources/www/common/images/icons/double-arrow-white.png differ diff --git a/resources/www/common/images/icons/unchecked.png b/resources/www/common/images/icons/unchecked.png new file mode 100644 index 0000000000..adc12939e2 Binary files /dev/null and b/resources/www/common/images/icons/unchecked.png differ diff --git a/resources/www/report/images/arrow_down.png b/resources/www/report/images/arrow_down.png deleted file mode 100644 index e3e43ec2bd..0000000000 Binary files a/resources/www/report/images/arrow_down.png and /dev/null differ diff --git a/resources/www/report/images/arrow_up.png b/resources/www/report/images/arrow_up.png deleted file mode 100644 index 9921c35e58..0000000000 Binary files a/resources/www/report/images/arrow_up.png and /dev/null differ diff --git a/resources/www/report/images/checkbox_checked.png b/resources/www/report/images/checkbox_checked.png deleted file mode 100644 index 6a3a8d470f..0000000000 Binary files a/resources/www/report/images/checkbox_checked.png and /dev/null differ diff --git a/resources/www/report/images/checkbox_unchecked.png b/resources/www/report/images/checkbox_unchecked.png deleted file mode 100644 index e4ab2932a0..0000000000 Binary files a/resources/www/report/images/checkbox_unchecked.png and /dev/null differ diff --git a/resources/www/report/images/config.png b/resources/www/report/images/config.png deleted file mode 100644 index f028e35624..0000000000 Binary files a/resources/www/report/images/config.png and /dev/null differ diff --git a/resources/www/report/images/csv.gif b/resources/www/report/images/csv.gif deleted file mode 100644 index 09550dfa3c..0000000000 Binary files a/resources/www/report/images/csv.gif and /dev/null differ diff --git a/resources/www/report/images/dash-ajax-loader.gif b/resources/www/report/images/dash-ajax-loader.gif deleted file mode 100644 index 85e107f90b..0000000000 Binary files a/resources/www/report/images/dash-ajax-loader.gif and /dev/null differ diff --git a/resources/www/report/images/filter.png b/resources/www/report/images/filter.png deleted file mode 100644 index 3b65d5c1a7..0000000000 Binary files a/resources/www/report/images/filter.png and /dev/null differ diff --git a/resources/www/report/images/filter_on.png b/resources/www/report/images/filter_on.png deleted file mode 100644 index 46f8b5794a..0000000000 Binary files a/resources/www/report/images/filter_on.png and /dev/null differ diff --git a/resources/www/report/images/group.png b/resources/www/report/images/group.png deleted file mode 100644 index 002d00c83a..0000000000 Binary files a/resources/www/report/images/group.png and /dev/null differ diff --git a/resources/www/report/images/loupe2.png b/resources/www/report/images/loupe2.png deleted file mode 100644 index 82763e47e1..0000000000 Binary files a/resources/www/report/images/loupe2.png and /dev/null differ diff --git a/resources/www/report/images/noresults.png b/resources/www/report/images/noresults.png deleted file mode 100644 index 127eda87a9..0000000000 Binary files a/resources/www/report/images/noresults.png and /dev/null differ diff --git a/resources/www/report/images/print.png b/resources/www/report/images/print.png deleted file mode 100644 index eb355fc5c7..0000000000 Binary files a/resources/www/report/images/print.png and /dev/null differ diff --git a/resources/www/report/images/white-arrow.gif b/resources/www/report/images/white-arrow.gif deleted file mode 100644 index 19ecebb38e..0000000000 Binary files a/resources/www/report/images/white-arrow.gif and /dev/null differ diff --git a/resources/www/report/js/jquery.cluetip.js b/resources/www/report/js/jquery.cluetip.js deleted file mode 100644 index 544c62e911..0000000000 --- a/resources/www/report/js/jquery.cluetip.js +++ /dev/null @@ -1,632 +0,0 @@ -/* - * jQuery clueTip plugin - * Version 1.1pre (May 16, 2010) - * @requires jQuery v1.3+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - */ - -/* - * - * Full list of options/settings can be found at the bottom of this file and at http://plugins.learningjquery.com/cluetip/ - * - * Examples can be found at http://plugins.learningjquery.com/cluetip/demo/ - * -*/ - -(function($) { - $.cluetip = {version: '1.1pre'}; - var $cluetip, $cluetipInner, $cluetipOuter, $cluetipTitle, $cluetipArrows, $cluetipWait, $dropShadow, imgCount; - var insertionType = 'appendTo', insertionElement = 'body'; - - - $.fn.cluetip = function(js, options) { - if (typeof js == 'object') { - options = js; - js = null; - } - if (js == 'destroy') { - return this.removeData('cluetip').unbind('.cluetip'); - } - - // merge per-call options with defaults - options = $.extend(true, {}, $.fn.cluetip.defaults, options || {}); - - /** =create cluetip divs **/ - - if (!$('#cluetip').length) { - $(['
', - '
', - '

', - '
', - '
', - '
', - '
', - '
'].join('')) - [insertionType](insertionElement).hide(); - - var cluezIndex = +options.cluezIndex; - - $cluetip = $('#cluetip').css({position: 'absolute'}); - $cluetipOuter = $('#cluetip-outer').css({position: 'relative', zIndex: cluezIndex}); - $cluetipInner = $('#cluetip-inner'); - $cluetipTitle = $('#cluetip-title'); - $cluetipArrows = $('#cluetip-arrows'); - $cluetipWait = $('
') - .css({position: 'absolute'}).insertBefore($cluetip).hide(); - } - var cluetipPadding = (parseInt($cluetip.css('paddingLeft'),10)||0) + (parseInt($cluetip.css('paddingRight'),10)||0); - - - this.each(function(index) { - var link = this, $this = $(this); - - // support metadata plugin (v1.0 and 2.0) - var opts = $.extend(true, {}, options, $.metadata ? $this.metadata() : $.meta ? $this.data() : {}); - - - // start out with no contents (for ajax activation) - var cluetipContents = false; - - cluezIndex = +opts.cluezIndex; - $this.data('cluetip', {title: link.title, zIndex: cluezIndex}); - var isActive = false, closeOnDelay = 0; - - var tipAttribute = $this.attr(opts.attribute), ctClass = opts.cluetipClass; - if (!tipAttribute && !opts.splitTitle && !js) { - return true; - } - // if hideLocal is set to true, on DOM ready hide the local content that will be displayed in the clueTip - if (opts.local && opts.localPrefix) {tipAttribute = opts.localPrefix + tipAttribute;} - if (opts.local && opts.hideLocal) { $(tipAttribute + ':first').hide(); } - var tOffset = parseInt(opts.topOffset, 10), lOffset = parseInt(opts.leftOffset, 10); - // vertical measurement variables - var tipHeight, wHeight, - defHeight = isNaN(parseInt(opts.height, 10)) ? 'auto' : (/\D/g).test(opts.height) ? opts.height : opts.height + 'px'; - var sTop, linkTop, posY, tipY, mouseY, baseline; - // horizontal measurement variables - var tipInnerWidth = parseInt(opts.width, 10) || 275, - tipWidth = tipInnerWidth + cluetipPadding + opts.dropShadowSteps, - linkWidth = this.offsetWidth, - linkLeft, posX, tipX, mouseX, winWidth; - - // parse the title - var tipParts; - var tipTitle = (opts.attribute != 'title') ? $this.attr(opts.titleAttribute) : ''; - if (opts.splitTitle) { - if (tipTitle == undefined) {tipTitle = '';} - tipParts = tipTitle.split(opts.splitTitle); - tipTitle = tipParts.shift(); - } - if (opts.escapeTitle) { - tipTitle = tipTitle.replace(/&/g,'&').replace(/>/g,'>').replace(/ linkLeft && linkLeft > tipWidth) - || linkLeft + linkWidth + tipWidth + lOffset > winWidth - ? linkLeft - tipWidth - lOffset - : linkWidth + linkLeft + lOffset; - if (link.tagName.toLowerCase() == 'area' || opts.positionBy == 'mouse' || linkWidth + tipWidth > winWidth) { // position by mouse - if (mouseX + 20 + tipWidth > winWidth) { - $cluetip.addClass(' cluetip-' + ctClass); - posX = (mouseX - tipWidth - lOffset) >= 0 ? mouseX - tipWidth - lOffset - parseInt($cluetip.css('marginLeft'),10) + parseInt($cluetipInner.css('marginRight'),10) : mouseX - (tipWidth/2); - } else { - posX = mouseX + lOffset; - } - } - var pY = posX < 0 ? event.pageY + tOffset : event.pageY; - $cluetip.css({ - left: (posX > 0 && opts.positionBy != 'bottomTop') ? posX : (mouseX + (tipWidth/2) > winWidth) ? winWidth/2 - tipWidth/2 : Math.max(mouseX - (tipWidth/2),0), - zIndex: $this.data('cluetip').zIndex - }); - $cluetipArrows.css({zIndex: $this.data('cluetip').zIndex+1}); - } - wHeight = $(window).height(); - -/*************************************** -* load a string from cluetip method's first argument -***************************************/ - if (js) { - if (typeof js == 'function') { - js = js.call(link); - } - $cluetipInner.html(js); - cluetipShow(pY); - } -/*************************************** -* load the title attribute only (or user-selected attribute). -* clueTip title is the string before the first delimiter -* subsequent delimiters place clueTip body text on separate lines -***************************************/ - - else if (tipParts) { - var tpl = tipParts.length; - $cluetipInner.html(tpl ? tipParts[0] : ''); - if (tpl > 1) { - for (var i=1; i < tpl; i++){ - $cluetipInner.append('
' + tipParts[i] + '
'); - } - } - cluetipShow(pY); - } -/*************************************** -* load external file via ajax -***************************************/ - - else if (!opts.local && tipAttribute.indexOf('#') !== 0) { - if (/\.(jpe?g|tiff?|gif|png)$/i.test(tipAttribute)) { - $cluetipInner.html('' + tipTitle + ''); - cluetipShow(pY); - } else if (cluetipContents && opts.ajaxCache) { - $cluetipInner.html(cluetipContents); - cluetipShow(pY); - } else { - var optionBeforeSend = opts.ajaxSettings.beforeSend, - optionError = opts.ajaxSettings.error, - optionSuccess = opts.ajaxSettings.success, - optionComplete = opts.ajaxSettings.complete; - var ajaxSettings = { - cache: false, // force requested page not to be cached by browser - url: tipAttribute, - beforeSend: function(xhr) { - if (optionBeforeSend) {optionBeforeSend.call(link, xhr, $cluetip, $cluetipInner);} - $cluetipOuter.children().empty(); - if (opts.waitImage) { - $cluetipWait - .css({top: mouseY+20, left: mouseX+20, zIndex: $this.data('cluetip').zIndex-1}) - .show(); - } - }, - error: function(xhr, textStatus) { - if (isActive) { - if (optionError) { - optionError.call(link, xhr, textStatus, $cluetip, $cluetipInner); - } else { - $cluetipInner.html('sorry, the contents could not be loaded'); - } - } - }, - success: function(data, textStatus) { - cluetipContents = opts.ajaxProcess.call(link, data); - if (isActive) { - if (optionSuccess) {optionSuccess.call(link, data, textStatus, $cluetip, $cluetipInner);} - $cluetipInner.html(cluetipContents); - } - }, - complete: function(xhr, textStatus) { - if (optionComplete) {optionComplete.call(link, xhr, textStatus, $cluetip, $cluetipInner);} - var imgs = $cluetipInner[0].getElementsByTagName('img'); - imgCount = imgs.length; - for (var i=0, l = imgs.length; i < l; i++) { - if (imgs[i].complete) { - imgCount--; - } - } - if (imgCount && !$.browser.opera) { - $(imgs).bind('load error', function() { - imgCount--; - if (imgCount<1) { - $cluetipWait.hide(); - if (isActive) { cluetipShow(pY); } - } - }); - } else { - $cluetipWait.hide(); - if (isActive) { cluetipShow(pY); } - } - } - }; - var ajaxMergedSettings = $.extend(true, {}, opts.ajaxSettings, ajaxSettings); - - $.ajax(ajaxMergedSettings); - } - -/*************************************** -* load an element from the same page -***************************************/ - } else if (opts.local) { - - var $localContent = $(tipAttribute + (/#\S+$/.test(tipAttribute) ? '' : ':eq(' + index + ')')).clone(true).show(); - if (opts.localIdSuffix) { - $localContent.attr('id', $localContent[0].id + opts.localIdSuffix); - } - $cluetipInner.html($localContent); - cluetipShow(pY); - } - }; - -// get dimensions and options for cluetip and prepare it to be shown - var cluetipShow = function(bpY) { - $cluetip.addClass('cluetip-' + ctClass); - if (opts.truncate) { - var $truncloaded = $cluetipInner.text().slice(0,opts.truncate) + '...'; - $cluetipInner.html($truncloaded); - } - - function doNothing() {}; //empty function - tipTitle ? $cluetipTitle.show().html(tipTitle) : (opts.showTitle) ? $cluetipTitle.show().html(' ') : $cluetipTitle.hide(); - if (opts.sticky) { - var $closeLink = $(''); - (opts.closePosition == 'bottom') ? $closeLink.appendTo($cluetipInner) : (opts.closePosition == 'title') ? $closeLink.prependTo($cluetipTitle) : $closeLink.prependTo($cluetipInner); - $closeLink.bind('click.cluetip', function() { - cluetipClose(); - return false; - }); - if (opts.mouseOutClose) { - $cluetip.bind('mouseleave.cluetip', function() { - cluetipClose(); - }); - } else { - $cluetip.unbind('mouseleave.cluetip'); - } - } -// now that content is loaded, finish the positioning - var direction = ''; - $cluetipOuter.css({zIndex: $this.data('cluetip').zIndex, overflow: defHeight == 'auto' ? 'visible' : 'auto', height: defHeight}); - tipHeight = defHeight == 'auto' ? Math.max($cluetip.outerHeight(),$cluetip.height()) : parseInt(defHeight,10); - tipY = posY; - baseline = sTop + wHeight; - if (opts.positionBy == 'fixed') { - tipY = posY - opts.dropShadowSteps + tOffset; - } else if ( (posX < mouseX && Math.max(posX, 0) + tipWidth > mouseX) || opts.positionBy == 'bottomTop') { - if (posY + tipHeight + tOffset > baseline && mouseY - sTop > tipHeight + tOffset) { - tipY = mouseY - tipHeight - tOffset; - direction = 'top'; - } else { - tipY = mouseY + tOffset; - direction = 'bottom'; - } - } else if ( posY + tipHeight + tOffset > baseline ) { - tipY = (tipHeight >= wHeight) ? sTop : baseline - tipHeight - tOffset; - } else if ($this.css('display') == 'block' || link.tagName.toLowerCase() == 'area' || opts.positionBy == "mouse") { - tipY = bpY - tOffset; - } else { - tipY = posY - opts.dropShadowSteps; - } - if (direction == '') { - posX < linkLeft ? direction = 'left' : direction = 'right'; - } - $cluetip.css({top: tipY + 'px'}).removeClass().addClass('clue-' + direction + '-' + ctClass).addClass(' cluetip-' + ctClass); - if (opts.arrows) { // set up arrow positioning to align with element - var bgY = (posY - tipY - opts.dropShadowSteps); - $cluetipArrows.css({top: (/(left|right)/.test(direction) && posX >=0 && bgY > 0) ? bgY + 'px' : /(left|right)/.test(direction) ? 0 : ''}).show(); - } else { - $cluetipArrows.hide(); - } - -// (first hide, then) ***SHOW THE CLUETIP*** - // handle dropshadow divs first - $dropShadow = createDropShadows(opts); - if ($dropShadow && $dropShadow.length) { - $dropShadow.hide().css({height: tipHeight, width: tipInnerWidth, zIndex: $this.data('cluetip').zIndex-1}).show(); - } - - $cluetip.hide()[opts.fx.open](opts.fx.openSpeed || 0); - if ($.fn.bgiframe) { $cluetip.bgiframe(); } - // delayed close (not fully tested) - if (opts.delayedClose > 0) { - closeOnDelay = setTimeout(cluetipClose, opts.delayedClose); - } - // trigger the optional onShow function - opts.onShow.call(link, $cluetip, $cluetipInner); - }; - -/*************************************** - =INACTIVATION --------------------------------------- */ - var inactivate = function(event) { - isActive = false; - $cluetipWait.hide(); - if (!opts.sticky || (/click|toggle/).test(opts.activation) ) { - cluetipClose(); - clearTimeout(closeOnDelay); - } - if (opts.hoverClass) { - $this.removeClass(opts.hoverClass); - } - }; -// close cluetip and reset some things - var cluetipClose = function() { - $cluetipOuter - .parent().hide().removeClass(); - opts.onHide.call(link, $cluetip, $cluetipInner); - $this.removeClass('cluetip-clicked'); - if (tipTitle) { - $this.attr(opts.titleAttribute, tipTitle); - } - $this.css('cursor',''); - if (opts.arrows) { - $cluetipArrows.css({top: ''}); - } - }; - - $(document).bind('hideCluetip', function(e) { - cluetipClose(); - }); -/*************************************** - =BIND EVENTS --------------------------------------- */ - // activate by click - if ( (/click|toggle/).test(opts.activation) ) { - $this.bind('click.cluetip', function(event) { - if ($cluetip.is(':hidden') || !$this.is('.cluetip-clicked')) { - activate(event); - $('.cluetip-clicked').removeClass('cluetip-clicked'); - $this.addClass('cluetip-clicked'); - } else { - inactivate(event); - } - this.blur(); - return false; - }); - // activate by focus; inactivate by blur - } else if (opts.activation == 'focus') { - $this.bind('focus.cluetip', function(event) { - activate(event); - }); - $this.bind('blur.cluetip', function(event) { - inactivate(event); - }); - // activate by hover - } else { - // clicking is returned false if clickThrough option is set to false - $this[opts.clickThrough ? 'unbind' : 'bind']('click', returnFalse); - //set up mouse tracking - var mouseTracks = function(evt) { - if (opts.tracking == true) { - var trackX = posX - evt.pageX; - var trackY = tipY ? tipY - evt.pageY : posY - evt.pageY; - $this.bind('mousemove.cluetip', function(evt) { - $cluetip.css({left: evt.pageX + trackX, top: evt.pageY + trackY }); - }); - } - }; - if ($.fn.hoverIntent && opts.hoverIntent) { - $this.hoverIntent({ - sensitivity: opts.hoverIntent.sensitivity, - interval: opts.hoverIntent.interval, - over: function(event) { - activate(event); - mouseTracks(event); - }, - timeout: opts.hoverIntent.timeout, - out: function(event) {inactivate(event); $this.unbind('mousemove.cluetip');} - }); - } else { - $this.bind('mouseenter.cluetip', function(event) { - activate(event); - mouseTracks(event); - }) - .bind('mouseleave.cluetip', function(event) { - inactivate(event); - $this.unbind('mousemove.cluetip'); - }); - } - - $this.bind('mouseover.cluetip', function(event) { - $this.attr('title',''); - }).bind('mouseleave.cluetip', function(event) { - $this.attr('title', $this.data('cluetip').title); - }); - } - }); - - /** =private functions - ************************************************************/ - /** =create dropshadow divs **/ - - function createDropShadows(options, newDropShadow) { - var dropShadowSteps = (options.dropShadow && options.dropShadowSteps) ? +options.dropShadowSteps : 0; - if ($.support.boxShadow) { - var dsOffsets = dropShadowSteps === 0 ? '0 0 ' : '1px 1px '; - $('#cluetip').css($.support.boxShadow, dsOffsets + dropShadowSteps + 'px rgba(0,0,0,0.5)'); - return false; - } - var oldDropShadow = $('#cluetip .cluetip-drop-shadow'); - if (dropShadowSteps == oldDropShadow.length) { - return oldDropShadow; - } - oldDropShadow.remove(); - var dropShadows = []; - for (var i=0; i < dropShadowSteps;) { - dropShadows[i++] = '
'; - } - - newDropShadow = $(dropShadows.join('')) - .css({ - position: 'absolute', - backgroundColor: '#FFF', - zIndex: cluezIndex -1 - }) - .addClass('cluetip-drop-shadow') - .prependTo('#cluetip'); - return newDropShadow; - - } - - - return this; - }; - - (function() { - $.support = $.support || {}; - // check support for CSS3 properties (currently only boxShadow) - var div = document.createElement('div'), - divStyle = div.style, - styleProps = ['boxShadow'], - prefixes = ['moz', 'Moz', 'webkit', 'o']; - - for (var i=0, sl = styleProps.length; i < sl; i++) { - var prop = styleProps[i], - uProp = prop.charAt(0).toUpperCase() + prop.slice(1); - - if ( typeof divStyle[ prop ] !== 'undefined' ) { - $.support[ prop ] = prop; - } else { - for (var j=0, pl = prefixes.length; j < pl; j++) { - - if (typeof divStyle[ prefixes[j] + uProp ] !== 'undefined') { - $.support[ prop ] = prefixes[j] + uProp; - break; - } - } - } - } - div = null; delete div; - })(); - -/* - * options for clueTip - * - * each one can be explicitly overridden by changing its value. - * for example: $.fn.cluetip.defaults.width = 200; - * would change the default width for all clueTips to 200. - * - * each one can also be overridden by passing an options map to the cluetip method. - * for example: $('a.example').cluetip({width: 200}); - * would change the default width to 200 for clueTips invoked by a link with class of "example" - * - */ - - $.fn.cluetip.defaults = { // set up default options - width: 'auto', // The width of the clueTip - height: 'auto', // The height of the clueTip - cluezIndex: 9999, // Sets the z-index style property of the clueTip - positionBy: 'auto', // Sets the type of positioning: 'auto', 'mouse','bottomTop', 'fixed' - topOffset: 5, // Number of px to offset clueTip from top of invoking element - leftOffset: 5, // Number of px to offset clueTip from left of invoking element - local: false, // Whether to use content from the same page for the clueTip's body - localPrefix: null, // string to be prepended to the tip attribute if local is true - localIdSuffix: null, // string to be appended to the cluetip content element's id if local is true - hideLocal: true, // If local option is set to true, this determines whether local content - // to be shown in clueTip should be hidden at its original location - attribute: 'rel', // the attribute to be used for fetching the clueTip's body content - titleAttribute: 'title', // the attribute to be used for fetching the clueTip's title - splitTitle: '', // A character used to split the title attribute into the clueTip title and divs - // within the clueTip body. more info below [6] - escapeTitle: false, // whether to html escape the title attribute - showTitle: false, // show title bar of the clueTip, even if title attribute not set - cluetipClass: '',// class added to outermost clueTip div in the form of 'cluetip-' + clueTipClass. - hoverClass: '', // class applied to the invoking element onmouseover and removed onmouseout - waitImage: true, // whether to show a "loading" img, which is set in jquery.cluetip.css - cursor: 'help', - arrows: false, // if true, displays arrow on appropriate side of clueTip - dropShadow: false, // set to false if you don't want the drop-shadow effect on the clueTip - dropShadowSteps: 6, // adjusts the size of the drop shadow - sticky: false, // keep visible until manually closed - mouseOutClose: false, // close when clueTip is moused out - activation: 'hover', // set to 'click' to force user to click to show clueTip - // set to 'focus' to show on focus of a form element and hide on blur - clickThrough: false, // if true, and activation is not 'click', then clicking on link will take user to the link's href, - // even if href and tipAttribute are equal - tracking: false, // if true, clueTip will track mouse movement (experimental) - delayedClose: 0, // close clueTip on a timed delay (experimental) - closePosition: 'top', // location of close text for sticky cluetips; can be 'top' or 'bottom' or 'title' - closeText: 'Close', // text (or HTML) to to be clicked to close sticky clueTips - truncate: 0, // number of characters to truncate clueTip's contents. if 0, no truncation occurs - - // effect and speed for opening clueTips - fx: { - open: 'show', // can be 'show' or 'slideDown' or 'fadeIn' - openSpeed: '' - }, - - // settings for when hoverIntent plugin is used - hoverIntent: { - sensitivity: 3, - interval: 50, - timeout: 0 - }, - - // short-circuit function to run just before clueTip is shown. - onActivate: function(e) {return true;}, - // function to run just after clueTip is shown. - onShow: function(ct, ci){}, - // function to run just after clueTip is hidden. - onHide: function(ct, ci){}, - // whether to cache results of ajax request to avoid unnecessary hits to server - ajaxCache: true, - - // process data retrieved via xhr before it's displayed - ajaxProcess: function(data) { - data = data.replace(/<(script|style|title)[^<]+<\/(script|style|title)>/gm, '').replace(/<(link|meta)[^>]+>/g,''); - return data; - }, - - // can pass in standard $.ajax() parameters. Callback functions, such as beforeSend, - // will be queued first within the default callbacks. - // The only exception is error, which overrides the default - ajaxSettings: { - // error: function(ct, ci) { /* override default error callback */ } - // beforeSend: function(ct, ci) { /* called first within default beforeSend callback } - dataType: 'html' - }, - debug: false - }; - - -/* - * Global defaults for clueTips. Apply to all calls to the clueTip plugin. - * - * @example $.cluetip.setup({ - * insertionType: 'prependTo', - * insertionElement: '#container' - * }); - * - * @property - * @name $.cluetip.setup - * @type Map - * @cat Plugins/tooltip - * @option String insertionType: Default is 'appendTo'. Determines the method to be used for inserting the clueTip into the DOM. Permitted values are 'appendTo', 'prependTo', 'insertBefore', and 'insertAfter' - * @option String insertionElement: Default is 'body'. Determines which element in the DOM the plugin will reference when inserting the clueTip. - * - */ - - var insertionType = 'appendTo', insertionElement = 'body'; - - $.cluetip.setup = function(options) { - if (options && options.insertionType && (options.insertionType).match(/appendTo|prependTo|insertBefore|insertAfter/)) { - insertionType = options.insertionType; - } - if (options && options.insertionElement) { - insertionElement = options.insertionElement; - } - }; - -})(jQuery); diff --git a/resources/www/report/js/jquery.gvChart-0.1.js b/resources/www/report/js/jquery.gvChart-0.1.js deleted file mode 100644 index 8d69a9436b..0000000000 --- a/resources/www/report/js/jquery.gvChart-0.1.js +++ /dev/null @@ -1,86 +0,0 @@ -/* - * jQuery gvChart plugin - * This plugin was created to simplify things when using Google Visualisation Charts. - * It still needs to be used with google script import tag, however now you can - * crate chart from your table. - * All examples you will find on http://www.ivellios.toron.pl/technikalia/demos/gvChart/ - * @name jquery.gvChart-1.0.1.js - * @author Janusz Kamieński - http://www.ivellios.toron.pl/technikalia - * @version 1.0.1 - * @date December 04, 2010 - * @category jQuery plugin google charts - * @copyright (c) 2010 Janusz Kamieński (www.ivellios.toron.pl) - * @license CC Attribution Works 3.0 Poland - http://creativecommons.org/licenses/by/3.0/pl/deed.en_US - * @example Visit http://www.ivellios.toron.pl/technikalia/demos/gvChart/ for more informations about this jQuery plugin - */ -(function (jQuery){ - jQuery.fn.gvChart = function(settings){ - - defaults={ - hideTable: true, - chartType: 'AreaChart', - chartDivID: 'gvChartDiv', - gvSettings: null - }; - - var el = document.createElement('div'); - jQuery(el).insertBefore(this); - gvChartCount++; - gvChartID = defaults.chartDivID+gvChartCount; - jQuery(el).attr('id',gvChartID); - jQuery(el).addClass('gvChart'); - - if(settings){ - jQuery.extend(defaults,settings); - } - - if(defaults.hideTable) - $(this).hide(); - - var data = new google.visualization.DataTable(); - - // add X label - data.addColumn('string','X labels'); - - var a = new Array(); - - var headers = $(this).find('thead').find('th'); - var rows = $(this).find('tbody').find('tr'); - - rows.each(function(index){ - data.addColumn('number',$(this).find('th').text()); - }); - - data.addRows(headers.length-1); - - headers.each(function(index){ - if(index){ - data.setCell(index-1, 0, $(this).text()); - } - }); - - rows.each(function(index){ - $(this).find('td').each(function(index2){ - data.setCell(index2, index+1, parseFloat($(this).text())); - }); - }); - - chartSettings = { - title : $(this).find('caption').text() - }; - - if(defaults.gvSettings){ - jQuery.extend(chartSettings,defaults.gvSettings); - } - - eval("var chart = new google.visualization."+defaults.chartType+"(document.getElementById('"+gvChartID+"'))"); - chart.draw(data, chartSettings); - } -})(jQuery); - - -function gvChartInit(){ - gvChartCount = 0; - google.load('visualization', '1', {packages: ['corechart']}); -} - diff --git a/resources/www/report/js/jquery.nicoslider.js b/resources/www/report/js/jquery.nicoslider.js deleted file mode 100644 index 10acff56fa..0000000000 --- a/resources/www/report/js/jquery.nicoslider.js +++ /dev/null @@ -1,138 +0,0 @@ -(function ($) { - $.fn.nicoslider = function (options) { - var defaults = { - start: 0, - color: '#F6F2F1', - sliderHeight: false - }; - - var opts = $.extend({}, $.fn.nicoslider.defaults, defaults, options); - - return this.each(function () { - new nicoslide(this, opts); - }); - }; - - - var nicoslide = function (slider, o) { - var $slider = $(slider); - - $sliderWidth = $slider.parent().innerWidth(); - - $sliderCss = { - 'width': $sliderWidth, - 'background-color': o.color - }; - - $slider.css($sliderCss); - - var ul = $slider.find("ul"); - var ulWidth = 0; - var liHeight = 0; - - $slider.find("li").each(function () { - ulWidth += $(this).width() + 5; - ulWidth += parseInt($(this).css("padding-left")); - ulWidth += parseInt($(this).css("padding-right")); - ulWidth += parseInt($(this).css("margin-left")); - ulWidth += parseInt($(this).css("margin-right")); - liHeight = Math.max(liHeight, $(this).outerHeight()); - }); - //5 % of slider width - $scrollWidth = Math.round(parseInt($sliderWidth) * parseFloat("0.05")); - //min 30 px; - if ($scrollWidth < 30) { - $scrollWidth = 30; - } - - var $wrapperWidth = Math.round(parseInt($sliderWidth) - ( 2 * $scrollWidth )); - - if (ulWidth > $wrapperWidth) { - ul.wrapAll("
"); - $wrapper = $slider.find(".wrapper"); - $ulHeight = ul.height(); - $wrapper.width($wrapperWidth); - $wrapper.height($ulHeight); - - $wrapperCss = { - 'overflow': 'hidden', - 'float': 'left', - 'position': 'relative' - }; - - $wrapper.css($wrapperCss); - ul.css('position', 'absolute'); - ul.width(ulWidth); - $slider.prepend("
"); - $slider.append("
"); - - var rightScroll = $slider.find(".scrollright"); - var leftScroll = $slider.find(".scrollleft"); - - rightScroll.append("
>
"); - leftScroll.append("
<
"); - - $("div.rb").css('float', 'right'); - - rightCss = { - 'width': $scrollWidth - ($wrapper.outerWidth(true) - $wrapper.innerWidth()), - 'height': liHeight + 5, - 'float': 'right', - 'background-color': o.color, - 'cursor': 'pointer', - ' user-select': 'none' - }; - - leftCss = { - 'width': $scrollWidth - ($wrapper.outerWidth(true) - $wrapper.innerWidth()), - 'height': liHeight + 5, - 'float': 'left', - 'background-color': o.color, - 'cursor': 'pointer', - ' user-select': 'none' - }; - - leftScroll.css(leftCss); - rightScroll.css(rightCss); - - var rightScrollWidth = rightScroll.width(); - var leftScrollWidth = leftScroll.width(); - var scrollXpos = 0; - var scrollStepSpeed = 40; - var speed = 8; - var shift = o.start; - - - //scroll a droite - rightScroll.bind("click", function (e) { - var x = e.pageX - ($(this).offset().left); - scrollXpos = Math.round((x / rightScrollWidth) * scrollStepSpeed); - shift += (scrollXpos * speed); - - if (shift > (ulWidth - $wrapperWidth) + 50) { - shift = (ulWidth - $wrapperWidth) + 50; - } - ul.animate({ - left: -shift - }, 1); - }); - - //scroll a gauche - leftScroll.bind("click", function (e) { - var x = $(this).innerWidth() - (e.pageX - $(this).offset().left); - - scrollXpos = Math.round((x / leftScrollWidth) * scrollStepSpeed); - shift -= (scrollXpos * speed); - - if (shift < 0) { - shift = 0; - } - - ul.animate({ - left: -shift - }, 1); - - }); - } - }; -})(jQuery); diff --git a/resources/www/report/js/jquery.print.js b/resources/www/report/js/jquery.print.js deleted file mode 100644 index 8a2cd7bb66..0000000000 --- a/resources/www/report/js/jquery.print.js +++ /dev/null @@ -1,75 +0,0 @@ -// ----------------------------------------------------------------------- -// Eros Fratini - eros@recoding.it -// jqprint 0.3 -// -// - 19/06/2009 - some new implementations, added Opera support -// - 11/05/2009 - first sketch -// -// Printing plug-in for jQuery, evolution of jPrintArea: http://plugins.jquery.com/project/jPrintArea -// requires jQuery 1.3.x -// -// Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php -//------------------------------------------------------------------------ - -(function($) { - var opt; - - $.fn.jqprint = function (options) { - opt = $.extend({}, $.fn.jqprint.defaults, options); - - var $element = (this instanceof jQuery) ? this : $(this), doc; - - if (opt.operaSupport && $.browser.opera) - { - var tab = window.open("","jqPrint-preview"); - tab.document.open(); - - doc = tab.document; - } - else - { - var $iframe = $(" {% endblock report_layout %} diff --git a/templates/web/report/report_layout_child.html.twig b/templates/web/report/report_layout_child.html.twig index 9b78aaa6a8..7189f73fec 100644 --- a/templates/web/report/report_layout_child.html.twig +++ b/templates/web/report/report_layout_child.html.twig @@ -1,214 +1,97 @@ {% extends "report/report_layout.html.twig" %} -{% block report_dashboard_layout %} -
-
-
-
-
-
- -
- - -
- -
- to - - -
- -
-
- - - {{ - "Report generation may take a long time to generate, depending on the number of collections and the period selected." | trans - }} - -
- {#
#} - {#
{% trans "report:: 2 - Bases" %}
#} - {# #} - {# #} - {#
#} -
-
-
- -
-
-
-
-{% endblock report_dashboard_layout %} +{% block report_connections_layout %} +
+
-{% block report_connexion_layout %} -
+ {% include "report/form_date_and_base.html.twig" with {'tab': "connections", 'route': "report2_connections", 'displayCollections':false } %} - - {% include "report/form_date_and_base.html.twig" %} {% block form_connexion %} -
-
{{ "report:: 3 - Type de report" | trans }}
- {% if not anonymous %} -
- - -
- {% else %} -
- - - -
- {% endif %} -
- - -
-
- - -
-
+
+
{{ "report:: 3 - Type de report" | trans }}
+ +
{% endblock form_connexion %} - - {% include "report/panel_hide_button.html.twig" %} -
-
- {% if ajax %} - {% include "report/ajax_report_content.html.twig" %} - {%endif%} -
+
+
+
-{% endblock report_connexion_layout %} +{% endblock report_connections_layout %} -{% block report_telechargement_layout %} -
-
- {% include "report/form_date_and_base.html.twig" %} - {% block form_telechargement %} -
-
{% trans %}report:: 3 - Type de report{% endtrans %}
- {% if anonymous %} -
- - - -
- {% else %} -
- - -
- {% endif %} -
- - -
-
- - -
-
- - - - -
-
- {% endblock form_telechargement %} +{% block report_downloads_layout %} +
+ + + {% include "report/form_date_and_base.html.twig" with {'tab': "downloads", 'route': "report2_downloads", 'displayCollections': true } %} + +
+
{% trans %}report:: 3 - Type de report{% endtrans %}
+ + +
- {% include "report/panel_hide_button.html.twig" %} -
-
- {% if ajax %} - {% include "report/ajax_report_content.html.twig" %} - {%endif%} -
-
-
-{% endblock report_telechargement_layout %} -{% block report_activite_layout %} -
-
- {% include "report/form_date_and_base.html.twig" %} - {% block form_activite %} -
-
{{ "report:: 3 - Type de report" | trans }}
- {% if anonymous %} - - {% endif %} -
- - -
-
- - -
-
- - -
-
- - -
-
- - - -
-
- {% endblock form_activite %} -
- {% include "report/panel_hide_button.html.twig" %} -
-
- {% if ajax %} - {% include "report/ajax_report_content.html.twig" %} - {%endif%} -
+
+
+
-{% endblock report_activite_layout %} +{% endblock report_downloads_layout %} + +{% block report_records_layout %} +
+
+ + {% include "report/form_date_and_base.html.twig" with {'tab': "records", 'route': "report2_records", 'displayCollections': true } %} + + {% block form_records %} +
+
{{ "report:: 4 - Fields" | trans }}
+ +
+
+ + +
+ +
    + {% for sbas_id,databox in granted_bases %} + {% for meta in databox.metas %} +
  • + +
    • + {% endfor %} + {% endfor %} +
+
+
+ {% endblock form_records %} +
+ +
+ +
+ +
+{% endblock report_records_layout %} diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Report/ActivityTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Report/ActivityTest.php deleted file mode 100644 index 7da550529e..0000000000 --- a/tests/Alchemy/Tests/Phrasea/Controller/Report/ActivityTest.php +++ /dev/null @@ -1,667 +0,0 @@ -dmax = new \DateTime('now'); - $this->dmin = new \DateTime('-1 month'); - } - - public function testDoReportConnexionsByUsers() - { - self::$DI['client']->request('POST', '/report/activity/users/connexions', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'page' => 1, - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportConnexionsByUsersCSV() - { - self::$DI['client']->request('POST', '/report/activity/users/connexions', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'page' => 1, - 'limit' => 10, - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDownloadsByUsers() - { - self::$DI['client']->request('POST', '/report/activity/users/downloads', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'page' => 1, - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDownloadsByUsersCSV() - { - self::$DI['client']->request('POST', '/report/activity/users/downloads', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'page' => 1, - 'limit' => 10, - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportBestOfQuestions() - { - self::$DI['client']->request('POST', '/report/activity/questions/best-of', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportBestOfQuestionsCSV() - { - self::$DI['client']->request('POST', '/report/activity/questions/best-of', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'limit' => 10, - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportNoBestOfQuestions() - { - self::$DI['client']->request('POST', '/report/activity/questions/no-best-of', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportNoBestOfQuestionsCSV() - { - self::$DI['client']->request('POST', '/report/activity/questions/no-best-of', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'limit' => 10, - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportSiteActiviyPerHours() - { - self::$DI['client']->request('POST', '/report/activity/instance/hours', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportSiteActiviyPerHoursCSV() - { - self::$DI['client']->request('POST', '/report/activity/instance/hours', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportSiteActivityPerDays() - { - self::$DI['client']->request('POST', '/report/activity/instance/days', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportSiteActivityPerDaysCSV() - { - self::$DI['client']->request('POST', '/report/activity/instance/days', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportPushedDocuments() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/pushed', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'order' => 'ASC', - 'champ' => 'user', - 'page' => 1, - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportPushedDocumentsPrintCSV() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/pushed', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportPushedDocumentsFilterColumns() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/pushed', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'list_column' => 'user ddate', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportPushedDocumentsFilterResultOnOneColumn() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/pushed', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'filter_column' => 'user', - 'filter_value' => 'admin', - 'liste' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportPushedDocumentsFilterConf() - { - self::$DI['client']->request('POST', '/report/activity/documents/pushed', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'conf' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportPushedDocumentsGroupBy() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/pushed', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'groupby' => 'user', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportAddedDocuments() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/added', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'order' => 'ASC', - 'champ' => 'user', - 'page' => 1, - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportAddedDocumentsPrintCSV() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/added', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportAddedDocumentsFilterColumns() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/added', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'list_column' => 'user ddate', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportAddedDocumentsFilterResultOnOneColumn() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/added', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'filter_column' => 'user', - 'filter_value' => 'admin', - 'liste' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportAddedDocumentsFilterConf() - { - self::$DI['client']->request('POST', '/report/activity/documents/added', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'conf' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportAddedDocumentsGroupBy() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/added', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'groupby' => 'user', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportEditedDocuments() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/edited', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'order' => 'ASC', - 'champ' => 'user', - 'page' => 1, - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportEditedDocumentsPrintCSV() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/edited', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportEditedDocumentsFilterColumns() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/edited', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'list_column' => 'user ddate', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportEditedDocumentsFilterResultOnOneColumn() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/edited', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'filter_column' => 'user', - 'filter_value' => 'admin', - 'liste' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportEditedDocumentsFilterConf() - { - self::$DI['client']->request('POST', '/report/activity/documents/edited', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'conf' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportEditedDocumentsGroupBy() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/edited', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'groupby' => 'user', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportValidatedDocuments() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/validated', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'order' => 'ASC', - 'champ' => 'user', - 'page' => 1, - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportValidatedDocumentsPrintCSV() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/validated', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportValidatedDocumentsFilterColumns() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/validated', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'list_column' => 'user ddate', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportValidatedDocumentsFilterResultOnOneColumn() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/validated', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'filter_column' => 'user', - 'filter_value' => 'admin', - 'liste' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportValidatedDocumentsFilterConf() - { - self::$DI['client']->request('POST', '/report/activity/documents/validated', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'conf' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportValidatedDocumentsGroupBy() - { - $this->markTestSkipped( - 'Report is broken since table "log_colls" is deleted.' - ); - - self::$DI['client']->request('POST', '/report/activity/documents/validated', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'groupby' => 'user', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } -} diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Report/InformationsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Report/InformationsTest.php deleted file mode 100644 index 4f6456d31e..0000000000 --- a/tests/Alchemy/Tests/Phrasea/Controller/Report/InformationsTest.php +++ /dev/null @@ -1,339 +0,0 @@ -dmax = new \DateTime('now'); - $this->dmin = new \DateTime('-1 month'); - - $this->client = $this->getClient(); - } - - public function testDoReportUserBadRequest() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - ]); - - $response = $this->client->getResponse(); - - $this->assertFalse($response->isOk()); - $this->assertEquals(400, $response->getStatusCode()); - } - - public function testDoReportUser() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'user' => $this->getUser()->getId(), - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportUserFromConnexion() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'user' => $this->getUser()->getId(), - 'from' => 'CNX', - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportUserFromQuestion() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'from' => 'ASK', - 'user' => $this->getUser()->getId(), - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportUserFromDownload() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'from' => 'GEN', - 'user' => $this->getUser()->getId(), - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportUserFromConnexionCSV() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'from' => 'CNX', - 'printcsv' => 'on', - 'user' => $this->getUser()->getId(), - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportUserFromQuestionCSV() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'from' => 'ASK', - 'printcsv' => 'on', - 'user' => $this->getUser()->getId(), - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportUserFromDownloadCSV() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'from' => 'GEN', - 'printcsv' => 'on', - 'user' => $this->getUser()->getId(), - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportUserFromDownloadOnCustomField() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'from' => 'GEN', - 'on' => 'email', - 'user' => $this->getUser()->getEmail() - ]); - - $response = $this->client->getResponse(); - $this->assertTrue($response->isOk()); - } - - public function testDoReportUserFromConnexionOnCustomField() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'from' => 'CNX', - 'on' => 'email', - 'user' => $this->getUser()->getEmail() - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportUserFromQuestionOnCustomField() - { - $this->client->request('POST', '/report/informations/user', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'from' => 'ASK', - 'on' => 'email', - 'user' => $this->getUser()->getEmail() - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportInformationBrowserBadRequest() - { - $this->client->request('POST', '/report/informations/browser', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - ]); - - $response = $this->client->getResponse(); - - $this->assertFalse($response->isOk()); - $this->assertEquals(400, $response->getStatusCode()); - } - - public function testDoReportInfomationsBrowser() - { - $this->client->request('POST', '/report/informations/browser', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'user' => 'chrome', - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportInfomationsDocumentsNotFound() - { - $this->client->request('POST', '/report/informations/document', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'sbasid' => 0, - 'rid' => 0, - ]); - - $response = $this->client->getResponse(); - - $this->assertFalse($response->isOk()); - $this->assertEquals(404, $response->getStatusCode()); - } - - public function testDoReportInfomationsDocuments() - { - $this->client->request('POST', '/report/informations/document', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'sbasid' => $this->getRecord1()->getDataboxId(), - 'rid' => $this->getRecord1()->getRecordId(), - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportInfomationsDocumentsFromTool() - { - $this->client->request('POST', '/report/informations/document', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'sbasid' => $this->getRecord1()->getDataboxId(), - 'rid' => $this->getRecord1()->getRecordId(), - 'from' => 'TOOL' - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportInfomationsDocumentsFromDashboard() - { - $this->client->request('POST', '/report/informations/document', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'sbasid' => $this->getRecord1()->getDataboxId(), - 'rid' => $this->getRecord1()->getRecordId(), - 'from' => 'DASH' - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportInfomationsDocumentsFromOther() - { - $this->client->request('POST', '/report/informations/document', [ - 'dmin' => $this->dmin->format('Y-m-d H:i:s'), - 'dmax' => $this->dmax->format('Y-m-d H:i:s'), - 'sbasid' => $this->getCollection()->get_sbas_id(), - 'collection' => $this->getCollection()->get_coll_id(), - 'sbasid' => $this->getRecord1()->getDataboxId(), - 'rid' => $this->getRecord1()->getRecordId(), - 'user' => $this->getUser()->getId() - ]); - - $response = $this->client->getResponse(); - - $this->assertTrue($response->isOk()); - } - - /** - * @return User - */ - private function getUser() - { - return self::$DI['user']; - } -} diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php index ed4edb22b5..ca6fc5141e 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php @@ -29,435 +29,4 @@ class RootTest extends \PhraseanetAuthenticatedWebTestCase $this->assertTrue($response->isOk()); } - - public function testRouteDashboardJson() - { - $this->authenticate(self::$DI['app']); - - $response = $this->XMLHTTPRequest('GET', '/report/dashboard', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmin->format('Y-m-d'), - ]); - - $this->assertTrue($response->isOk()); - } - - public function testRouteInitReport() - { - self::$DI['client']->request('POST', '/report/init', ['popbases' => ['1_1']]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportConnexions() - { - self::$DI['client']->request('POST', '/report/connexions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'order' => 'ASC', - 'champ' => 'user', - 'page' => 1, - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportConnexionsPrintCSV() - { - self::$DI['client']->request('POST', '/report/connexions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportConnexionsFilterColumns() - { - self::$DI['client']->request('POST', '/report/connexions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'list_column' => 'user ddate', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportConnexionsFilterResultOnOneColumn() - { - self::$DI['client']->request('POST', '/report/connexions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'filter_column' => 'user', - 'filter_value' => 'admin', - 'liste' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportConnexionsFilterConf() - { - self::$DI['client']->request('POST', '/report/connexions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'conf' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportConnexionsGroupBy() - { - self::$DI['client']->request('POST', '/report/connexions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'groupby' => 'user', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportQuestions() - { - self::$DI['client']->request('POST', '/report/questions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'order' => 'ASC', - 'champ' => 'user', - 'page' => 1, - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportQuestionsPrintCSV() - { - self::$DI['client']->request('POST', '/report/questions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportQuestionsFilterColumns() - { - self::$DI['client']->request('POST', '/report/questions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'list_column' => 'user ddate', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportQuestionsFilterResultOnOneColumn() - { - self::$DI['client']->request('POST', '/report/questions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'filter_column' => 'user', - 'filter_value' => 'admin', - 'liste' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportQuestionsFilterConf() - { - self::$DI['client']->request('POST', '/report/questions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'conf' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportQuestionsGroupBy() - { - self::$DI['client']->request('POST', '/report/questions', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'groupby' => 'user', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDownloads() - { - self::$DI['client']->request('POST', '/report/downloads', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'order' => 'ASC', - 'champ' => 'user', - 'page' => 1, - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDownloadsPrintCSV() - { - self::$DI['client']->request('POST', '/report/downloads', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDownloadsFilterColumns() - { - self::$DI['client']->request('POST', '/report/downloads', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'list_column' => 'user ddate', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDownloadsFilterResultOnOneColumn() - { - self::$DI['client']->request('POST', '/report/downloads', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'filter_column' => 'user', - 'filter_value' => 'admin', - 'liste' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDownloadsFilterConf() - { - self::$DI['client']->request('POST', '/report/downloads', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'conf' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDownloadsGroupBy() - { - self::$DI['client']->request('POST', '/report/downloads', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'groupby' => 'user', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDocuments() - { - self::$DI['client']->request('POST', '/report/documents', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'order' => 'ASC', - 'champ' => 'final', - 'tbl' => 'DOC', - 'page' => 1, - 'limit' => 10, - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDocumentsPrintCSV() - { - self::$DI['client']->request('POST', '/report/documents', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDocumentsFilterColumns() - { - self::$DI['client']->request('POST', '/report/documents', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'list_column' => 'file mime', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDocumentsFilterResultOnOneColumn() - { - self::$DI['client']->request('POST', '/report/documents', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'filter_column' => 'mime', - 'filter_value' => 'pdf', - 'liste' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDocumentsFilterConf() - { - self::$DI['client']->request('POST', '/report/documents', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'conf' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportDocumentsGroupBy() - { - self::$DI['client']->request('POST', '/report/documents', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'groupby' => 'mime', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportClients() - { - self::$DI['client']->request('POST', '/report/clients', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } - - public function testDoReportClientPrintCSV() - { - self::$DI['client']->request('POST', '/report/clients', [ - 'dmin' => $this->dmin->format('Y-m-d'), - 'dmax' => $this->dmax->format('Y-m-d'), - 'sbasid' => self::$DI['collection']->get_sbas_id(), - 'collection' => self::$DI['collection']->get_coll_id(), - 'printcsv' => 'on', - ]); - - $response = self::$DI['client']->getResponse(); - - $this->assertTrue($response->isOk()); - } }