Pausesession and miliseconds FIX

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

@@ -388,43 +388,55 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
             default:
             default:
                 $scope.tries_count["null"]++;
                 $scope.tries_count["null"]++;
         }
         }
-        var ms = moment(new Date(working_sessions[i].tries[j].end),"DD/MM/YYYY HH:mm:ss").diff(moment(new Date(working_sessions[i].tries[j].begin) ,"DD/MM/YYYY HH:mm:ss"));
+        var ms = moment(new Date(working_sessions[i].tries[j].end),"DD/MM/YYYY HH:mm:ss.SSS").diff(moment(new Date(working_sessions[i].tries[j].begin) ,"DD/MM/YYYY HH:mm:ss.SSS"));
         var d = moment.duration(ms).asMilliseconds();
         var d = moment.duration(ms).asMilliseconds();
         tries_average_time += d;
         tries_average_time += d;
 
 
         if(working_sessions[i].tries[j].actions.length > 0){
         if(working_sessions[i].tries[j].actions.length > 0){
 
 
           var average_time_pictos_action = 0;
           var average_time_pictos_action = 0;
-          var before = moment(new Date(working_sessions[i].tries[j].actions[0].timestamp),"DD/MM/YYYY HH:mm:ss");
+          //La primera accion es initsession
+          var before = moment(new Date(working_sessions[i].tries[j].actions[0].timestamp),"DD/MM/YYYY HH:mm:ss.SSS");
           for(var k = 1; k < working_sessions[i].tries[j].actions.length; k++){
           for(var k = 1; k < working_sessions[i].tries[j].actions.length; k++){
 
 
-            var now = moment(new Date(working_sessions[i].tries[j].actions[k].timestamp),"DD/MM/YYYY HH:mm:ss");
-            var dif = moment(now).diff(before);
-            var miliseconds = moment.duration(dif).asMilliseconds();
-            average_time_pictos_action += miliseconds;
-            before = now;
-            if(working_sessions[i].tries[j].result == "SUCCESS"){
-              var count_pictos = 0;
-              var phrase_start = moment(working_sessions[i].tries[j].begin,"DD/MM/YYYY HH:mm:ss");
-              var phrase_end = 0;
-
-              if (working_sessions[i].tries[j].actions[k].type == "Delete"){
-                //The user deleted the last action
-                $scope.vocab_size_aux.pop();
-                count_pictos--;
-              }else if(working_sessions[i].tries[j].actions[k].type == "Add"){
-                count_pictos++;
-                if ( $scope.vocab_size_aux.indexOf(working_sessions[i].tries[j].actions[k].description.picto.id) == -1 ){
-                  //Si el id del picto no se encuentra en el array se añade
-                  $scope.vocab_size_aux.push(working_sessions[i].tries[j].actions[k].description.picto.id);
+            if(working_sessions[i].tries[j].actions[k].type=="pausesession"){
+            //Saltar esta action. La siguiente action a pausesession será before
+              if(working_sessions[i].tries[j].actions.length > k){
+                //Comprobacion para evitar salir del array
+                before = moment(new Date(working_sessions[i].tries[j].actions[k+1].timestamp),"DD/MM/YYYY HH:mm:ss.SSS");
+              }else{
+                //Esta condicion nunca se va a dar puesto que si el tamaño de acciones
+                //es menor que K es porque esta es la ultima acción, no hay una accion tipo SHOW al final del try
+              }
+            }else{
+              var now = moment(new Date(working_sessions[i].tries[j].actions[k].timestamp),"DD/MM/YYYY HH:mm:ss.SSS");
+              var dif = moment(now).diff(before);
+              var miliseconds = moment.duration(dif).asMilliseconds();
+              average_time_pictos_action += miliseconds;
+              before = now;
+              if(working_sessions[i].tries[j].result == "SUCCESS"){
+                var count_pictos = 0;
+                var phrase_start = moment(working_sessions[i].tries[j].begin,"DD/MM/YYYY HH:mm:ss.SSS");
+                var phrase_end = 0;
+
+                if (working_sessions[i].tries[j].actions[k].type == "Delete"){
+                  //The user deleted the last action
+                  $scope.vocab_size_aux.pop();
+                  count_pictos--;
+                }else if(working_sessions[i].tries[j].actions[k].type == "Add"){
+                  count_pictos++;
+                  if ( $scope.vocab_size_aux.indexOf(working_sessions[i].tries[j].actions[k].description.picto.id) == -1 ){
+                    //Si el id del picto no se encuentra en el array se añade
+                    $scope.vocab_size_aux.push(working_sessions[i].tries[j].actions[k].description.picto.id);
+                  }
+                }else if(working_sessions[i].tries[j].actions[k].type == "Show"){
+                  phrase_end = moment(working_sessions[i].tries[j].actions[k].timestamp,"DD/MM/YYYY HH:mm:ss.SSS");
+                  dif = moment(phrase_end).diff(phrase_start);
+                  miliseconds = moment.duration(dif).asMilliseconds();
+                  phrase_average_build_time += miliseconds;
                 }
                 }
-              }else if(working_sessions[i].tries[j].actions[k].type == "Show"){
-                phrase_end = moment(working_sessions[i].tries[j].actions[k].timestamp,"DD/MM/YYYY HH:mm:ss");
-                dif = moment(phrase_end).diff(phrase_start);
-                miliseconds = moment.duration(dif).asMilliseconds();
-                phrase_average_build_time += miliseconds;
+                phrase_average_size += count_pictos;
               }
               }
-              phrase_average_size += count_pictos;
             }
             }
           }
           }
           average_time_pictos_ws += average_time_pictos_action / working_sessions[i].tries[j].actions.length;
           average_time_pictos_ws += average_time_pictos_action / working_sessions[i].tries[j].actions.length;