Issue #38 - reports

finished

sails/src/assets/app/i18n/en-gb.json

@@ -259,7 +259,9 @@
     "phone": "Phone number",
     "phone": "Phone",
     "phrase": "Phrase",
+    "phrase_size": "Phrase average size",
     "phrase_tape": "Phrase tape",
+    "phrase_build_time": "Average phrase build time",
     "picto_added": "Picto successfully added",
     "picto_behavior": "Behavior of a pictogram when it is selected (without phrase tape)",
     "picto_labels": "Pictogram labels",
@@ -369,6 +371,7 @@
     "title": "Title",
     "totals": "Totals",
     "to_add": "To add",
+    "tpl_date_frame": "de {{ begin | date:'dd-MM-yyyy' }} a {{ end | date:'dd-MM-yyyy' }}",
     "tpl_day": "{{ day | date:'yyyy-MM-dd' }}",
     "tpl_hours_frame": "from {{ begin | date:'HH:mm:ss' }} to {{ end | date:'HH:mm:ss' }}",
     "tries": "Tries",

sails/src/assets/app/i18n/es-es.json

@@ -258,7 +258,9 @@
     "phone": "Teléfono",
     "phone": "Teléfono",
     "phrase": "Frase",
+    "phrase_size": "Longitud media de frase",
     "phrase_tape": "Cinta de frase",
+    "phrase_build_time": "Tiempo medio construcción",
     "picto_added": "Picto añadido correctamente",
     "picto_behavior": "Comportamiento de un pictograma al seleccionarlo (sin cinta de frase)",
     "picto_labels": "Etiquetas del pictograma",
@@ -369,6 +371,7 @@
     "title": "Título",
     "totals": "Totales",
     "to_add": "Para añadir",
+    "tpl_date_frame": "de {{ begin | date:'dd-MM-yyyy' }} a {{ end | date:'dd-MM-yyyy' }}",
     "tpl_day": "{{ day | date:'dd-MM-yyyy' }}",
     "tpl_hours_frame": "de {{ begin | date:'HH:mm:ss' }} a {{ end | date:'HH:mm:ss' }}",
     "tries": "Ensayos",

sails/src/assets/scripts/modules/student/views/reports.html

@@ -7,7 +7,7 @@
         </div>
 
     </div>
-    <div class="row">
+    <div class="row" id="filter">
       <div class="col-md-3">
           <div class="form-group">
             <p class="input-group">
@@ -49,21 +49,30 @@
         </div>
     </div>
     <hr>
+    <div class="row" ng-if="showPrint" id="filter-info">
+      <div class="col-md-4">
+        <h3>{{printName | translate}}</h3>
+      </div>
+      <div class="col-md-8">
+        <h2><small>{{ 'tpl_date_frame' | translate:{'begin':reportDateSince, 'end':reportDateTo} }}</small></h2>
+      </div>
+    </div>
+    <hr ng-if="showPrint">
     <div class="row">
       <div class="col-lg-4 bg-light-gray">
         <h1 class="text-center"><small>{{'error_rate' | translate}}</small></h1>
         <hr>
-        <canvas id="error_rate" class="chart chart-line" chart-options="optionsChartTime" chart-data="dataChart1" chart-labels="labels1" chart-series="series1"></canvas>
+        <canvas id="error_rate" class="chart chart-line" chart-options="optionsChartDateRate" chart-data="dataChart1" chart-labels="labels1" chart-series="series1"></canvas>
       </div>
       <div class="col-lg-4">
         <h1 class="text-center"><small>{{'average_time_per_try' | translate}}</small></h1>
         <hr>
-        <canvas id="avg_time_trie" class="chart chart-line" chart-options="optionsChartTime" chart-data="dataChart2" chart-labels="labels2" chart-series="series2"></canvas>
+        <canvas id="avg_time_trie" class="chart chart-line" chart-options="optionsChartDateSeconds" chart-data="dataChart2" chart-labels="labels2" chart-series="series2"></canvas>
       </div>
       <div class="col-lg-4 bg-light-gray">
         <h1 class="text-center"><small>{{'average_time_between_pictos' | translate}}</small></h1>
         <hr>
-        <canvas id="avg_time_pictos" class="chart chart-line" chart-options="optionsChartTime" chart-data="dataChart3" chart-labels="labels3" chart-series="series3"></canvas>
+        <canvas id="avg_time_pictos" class="chart chart-line" chart-options="optionsChartDateSeconds" chart-data="dataChart3" chart-labels="labels3" chart-series="series3"></canvas>
       </div>
     </div>
     <div class="row">
@@ -106,12 +115,17 @@
       <div class="col-lg-4 bg-light-gray">
         <h1 class="text-center"><small>{{'vocabulary_size' | translate}}</small></h1>
         <hr>
-        <canvas id="vocab_size" class="chart chart-line" chart-options="optionsChartTime" chart-data="dataChart4" chart-labels="labels4" chart-series="series4"></canvas>
+        <canvas id="vocab_size" class="chart chart-line" chart-options="optionsChartDatePictos" chart-data="dataChart4" chart-labels="labels4" chart-series="series4"></canvas>
+      </div>
+      <div class="col-lg-4">
+        <h1 class="text-center"><small>{{'phrase_size' | translate}}</small></h1>
+        <hr>
+        <canvas id="phrase_size" class="chart chart-line" chart-options="optionsChartDatePictos" chart-data="dataChart5" chart-labels="labels5" chart-series="series5"></canvas>
       </div>
       <div class="col-lg-4">
-        <h1 class="text-center"><small>{{'phrase' | translate}}</small></h1>
+        <h1 class="text-center"><small>{{'phrase_build_time' | translate}}</small></h1>
         <hr>
-        <canvas id="phrases" class="chart chart-line" chart-options="optionsChartPhrases" chart-data="dataChart5" chart-labels="labels5" chart-series="series5"></canvas>
+        <canvas id="phrases_time" class="chart chart-line" chart-options="optionsChartDateSeconds" chart-data="dataChart6" chart-labels="labels6" chart-series="series6"></canvas>
       </div>
     </div>
 	</div>