From 756f6095a7dd9b07e8ac3a89f3cd45365a86bb0d Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Wed, 18 Sep 2013 12:07:07 +0200
Subject: [PATCH] Minor report updates

---
 lib/classes/module/report/dashboard.php               | 6 +++---
 templates/web/report/ajax_dashboard_content.html.twig | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

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 <string>
      */
-    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 @@
     <div id="title_dash" class="center" style="clear:left;">{% trans "report:: Dashboard" %}</div>
         <div id="periode_dash" class="center" >{{ dashboard.getTitleDate('dmin') }} - {{ dashboard.getTitleDate('dmax') }}</div>
         <div id="liste_dash"  class="center">
+            <em id="em_all" class="selected_em" >Toutes les bases</em>
             {% for key in dashboard.authorizedCollection|keys %}
-                {% if not loop.first %}
-                    <em id="em_{{ key }}" >{{ key|sbas_labels(app) }}</em>
-                {% else %}
-                <em id="em_all" class="selected_em" >Toutes les bases</em>
-                {% endif %}
+                <em id="em_{{ key }}" >{{ key|sbas_labels(app) }}</em>
             {% endfor %}
         </div>
         <div id="dashboard-table" >