Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop

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

@@ -25,6 +25,7 @@
     "admin_panel": "Admin panel",
     "alert": "Alert",
     "all": "All",
+    "all_methods": "All methods",
     "animation": "Animation",
     "apply":"Apply",
     "annual": "Annual",
@@ -75,6 +76,7 @@
     "crop_image": "Crop image",
     "data_no_saved": "Data can't be saved",
     "data_saved": "Data saved",
+    "date_error": "Filter date to must be greater than since",
     "day_format": "yyyy/MM/dd",
     "days": "Days",
     "days_from_first_session": "days from first session",
@@ -254,6 +256,7 @@
     "password_type": "Password",
     "pause": "Pause",
     "pause_session": "Pause session",
+    "percent": "Percent",
     "personal_data": "Personal data",
     "personal_data": "Personal data",
     "phone": "Phone number",

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

@@ -25,6 +25,7 @@
     "admin_panel": "Panel de administración",
     "alert": "Alerta",
     "all": "Todos",
+    "all_methods": "Todos los métodos",
     "animation": "Animación",
     "apply":"Aplicar",
     "annual": "Anual",
@@ -75,6 +76,7 @@
     "crop_image": "Recortar imagen",
     "data_no_saved": "Los datos no se han podido guardar",
     "data_saved": "Datos guardados",
+    "date_error": "La fecha 'desde' debe ser menor que la fecha 'hasta'",
     "day_format": "dd/MM/yyyy",
     "days": "Días",
     "days_from_first_session": "días desde la primera sesión",
@@ -253,6 +255,7 @@
     "password_short": "La contraseña es muy corta, debe tener al menos una longitud de {{minlength}} caracteres",
     "pause": "Pausar",
     "pause_session": "Pausar sesión",
+    "percent": "Porcentaje",
     "personal_data": "Datos personales",
     "personal_data": "Datos personales",
     "phone": "Teléfono",

sails/src/assets/scripts/modules/student/controllers/reports.js

@@ -8,6 +8,7 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
   $stateParams,
   $http,
   config,
+  ngToast,
   $filter,
   $translate) {
 
@@ -63,6 +64,7 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
             class:"instruction-opt", name: "- - "+$scope.fulldata.methods[i].instructions[j].name, id_method: $scope.fulldata.methods[i].id});
         }
       }
+      $scope.filter();
    })
       .error(function(data, status, headers, config) {
         console.log("Error from API: " + data.error);
@@ -86,14 +88,16 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
    $scope.filter = function (){
 
      if($scope.reportDateSince > $scope.reportDateTo){
-       //Mostrar error
+       $translate('date_error').then(function (translation) {
+         ngToast.danger({ content: translation });
+       });
        return;
      }
      $scope.showPrint = true;
      $scope.reportDateSinceFormat = moment($scope.reportDateSince).format("DD/MM/YYYY");
      $scope.reportDateToFormat = moment($scope.reportDateTo).format("DD/MM/YYYY");
      if($scope.selected_method == "-1"){
-       $scope.printName="All methods";
+       $scope.printName=$translate.instant('all_methods');
        $scope.statistics({id: -1, class: "method-opt"});
      }else{
        $scope.printName=JSON.parse($scope.selected_method).name;
@@ -201,8 +205,7 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
      //CHART DATA
      //*** Error rate chart***
      $scope.labels1 = $scope.method_chart_dates[0];
-     $scope.series1 = ['Tasa de error'];
-     //$scope.dataChart1 = [error_rate];
+     $scope.series1 = [$translate.instant('error_rate')];
      $scope.dataChart1 = $scope.error_rate_rate;
      $scope.optionsChartDateRate = {
        elements:{
@@ -215,7 +218,7 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
         scales: {
           yAxes: [{
             scaleLabel: {
-              labelString: "Porcentaje",
+              labelString: $translate.instant('percent'),
               display: true
             }
           }],
@@ -337,7 +340,7 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
 
       //*** Vocabuary size chart***
       $scope.labels4 = $scope.method_chart_dates[0];
-      $scope.series4 = [$translate.instant('Pictograms')];
+      $scope.series4 = [$translate.instant('pictograms')];
       $scope.dataChart4 = $scope.vocab_size;
 
       //*** Phrase size chart***