From 266592213b4f55fa30881cb2d64b7672f2be2380 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Tue, 18 Mar 2014 16:59:03 +0100
Subject: [PATCH 1/4] Report dashboard is now loaded on demand

---
 .../Phrasea/Controller/Report/Root.php        |  67 ++++---
 .../ajax_dashboard_content_child.html.twig    | 164 +++++++++---------
 templates/web/report/all_content.html.twig    |  16 +-
 .../web/report/form_date_and_base.html.twig   |  15 +-
 .../web/report/report_layout_child.html.twig  |  64 +++----
 www/skins/report/dash-ajax-loader.gif         | Bin 0 -> 21629 bytes
 www/skins/report/report-table.css             |   4 +
 www/skins/report/report.js                    | 122 ++++++-------
 8 files changed, 225 insertions(+), 227 deletions(-)
 create mode 100644 www/skins/report/dash-ajax-loader.gif

diff --git a/lib/Alchemy/Phrasea/Controller/Report/Root.php b/lib/Alchemy/Phrasea/Controller/Report/Root.php
index 2b4c4a4027..621796551d 100644
--- a/lib/Alchemy/Phrasea/Controller/Report/Root.php
+++ b/lib/Alchemy/Phrasea/Controller/Report/Root.php
@@ -66,38 +66,53 @@ class Root implements ControllerProviderInterface
      */
     public function getDashboard(Application $app, Request $request)
     {
-        $dashboard = new \module_report_dashboard($app, $app['authentication']->getUser());
-
-        if ('json' !== $request->getRequestFormat()) {
+        if ('json' === $request->getRequestFormat()) {
             \User_Adapter::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', array(
-                'ajax_dash'   => true,
-                'dashboard'   => $dashboard,
-                '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
-            ));
+            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');
-
-        if ($dmin && $dmax) {
-            $dashboard->setDate($dmin, $dmax);
+        $granted = array();
+        foreach($app['authentication']->getUser()->acl()->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(array('html' => $app['twig']->render('report/ajax_dashboard_content_child.html.twig', array(
-            '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
+        ));
     }
 
     /**
@@ -120,8 +135,8 @@ class Root implements ControllerProviderInterface
             $dmax = date('d') . '-' . date('m') . '-' . date('Y');
         }
 
-        $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 = array();
diff --git a/templates/web/report/ajax_dashboard_content_child.html.twig b/templates/web/report/ajax_dashboard_content_child.html.twig
index 29e49596ba..91fcb68bc2 100644
--- a/templates/web/report/ajax_dashboard_content_child.html.twig
+++ b/templates/web/report/ajax_dashboard_content_child.html.twig
@@ -1,90 +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 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 %}
+    {% 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 46aee17c58..a67e39fd50 100644
--- a/templates/web/report/all_content.html.twig
+++ b/templates/web/report/all_content.html.twig
@@ -12,20 +12,15 @@
 {% block javascript %}
     <script type="text/javascript" >
 
-            var usrId = '{{ dashboard.usr.get_id() }}' ;
+            var usrId = '{{ app['authentication'].user.get_id }}' ;
 
             var language = {
                 valider : '{% trans "boutton::valider" %}',
                 choix_collection : '{% trans "veuillez choisir au minimum une collection" %}',
                 annuler : '{% trans "boutton::annuler" %}',
                 fermer : '{% trans "boutton::fermer" %}',
-        connexion : '{% trans "report:: Connexion" %}',
-        heure : '{% trans "report::Heures" %}'
-            };
-
-            var date = {
-                dmin :  '{{ dashboard.dmin }}',
-                dmax : '{{ dashboard.dmax }}'
+                connexion : '{% trans "report:: Connexion" %}',
+                heure : '{% trans "report::Heures" %}'
             };
 
             var dashboard ={
@@ -47,8 +42,7 @@
 {% endblock javascript%}
 
 {% block content %}
-  {% block report_layout %}
-  {% endblock report_layout %}
-  <div id="DIALOG" style="color:white;"></div>
+    {% block report_layout %}{% endblock report_layout %}
+    <div id="DIALOG" style="color:white;"></div>
 {% endblock content %}
 
diff --git a/templates/web/report/form_date_and_base.html.twig b/templates/web/report/form_date_and_base.html.twig
index bd8c202659..40a872a4d9 100644
--- a/templates/web/report/form_date_and_base.html.twig
+++ b/templates/web/report/form_date_and_base.html.twig
@@ -5,17 +5,16 @@
         <div class="control-group">
             <label for="dmin">{% trans "report:: Du (date)" %}</label>
             <div class="controls" style="display:inline-block">
-                <input class= "dmin" name="dmin" type="text" value="{{ dashboard.dmin}}" size="10" style='width:100px'/>
+                <input class= "dmin" name="dmin" type="text" value="{{ "-1 month"|date("Y-m-d") }}" size="10" style='width:100px'/>
             </div>
         </div>
         <div class="control-group">
              <label for="dmax">{% trans "report:: Au (date)" %}</label>
             <div class="controls" style="display:inline-block">
-                <input class="dmax" name="dmax" type="text" value="{{dashboard.dmax}}" size="10" style='width:100px'/>
+                <input class="dmax" name="dmax" type="text" value="{{ "now"|date("Y-m-d") }}" size="10" style='width:100px'/>
             </div>
         </div>
     </div>
- {% set all_coll = dashboard.getAllColl() %}
     <div class="form2">
         <div class="form_titre">{% trans "report:: 2 - Bases" %}</div>
         <div id="select_one">
@@ -28,14 +27,14 @@
                         {% trans %}Deselect all{% endtrans %}
                     </a>
                 </li>
-                {% for the_base_coll in all_coll %}
-                    <li><label data-group-id="{{ loop.index }}" class="multiselect-group"><b>{{ the_base_coll.name_sbas }}</b></label></li>
-                    {% for a_coll in the_base_coll.sbas_collections %}
+                {% for databox in granted_bases %}
+                    <li><label data-group-id="{{ loop.index }}" class="multiselect-group"><b>{{ databox.name }}</b></label></li>
+                    {% for collection in databox.collections %}
                         <li>
                             <a href="javascript:void(0);">
                                 <label class="checkbox">
-                                    <input name="popbases[]" checked="checked" type="checkbox" class="coll-checkbox checkbox-{{ loop.parent.loop.index }}" value="{{ a_coll.sbas_id}}_{{ a_coll.coll_id }}">
-                                    {{ a_coll.name }}
+                                    <input name="popbases[]" checked="checked" type="checkbox" class="coll-checkbox checkbox-{{ loop.parent.loop.index }}" value="{{ collection.base_id}}_{{ collection.id }}">
+                                    {{ collection.name }}
                                 </label>
                             </a>
                         </li>
diff --git a/templates/web/report/report_layout_child.html.twig b/templates/web/report/report_layout_child.html.twig
index ec5596e5c7..d871c098bd 100644
--- a/templates/web/report/report_layout_child.html.twig
+++ b/templates/web/report/report_layout_child.html.twig
@@ -2,45 +2,49 @@
 
 {% block report_dashboard_layout %}
     <div id="dash" class="inside-container">
-        <div class="answers">
+        <div class="answers container-fluid">
             <div class="content">
-                <div id='dashboard'>
-                    <div id="panel" style="height:40px;width:100%;display:none;">
-                        <div style="margin-top:15px;float:left;margin-bottom:20px;">
-                            <div style="float:left;" >
-                                <label for="dmin" class="form_titre">{% trans "report:: Du (date)" %}</label>
-                                <input class= "dminDash" name="dmin" type="text" value="{{ dashboard.dmin}}" size="10" />
+                <div class="row-fluid">
+                    <div class="well-large well" style="background: #313131;margin-top:20px;border:none;">
+                        <form id="dashboard-form" class="form-inline" method="GET" action="{{ path("report_dashboard") }}">
+                            <label for="dminDash" style="color:#eee">{{ "from"|trans|title }}</label>
+                            <div class="input-prepend">
+                                <span class="add-on"><i class="icon icon-calendar"></i></span>
+                                <input id="dminDash" name="dmin" style="font-size: 14px;width:220px;" size="10" type="text" placeholder="{{ "from"|trans }}" value="{{ "-1 month"|date("Y-m-d") }}">
                             </div>
-                            <div style="float:left;margin-left:15px;">
-                                <label for="dmax" class="form_titre">{% trans "report:: Au (date)" %}</label>
-                                <input class="dmaxDash" name="dmax" type="text" value="{{dashboard.dmax}}" size="10" />
+                            <label for="dmaxDash" style="color:#eee">{{ "to"|trans|title }}</label>
+                            <div class="input-prepend">
+                                to
+                                <span class="add-on"><i class="icon icon-calendar"></i></span>
+                                <input id="dmaxDash" name="dmax" style="font-size: 14px;width:220px;" size="10" type="text" placeholder="{{ "to"|trans }}" value="{{ "now"|date("Y-m-d") }}">
                             </div>
+                            <button class="btn submit-dashboard" type="button">{{ "Generate" | trans }}</button>
+                        </form>
+                        <div>
+                            <span class="text-info" style="font-style: italic">
+                                <i class="icon icon-warning-sign"></i>
+                                {{
+                                    "Report generation may take a long time to generate, depending on the number of collections and the period selected." | trans
+                                }}
+                            </span>
                         </div>
-                        {# <div id="chooose" style="margin-left:15px;float:left;margin-top:15px;"> #}
-                        {#  <div class="form_titre">{% trans "report:: 2 - Bases" %}</div> #}
-                        {#  <label for="nameDash"></label> #}
-                        {#  <select name="nameDash" style = "background-color:#555;color:orange;border:none;"> #}
-                        {#    <option value="all">Global</option> #}
-                        {#  {% for it in dashboard.authorizedCollection %} #}
-                                {#  <option value="{{it.sbas_id}}">{{ it.name }}</option> #}
-                        {#  {% endfor %} #}
-                            {#</select> #}
-                        {#</div> #}
-                    </div>
-                    <div class="slide" style="margin-top:-5px;"><a class="btn-slide arrowDown"
-                                                                                                             style="width:100px;height:20px;padding:5px;float:right; text-align:center;display:block;color:#999;
-">options</a></div>
-
-                    <div id="dashdash" style="float:left;width:100%;">
-                        {% if ajax_dash %}
-                            {% include "report/ajax_dashboard_content_child.html.twig" %}
-                        {% endif %}
                     </div>
                 </div>
+                <div id='dashboard' class="well well-large text-center" style="background-color:#696969;border:none;">
+                    <button class="btn btn-primary submit-dashboard" style="
+                        padding: 18px 28px;
+                        font-size: 22px; //change this to your desired size
+                        line-height: normal;
+                        -webkit-border-radius: 8px;
+                           -moz-border-radius: 8px;
+                                border-radius: 8px;"
+                    >
+                        {{ "Generate dashboard" | trans }}
+                    </button>
+                </div>
             </div>
         </div>
     </div>
-
 {% endblock report_dashboard_layout %}
 
 {% block report_connexion_layout %}
diff --git a/www/skins/report/dash-ajax-loader.gif b/www/skins/report/dash-ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..85e107f90b1db888ba26db12e8c5236186829b12
GIT binary patch
literal 21629
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
H!WI7ukg(MW

literal 0
HcmV?d00001

diff --git a/www/skins/report/report-table.css b/www/skins/report/report-table.css
index 3a1efecd51..55ca5e84d4 100644
--- a/www/skins/report/report-table.css
+++ b/www/skins/report/report-table.css
@@ -222,6 +222,7 @@ iframe{
 }
 #dash .answers{
 	background-color:#555555;
+    min-height: 400px;
 }
 .spacer{
 	clear:both;
@@ -277,6 +278,9 @@ table.center{
 	margin-top:10px;
 	cursor: pointer;
 }
+#dashboard.loading {
+    background:url('dash-ajax-loader.gif') #696969 no-repeat center center;
+}
 #dashboard-table table {
 	font:normal 76%/150% "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
 	border:none;
diff --git a/www/skins/report/report.js b/www/skins/report/report.js
index c0faced736..84586dcd46 100644
--- a/www/skins/report/report.js
+++ b/www/skins/report/report.js
@@ -30,12 +30,10 @@ $(document).ready(function () {
             resize();
         }
     });
+    resize();
     //datepicker
     reportDatePicker();
     dashboardDatePicker();
-    //drawCharts from dashboard
-    drawCharts();
-    configure_dash();
     bindEvents();
 
     $("a.select-all").bind("click", function (e) {
@@ -63,6 +61,17 @@ $(document).ready(function () {
  * Tous les binds sur le report
  */
 function bindEvents() {
+    $('#dminDash, #dmaxDash').datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat: 'dd-mm-yy',
+        numberOfMonths: 1,
+        maxDate: "-0d"
+    });
+
+    $(".submit-dashboard").click(function() {
+        loadDash();
+    });
     //load all the report
     $('form .formsubmiter').bind('click', function () {
         submiterAction($(this));
@@ -103,11 +112,6 @@ function bindEvents() {
     }).unbind("click").bind("click", function () {
             showMenu();
         });
-
-    $("#liste_dash").find("em").unbind("click").bind("click", function () {
-        id = $(this).attr('id').substr(3);
-        changeDash(id);
-    });
 }
 
 function reportDatePicker() {
@@ -129,17 +133,12 @@ function reportDatePicker() {
 function dashboardDatePicker() {
     $(function () {
         $('.dminDash, .dmaxDash').datepicker({
-            defaultDate: -10,
+            defaultDate: -3,
             changeMonth: true,
             changeYear: true,
             dateFormat: 'dd-mm-yy',
             numberOfMonths: 3,
-            maxDate: "-0d",
-            onSelect: function (selectedDate, instance) {
-                var id = $(".selected_em").attr('id').substr(3);
-                changeDash(id);
-                $('.btn-slide').trigger('click');
-            }
+            maxDate: "-0d"
         });
     });
 }
@@ -185,7 +184,7 @@ function submiterAction(domSubmiter) {
 
         request = $.ajax({
             type: "POST",
-            url: "/report/init",
+            url: "/index_dev.php/report/init",
             data: data,
             beforeSend: function () {
                 container.find('.content').empty();
@@ -379,36 +378,6 @@ function getScrollerStartPosition(selected_tab) {
     return right;
 }
 
-
-function changeDash(sbasid) {
-    var dmin = $(".dminDash").val();
-    var dmax = $(".dmaxDash").val();
-    $.ajax({
-        type: "POST",
-        dataType: "json",
-        url: "/report/dashboard",
-        data: {
-            sbasid: sbasid,
-            dmin: dmin,
-            dmax: dmax
-        },
-        beforeSuccess: function () {
-            $("#dashdash").addClass("gifloader");
-        },
-        success: function (data) {
-            $("#dashdash").removeClass("gifloader").empty().append(data.html);
-            drawCharts();
-            $("#liste_dash").find("em").unbind("click").bind("click", function () {
-                id = $(this).attr('id').substr(3);
-                changeDash(id);
-            });
-            $('td a:visible').bind('click', function () {
-                tableLinkAction($(this));
-            });
-        }
-    });
-}
-
 function drawCharts() {
     if ($('#mytabledaytotal').length > 0) {
         $('#mytabledaytotal').gvChart({
@@ -438,9 +407,9 @@ function drawCharts() {
                 },
                 lineWidth: 1,
                 pointSize: 2,
-                backgroundColor: '#555555',
-                width: 900,
-                height: 400
+                backgroundColor: '#696969',
+                width: 800,
+                height: 350
             }
         });
     }
@@ -477,9 +446,9 @@ function drawCharts() {
                 },
                 lineWidth: 1,
                 pointSize: 3,
-                backgroundColor: '#555555',
-                width: 900,
-                height: 400
+                backgroundColor: '#696969',
+                width: 800,
+                height: 350
             }
         });
     }
@@ -515,9 +484,9 @@ function drawCharts() {
                 legend: 'none',
                 lineWidth: 1,
                 pointSize: 3,
-                backgroundColor: '#555555',
-                width: 900,
-                height: 400
+                backgroundColor: '#696969',
+                width: 800,
+                height: 350
             }
         });
     }
@@ -553,9 +522,9 @@ function drawCharts() {
                 legend: 'none',
                 lineWidth: 1,
                 pointSize: 3,
-                backgroundColor: '#555555',
-                width: 900,
-                height: 400
+                backgroundColor: '#696969',
+                width: 800,
+                height: 350
             }
         });
     }
