diff --git a/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php b/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php index 58402404c7..4d0768e978 100644 --- a/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php +++ b/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php @@ -125,7 +125,7 @@ class Step31 implements DatasUpgraderInterface $uuid = Uuid::uuid4(); try { $media = $this->app['mediavorus']->guess($pathfile); - $collection = \collection::get_from_coll_id($app, $databox, (int) $record['coll_id']); + $collection = \collection::get_from_coll_id($this->$app, $databox, (int) $record['coll_id']); $file = new File($this->app, $media, $collection); $uuid = $file->getUUID(true, true); diff --git a/lib/Alchemy/Phrasea/Controller/Report/Root.php b/lib/Alchemy/Phrasea/Controller/Report/Root.php index 2393fb91d0..9ae22fb128 100644 --- a/lib/Alchemy/Phrasea/Controller/Report/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Report/Root.php @@ -68,38 +68,54 @@ class Root implements ControllerProviderInterface */ public function getDashboard(Application $app, Request $request) { - $dashboard = new \module_report_dashboard($app, $app['authentication']->getUser()); + if ('json' !== $request->getRequestFormat()) { + \Session_Logger::updateClientInfos($app, 4); - if ('json' !== $request->getRequestFormat()) { - \Session_Logger::updateClientInfos($app, 4); + $dashboard = new \module_report_dashboard($app, $app['authentication']->getUser()); + + $dmin = $request->query->get('dmin'); + $dmax = $request->query->get('dmax'); + + if ($dmin && $dmax) { + $dashboard->setDate($dmin, $dmax); + } $dashboard->execute(); - return $app['twig']->render('report/report_layout_child.html.twig', [ - 'ajax_dash' => true, - 'dashboard' => $dashboard, - 'home_title' => $app['conf']->get(['registry', 'general', 'title']), - 'module' => 'report', - 'module_name' => 'Report', - 'anonymous' => $app['conf']->get(['registry', 'modules', 'anonymous-report']), - 'g_anal' => $app['conf']->get(['registry', 'general', 'analytics']), - 'ajax' => false, - 'ajax_chart' => false - ]); + return $app->json(array('html' => $app['twig']->render('report/ajax_dashboard_content_child.html.twig', array( + 'dashboard' => $dashboard + )))); } - $dmin = $request->request->get('dmin'); - $dmax = $request->request->get('dmax'); + $granted = array(); - if ($dmin && $dmax) { - $dashboard->setDate($dmin, $dmax); + foreach($app['acl']->get($app['authentication']->getUser())->get_granted_base(array('canreport')) as $collection) { + if (!isset($granted[$collection->get_sbas_id()])) { + $granted[$collection->get_sbas_id()] = array( + 'id' => $collection->get_sbas_id(), + 'name' => $collection->get_databox()->get_viewname(), + 'collections' => array() + ); + } + $granted[$collection->get_sbas_id()]['collections'][] = array( + 'id' => $collection->get_coll_id(), + 'base_id' => $collection->get_base_id(), + 'name' => $collection->get_name() + ); } - $dashboard->execute(); - - return $app->json(['html' => $app['twig']->render('report/ajax_dashboard_content_child.html.twig', [ - 'dashboard' => $dashboard - ])]); + return $app['twig']->render('report/report_layout_child.html.twig', array( + 'ajax_dash' => true, + 'dashboard' => null, + 'granted_bases' => $granted, + 'home_title' => $app['phraseanet.registry']->get('GV_homeTitle'), + 'module' => 'report', + 'module_name' => 'Report', + 'anonymous' => $app['phraseanet.registry']->get('GV_anonymousReport'), + 'g_anal' => $app['phraseanet.registry']->get('GV_googleAnalytics'), + 'ajax' => false, + 'ajax_chart' => false + )); } /** @@ -115,15 +131,15 @@ class Root implements ControllerProviderInterface $popbases = $request->request->get('popbases', []); if ('' === $dmin = $request->request->get('dmin', '')) { - $dmin = '01-' . date('m') . '-' . date('Y'); + $dmin = date('Y') . '-' . date('m') . '-01'; } if ('' === $dmax = $request->request->get('dmax', '')) { - $dmax = date('d') . '-' . date('m') . '-' . date('Y'); + $dmax = date('Y') . '-' . date('m') . '-' . date('d'); } - $dmin = \DateTime::createFromFormat('d-m-Y H:i:s', sprintf('%s 00:00:00', $dmin)); - $dmax = \DateTime::createFromFormat('d-m-Y H:i:s', sprintf('%s 23:59:59', $dmax)); + $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 = []; diff --git a/templates/web/report/ajax_dashboard_content_child.html.twig b/templates/web/report/ajax_dashboard_content_child.html.twig index dd6dfa6be3..91fcb68bc2 100644 --- a/templates/web/report/ajax_dashboard_content_child.html.twig +++ b/templates/web/report/ajax_dashboard_content_child.html.twig @@ -1,91 +1,84 @@ {% extends "report/ajax_dashboard_content.html.twig" %} {% import "report/dashboard_macro.html.twig" as dash %} - - {% block currentDashboard %} - - {% set item = dashboard.dashboard %} - - - {% if "activity"|key_exists(item) %} - {% set title = 'report:: activite par heure' | trans %} - {% set title_abscisse = 'report:: Connexion' | trans %} - {{ dash.table_activity("mytablehour", title, title_abscisse, item.activity)}} - {% endif %} - {% if "activity_day"|key_exists(item) %} - {% set title = 'report:: activite par jour' | trans %} - {% set title_abscisse = 'report:: Connexion' | trans %} - {{dash.table_activity("mytabledaytotal", title , title_abscisse, item.activity_day)}} - {%endif%} - {% if "activity_added"|key_exists(item) %} - {% set title = 'report:: activite document ajoute' | trans %} - {{ dash.table_activity("mytableadded", title , "", item.activity_added)}} - {%endif %} - {% if "activity_edited"|key_exists(item) %} - {% set title = 'report:: activite document edite' | trans %} - {{ dash.table_activity("mytableedited", title , "", item.activity_edited)}} - {% endif %} - {% if "nb_conn"|key_exists(item) and "nb_dl"|key_exists(item)%} - {% set title = 'report:: Cumul telechargements & connexions' | trans %} - {% set title_left = 'report:: telechargements' | trans %} - {% set title_right = 'report::Connexion' | trans %} - {{ dash.connexion_download(title, title_left, title_right, item.nb_dl, item.nb_conn, dashboard.getTitleDate('dmin'),dashboard.getTitleDate('dmax'))}} - {% endif %} - {% if "top_ten_user_doc"|key_exists(item)%} - {% set title = 'report:: Utilisateurs les plus actifs' | trans %} - {% set title_left = 'report:: utilisateurs' | trans %} - {% set title_right = 'report:: telechargements document' | trans %} - {{ dash.table(title, title_left, title_right, item.top_ten_user_doc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }} - {% endif %} - {% if "top_ten_user_prev"|key_exists(item) %} - {% set title = 'report:: Utilisateurs les plus actifs' | trans %} - {% set title_left = 'report:: utilisateurs' | trans %} - {% set title_right = 'report:: telechargements preview' | trans %} - {{ dash.table(title, title_left, title_right, item.top_ten_user_prev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }} - {%endif %} - {% if "top_ten_user_poiddoc"|key_exists(item) %} - {% set title = 'report:: Utilisateurs les plus actifs' | trans %} - {% set title_left = 'report:: utilisateurs' | trans %} - {% set title_right = 'report:: poids document' | trans %} - {{ dash.table(title, title_left, title_right, item.top_ten_user_poiddoc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }} - {%endif %} - {% if "top_ten_user_poidprev"|key_exists(item) %} - {% set title = 'report:: Utilisateurs les plus actifs' | trans %} - {% set title_left = 'report:: utilisateurs' | trans %} - {% set title_right = 'report:: poids preview' | trans %} - {{ dash.table(title, title_left, title_right, item.top_ten_user_poidprev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }} - {%endif %} - {% if "top_dl_doc"|key_exists(item) %} - {% set title = 'report:: documents les plus telecharges' | trans %} - {% set title_left = 'report:: document' | trans %} - {% set title_right = 'report:: telechargements' | trans %} - {{ dash.table(title, title_left, title_right, item.top_dl_doc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "true") }} - {%endif %} - {% if "top_dl_preview"|key_exists(item) %} - {% set title = 'report:: preview les plus telecharges' | trans %} - {% set title_left = 'report:: preview' | trans %} - {% set title_right = 'report:: telechargements' | trans %} - {{ dash.table(title, title_left, title_right, item.top_dl_preview, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "true") }} - {%endif %} - {% if "ask"|key_exists(item) %} - {% set title = 'report:: Les questions les plus posees' | trans %} - {% set title_left = 'report:: utilisateurs' | trans %} - {% set title_right = 'report:: question' | trans %} - {{ dash.table(title, title_left, title_right, item.ask, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }} - {%endif %} - {% if "top_ten_question"|key_exists(item) %} - {% set title = 'report:: question' | trans %} - {% set title_left = 'report:: question' | trans %} - {% set title_right = 'report:: poids preview' | trans %} - {{dash.top_ten_question(app['conf'].get(['registry', 'general', 'title']), title_left, title_right, item.top_ten_question,dashboard.getTitleDate('dmin') , dashboard.getTitleDate('dmax')) }} - {%endif %} - {% if "top_ten_site"|key_exists(item) %} - {% set title_left = 'report:: site' | trans %} - {% set title_right = 'report:: nombre de vue' | trans %} - {% set title = 'report:: site d\'ou les photo sont les plus consultees' | trans %} - {{ dash.table(title , title_left, title_right, item.top_ten_site, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }} - {%endif %} - - {%endblock currentDashboard %} + {% set item = dashboard.dashboard %} + {% if "activity"|key_exists(item) %} + {% set title1 = "report:: activite par heure" | trans %} + {% set title2 = "report:: Connexion" | trans %} + {{ dash.table_activity("mytablehour", title1, title2, item.activity)}} + {% endif %} + {% if "activity_day"|key_exists(item) %} + {% set title1 = "report:: activite par jour" | trans %} + {% set title2 = "report:: Connexion" | trans %} + {{dash.table_activity("mytabledaytotal", title1, title2, item.activity_day)}} + {%endif%} + {% if "activity_added"|key_exists(item) %} + {% set title1 = "report:: activite document ajoute" | trans %} + {{ dash.table_activity("mytableadded", title1 , "", item.activity_added)}} + {%endif %} + {% if "activity_edited"|key_exists(item) %} + {% set title1 = "report:: activite document edite" | trans %} + {{ dash.table_activity("mytableedited", title1 , "", item.activity_edited)}} + {% endif %} + {% if "nb_conn"|key_exists(item) and "nb_dl"|key_exists(item)%} + {% set title1 = "report:: Cumul telechargements & connexions" | trans %} + {% set title2 = "report:: telechargements" | trans %} + {% set title3 = "report::Connexion" | trans %} + {{ dash.connexion_download(title1, title2, title3, item.nb_dl, item.nb_conn, dashboard.getTitleDate('dmin'),dashboard.getTitleDate('dmax'))}} + {% endif %} + {% if "top_ten_user_doc"|key_exists(item)%} + {% set title1 = "report:: Utilisateurs les plus actifs" | trans %} + {% set title2 = "report:: utilisateurs" | trans %} + {% set title3 = "report:: telechargements document" | trans %} + {{ dash.table(title1 , title2, title3, item.top_ten_user_doc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }} + {% endif %} + {% if "top_ten_user_prev"|key_exists(item) %} + {% set title1 = "report:: Utilisateurs les plus actifs" | trans %} + {% set title2 = "report:: utilisateurs" | trans %} + {% set title3 = "report:: telechargements preview" | trans %} + {{ dash.table(title1 , title2, title3, item.top_ten_user_prev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }} + {%endif %} + {% if "top_ten_user_poiddoc"|key_exists(item) %} + {% set title1 = "report:: Utilisateurs les plus actifs" | trans %} + {% set title2 = "report:: utilisateurs" | trans %} + {% set title3 = "report:: poids document" | trans %} + {{ dash.table(title1 , title2, title3, item.top_ten_user_poiddoc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }} + {%endif %} + {% if "top_ten_user_poidprev"|key_exists(item) %} + {% set title1 = "report:: Utilisateurs les plus actifs" | trans %} + {% set title2 = "report:: utilisateurs" | trans %} + {% set title3 = "report:: poids preview" | trans %} + {{ dash.table(title1, title2, title3, item.top_ten_user_poidprev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }} + {%endif %} + {% if "top_dl_doc"|key_exists(item) %} + {% set title1 = "report:: documents les plus telecharges" | trans %} + {% set title2 = "report:: document" | trans %} + {% set title3 = "report:: telechargements" | trans %} + {{ dash.table(title1, title2, title3, item.top_dl_doc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "true") }} + {%endif %} + {% if "top_dl_preview"|key_exists(item) %} + {% set title1 = "report:: preview les plus telecharges" | trans %} + {% set title2 = "report:: preview" | trans %} + {% set title3 = "report:: telechargements" | trans %} + {{ dash.table(title1, title2, title3, item.top_dl_preview, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "true") }} + {%endif %} + {% if "ask"|key_exists(item) %} + {% set title1 = "report:: Les questions les plus posees" | trans %} + {% set title2 = "report:: utilisateurs" | trans %} + {% set title3 = "report:: question" | trans %} + {{ dash.table(title1, title2, title3, item.ask, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }} + {%endif %} + {% if "top_ten_question"|key_exists(item) %} + {% set title1 = "report:: question" | trans %} + {% set title2 = "report:: poids preview" | trans %} + {{dash.top_ten_question(app['phraseanet.registry'].get('GV_homeTitle'), title1, title2, item.top_ten_question,dashboard.getTitleDate('dmin') , dashboard.getTitleDate('dmax')) }} + {%endif %} + {% if "top_ten_site"|key_exists(item) %} + {% set title1 = "report:: site d\'ou les photo sont les plus consultees" | trans %} + {% set title2 = "report:: site" | trans %} + {% set title3 = "report:: nombre de vue" | trans %} + {{ dash.table(title1, title2, title3, item.top_ten_site, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }} + {%endif %} +{%endblock currentDashboard %} diff --git a/templates/web/report/all_content.html.twig b/templates/web/report/all_content.html.twig index a4696cccd0..4df558671f 100644 --- a/templates/web/report/all_content.html.twig +++ b/templates/web/report/all_content.html.twig @@ -12,20 +12,15 @@ {% block javascript %}