Reports view and controller changes

sails/src/assets/app/bower.json

@@ -26,7 +26,7 @@
     "ngtoast": "~1.5.4",
     "angular-animate": "~1.4.1",
     "angular-sanitize": "~1.4.1",
-    "angular-chart.js": "~0.7.2",
+    "angular-chart.js": "latest",
     "ng-lodash": "~0.3.0"
   },
   "resolutions": {

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

@@ -26,6 +26,7 @@
     "alert": "Alert",
     "all": "All",
     "animation": "Animation",
+    "annual": "Annual",
     "April": "April",
     "attributes_not_updated": "Changes not saved",
     "attributes_updated": "Changes saved",
@@ -101,6 +102,7 @@
     "general_labels": "General labels",
     "generate": "Generate",
     "generate_serial": "Generate serial number",
+    "global":"Global",
     "hide": "Hide",
     "highlight": "highlight",
     "highlighted": "Highlighted",
@@ -141,6 +143,7 @@
     "methods": "Methods",
     "minutes": "minutes",
     "month_totals": "Month totals",
+    "monthly":"Monthly",
     "name": "Name",
     "new_session": "New session",
     "next_actions": "Next actions",
@@ -264,10 +267,12 @@
     "tag_deleted": "Tag deleted",
     "tape_background": "Tape background",
     "template_deleted": "Template deleted",
-    "time_instruction_method": "Time instructions of method",
     "time_hours": "Time: {{hours}} hours",
+    "time_instruction_method": "Time instructions of method",
+    "time_sessions_total": "Total sessions time",
     "time_sessions_per_days": "Time of sessions per days in",
     "time_sessions_per_month": "Time of sessions per months in",
+    "time_tries_total": "Total tries time",
     "time_tries_per_days": "Time of tries per days in",
     "time_tries_per_month": "Time of tries per months in",
     "title": "Title",
@@ -276,6 +281,7 @@
     "tpl_day": "{{ day | date:'yyyy-MM-dd' }}",
     "tpl_hours_frame": "from {{ begin | date:'HH:mm' }} to {{ end | date:'HH:mm' }}",
     "tries": "Tries",
+    "tries_done": "Tries done",
     "tries_length": "Tries length",
     "tries_mean_length": "Tries mean length",
     "tries_per_days": "Tries per days in",

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

@@ -26,6 +26,7 @@
     "alert": "Alerta",
     "all": "Todos",
     "animation": "Animación",
+    "annual": "Anual",
     "April": "Abril",
     "attributes_not_updated": "Cambios no guardados",
     "attributes_updated": "Cambios guardados",
@@ -101,6 +102,7 @@
     "general_labels": "Generales",
     "generate": "Generar",
     "generate_serial": "Generar número de serie",
+    "global":"Global",
     "hide": "Ocultar",
     "highlight": "Resaltar",
     "highlighted": "Resaltado",
@@ -141,6 +143,7 @@
     "methods": "Métodos",
     "minutes": "minutos",
     "month_totals": "Totales mes",
+    "monthly":"Mensual",
     "name": "Nombre",
     "new_session": "Nueva sesión",
     "next_actions": "Acciones posteriores",
@@ -267,8 +270,10 @@
     "template_deleted": "Plantilla eliminada",
     "time_hours": "Tiempo: {{hours}} horas",
     "time_instruction_method": "Tiempo instrucciones del método",
+    "time_sessions_total": "Tiempo total de sesiones",
     "time_sessions_per_days": "Tiempo de sesiones por días en",
     "time_sessions_per_month": "Tiempo de sesiones por meses en",
+    "time_tries_total": "Tiempo total de ensayos",
     "time_tries_per_days": "Tiempo de ensayos por días en",
     "time_tries_per_month": "Tiempo de ensayos por meses en",
     "title": "Título",
@@ -277,6 +282,7 @@
     "tpl_day": "{{ day | date:'dd-MM-yyyy' }}",
     "tpl_hours_frame": "de {{ begin | date:'HH:mm' }} a {{ end | date:'HH:mm' }}",
     "tries": "Ensayos",
+    "tries_done": "Ensayos realizados",
     "tries_length": "Duración ensayos",
     "tries_mean_length": "Duración media ensayos",
     "tries_per_days": "Número de ensayos por días en",

sails/src/assets/scripts/app.js

@@ -16,7 +16,7 @@ var dashboardApp = angular.module('dashboardApp', [
   'ngAnimate',
   'ngSanitize',
   'ngToast',
-  'chart.js',
+  'Chart.js',
   'ngLodash'
 ]);
 

sails/src/assets/styles/main.less

@@ -2,7 +2,6 @@
 @import (less) '../app/bower_components/bootstrap/dist/css/bootstrap-theme.css';
 @import (less) '../app/bower_components/ngtoast/dist/ngToast.css';
 @import (less) '../app/bower_components/ngtoast/dist/ngToast-animations.css';
-@import (less) '../app/bower_components/angular-chart.js/dist/angular-chart.css';
 @import (less) 'cropper.css';
 @import (less) 'main.css';
 

sails/src/package.json

@@ -7,6 +7,7 @@
   "dependencies": {
     "async": "^2.0.0-rc.4",
     "bcrypt-nodejs": "0.0.3",
+    "chart.js": "^2.3.0",
     "connect-redis": "3.0.2",
     "connect-timeout": "^1.7.0",
     "ejs": "^0.8.8",

sails/src/tasks/config/concat.js

@@ -21,7 +21,7 @@ module.exports = function (grunt) {
     'assets/app/bower_components/angular-sanitize/angular-sanitize.js',
     'assets/app/bower_components/ngtoast/dist/ngToast.js',
 
-    'assets/app/bower_components/Chart.js/Chart.js',
+    'assets/app/bower_components/chart.js/dist/Chart.js',
     'assets/app/bower_components/angular-chart.js/dist/angular-chart.js',
     'assets/app/bower_components/ng-lodash/build/ng-lodash.js',
     'assets/app/bower_components/ng-file-upload/angular-file-upload-shim.js',