@@ -987,6 +956,34 @@ function go(submit, form, f_val, data) {
     });
 }
 
+function loadDash() {
+    var $form = $("#dashboard-form");
+    $.ajax({
+        url     : $form.attr('action'),
+        type    : $form.attr('method'),
+        dataType: 'json',
+        data    : $form.serializeArray(),
+        beforeSend: function() {
+            resize();
+            $("#dashboard").empty().addClass("loading");
+        },
+        success : function( data ) {
+            $("#dashboard").empty().append(data.html);
+            drawCharts();
+            $('td a:visible').bind('click', function () {
+                tableLinkAction($(this));
+            });
+        },
+        error   : function( xhr, err ) {
+        },
+        timeout: function(){
+        },
+        done: function() {
+            $("#dashboard").removeClass("loading");
+        }
+    });
+    return false;
+}
 
 //submit is the div where we want to load the updated tab
 //form is the current form
@@ -1141,13 +1138,4 @@ function sessionactive() {
     });
 };
 
-function configure_dash() {
-    $(".btn-slide").click(function () {
-        $("#panel").slideToggle("slow");
-        $(this).toggleClass("arrowUp");
-        return false;
-    });
-
-}
-
 sessionactive();

From a77a04277011ee843acf4548adf302312c35d16c Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Thu, 20 Mar 2014 00:57:20 +0100
Subject: [PATCH 2/4] Set salted password to true when generating new password

