diff --git a/lib/classes/module/report/dashboard.php b/lib/classes/module/report/dashboard.php index d7b09bedc5..d95145f1b5 100644 --- a/lib/classes/module/report/dashboard.php +++ b/lib/classes/module/report/dashboard.php @@ -54,7 +54,7 @@ class module_report_dashboard implements module_report_dashboard_componentInterf * @desc la periode par defaut d'affichage du dashboard * @var */ - public $periode = '-1 month'; + public $periode = '-5 days'; /** * @desc le sbasid de la base ou on effectue le report @@ -168,7 +168,7 @@ class module_report_dashboard implements module_report_dashboard_componentInterf { return $this->dashboard; } - + /** * @desc construct the legend for charts * if dmax === false dmax = now(); @@ -276,7 +276,7 @@ class module_report_dashboard implements module_report_dashboard_componentInterf $listeColl[] = (int) $value['coll_id']; } - $this->authorizedCollection[] = array( + $this->authorizedCollection[(int) $sbas] = array( 'sbas_id' => (int) $sbas, 'coll' => implode(',', $listeColl), 'name' => phrasea::sbas_labels($sbas, $this->app) diff --git a/templates/web/report/ajax_dashboard_content.html.twig b/templates/web/report/ajax_dashboard_content.html.twig index ff8f2a8584..564633a812 100644 --- a/templates/web/report/ajax_dashboard_content.html.twig +++ b/templates/web/report/ajax_dashboard_content.html.twig @@ -2,12 +2,9 @@
{% trans "report:: Dashboard" %}
{{ dashboard.getTitleDate('dmin') }} - {{ dashboard.getTitleDate('dmax') }}
+ Toutes les bases {% for key in dashboard.authorizedCollection|keys %} - {% if not loop.first %} - {{ key|sbas_labels(app) }} - {% else %} - Toutes les bases - {% endif %} + {{ key|sbas_labels(app) }} {% endfor %}