---
 .../Phrasea/Authentication/Phrasea/NativeAuthentication.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php b/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
index c121090ae2..06b753a9da 100644
--- a/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
+++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
@@ -68,13 +68,14 @@ class NativeAuthentication implements PasswordAuthenticationInterface
                 $row['nonce'] = \random::generatePassword(8, \random::LETTERS_AND_NUMBERS);
                 $row['usr_password'] = $this->encoder->encodePassword($password, $row['nonce']);
 
-                $sql = 'UPDATE usr SET usr_password = :password, nonce = :nonce
+                $sql = 'UPDATE usr SET usr_password = :password, nonce = :nonce, salted_password = :salted_password
                         WHERE usr_id = :usr_id';
                 $stmt = $this->conn->prepare($sql);
                 $stmt->execute(array(
                     ':password' => $row['usr_password'],
                     ':nonce' => $row['nonce'],
                     ':usr_id' => $row['usr_id'],
+                    ':salted_password' => 1
                 ));
                 $stmt->closeCursor();
             }

From db21aecd1d948c91399205e771e0918647e5a810 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Thu, 20 Mar 2014 02:14:43 +0100
Subject: [PATCH 3/4] Fix unit tests

---
 .../Phrasea/Controller/Report/Root.php        |   6 +-
 .../Phrasea/Controller/Report/RootTest.php    | 108 +++++++++---------
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Report/Root.php b/lib/Alchemy/Phrasea/Controller/Report/Root.php
index 621796551d..079392a9f6 100644
--- a/lib/Alchemy/Phrasea/Controller/Report/Root.php
+++ b/lib/Alchemy/Phrasea/Controller/Report/Root.php
@@ -128,15 +128,15 @@ class Root implements ControllerProviderInterface
         $popbases = $request->request->get('popbases', array());
 
         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('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));
+        $dmax = \DateTime::createFromFormat('Y-m-d H:i:s', sprintf('%s 23:59:59', $dmax));
 
         //get user's sbas & collections selection from popbases
         $selection = array();
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php
index 07ff64abf8..f13ae1e7b4 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php
@@ -29,8 +29,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
         $this->authenticate(self::$DI['app']);
 
         $this->XMLHTTPRequest('GET', '/report/dashboard', array(
-            'dmin' => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax' => $this->dmin->format('Y-m-d H:i:s'),
+            'dmin' => $this->dmin->format('Y-m-d'),
+            'dmax' => $this->dmin->format('Y-m-d'),
         ));
 
         $response = self::$DI['client']->getResponse();
@@ -50,8 +50,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportConnexions()
     {
         self::$DI['client']->request('POST', '/report/connexions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -68,8 +68,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportConnexionsPrintCSV()
     {
         self::$DI['client']->request('POST', '/report/connexions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -83,8 +83,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportConnexionsFilterColumns()
     {
         self::$DI['client']->request('POST', '/report/connexions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -98,8 +98,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportConnexionsFilterResultOnOneColumn()
     {
         self::$DI['client']->request('POST', '/report/connexions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -115,8 +115,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportConnexionsFilterConf()
     {
         self::$DI['client']->request('POST', '/report/connexions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -130,8 +130,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportConnexionsGroupBy()
     {
         self::$DI['client']->request('POST', '/report/connexions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -145,8 +145,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportQuestions()
     {
         self::$DI['client']->request('POST', '/report/questions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -163,8 +163,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportQuestionsPrintCSV()
     {
         self::$DI['client']->request('POST', '/report/questions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -178,8 +178,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportQuestionsFilterColumns()
     {
         self::$DI['client']->request('POST', '/report/questions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -193,8 +193,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportQuestionsFilterResultOnOneColumn()
     {
         self::$DI['client']->request('POST', '/report/questions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -210,8 +210,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportQuestionsFilterConf()
     {
         self::$DI['client']->request('POST', '/report/questions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -225,8 +225,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportQuestionsGroupBy()
     {
         self::$DI['client']->request('POST', '/report/questions', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -240,8 +240,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDownloads()
     {
         self::$DI['client']->request('POST', '/report/downloads', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -258,8 +258,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDownloadsPrintCSV()
     {
         self::$DI['client']->request('POST', '/report/downloads', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -273,8 +273,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDownloadsFilterColumns()
     {
         self::$DI['client']->request('POST', '/report/downloads', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -288,8 +288,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDownloadsFilterResultOnOneColumn()
     {
         self::$DI['client']->request('POST', '/report/downloads', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -305,8 +305,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDownloadsFilterConf()
     {
         self::$DI['client']->request('POST', '/report/downloads', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -320,8 +320,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDownloadsGroupBy()
     {
         self::$DI['client']->request('POST', '/report/downloads', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -335,8 +335,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDocuments()
     {
         self::$DI['client']->request('POST', '/report/documents', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -354,8 +354,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDocumentsPrintCSV()
     {
         self::$DI['client']->request('POST', '/report/documents', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -369,8 +369,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDocumentsFilterColumns()
     {
         self::$DI['client']->request('POST', '/report/documents', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -384,8 +384,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDocumentsFilterResultOnOneColumn()
     {
         self::$DI['client']->request('POST', '/report/documents', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -401,8 +401,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDocumentsFilterConf()
     {
         self::$DI['client']->request('POST', '/report/documents', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -416,8 +416,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportDocumentsGroupBy()
     {
         self::$DI['client']->request('POST', '/report/documents', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',
@@ -431,8 +431,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportClients()
     {
         self::$DI['client']->request('POST', '/report/clients', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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(),
         ));
@@ -445,8 +445,8 @@ class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
     public function testDoReportClientPrintCSV()
     {
         self::$DI['client']->request('POST', '/report/clients', array(
-            'dmin'          => $this->dmin->format('Y-m-d H:i:s'),
-            'dmax'          => $this->dmax->format('Y-m-d H:i:s'),
+            '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',

From f6f6781a65a0484bc918265d3fdefdd70b932cce Mon Sep 17 00:00:00 2001
From: Moctar <diouf@alchemy.fr>
Date: Fri, 21 Mar 2014 20:38:03 +0100
Subject: [PATCH 4/4] fix migration from 3.1

---
 lib/Alchemy/Phrasea/Command/Upgrade/Step31.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php b/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php
index 4e05293db6..494b2d28f8 100644
--- a/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php
+++ b/lib/Alchemy/Phrasea/Command/Upgrade/Step31.php
@@ -124,7 +124,7 @@ class Step31 implements DatasUpgraderInterface
         $uuid = \uuid::generate_v4();
         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);