working on issue #376

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

@@ -69,7 +69,12 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
               class:"instruction-opt", name: "- - "+data.methods[i].instructions[j].name, id_method: data.methods[i].id});
               class:"instruction-opt", name: "- - "+data.methods[i].instructions[j].name, id_method: data.methods[i].id});
             for(var k=0; k<data.methods[i].instructions[j].working_sessions.length; k++)
             for(var k=0; k<data.methods[i].instructions[j].working_sessions.length; k++)
               for(var l=0; l<data.methods[i].instructions[j].working_sessions[k].tries.length; l++)
               for(var l=0; l<data.methods[i].instructions[j].working_sessions[k].tries.length; l++)
-                for(var m=0; m<data.methods[i].instructions[j].working_sessions[k].tries[l].actions.length; m++)
+                for(var m=0; m<data.methods[i].instructions[j].working_sessions[k].tries[l].actions.length; m++) {
+                  var expression = "";
+                  if (data.methods[i].instructions[j].working_sessions[k].tries[l].actions[m].description &&
+                      data.methods[i].instructions[j].working_sessions[k].tries[l].actions[m].description.attributes &&
+                      data.methods[i].instructions[j].working_sessions[k].tries[l].actions[m].description.attributes.expression)
+                      expression = data.methods[i].instructions[j].working_sessions[k].tries[l].actions[m].description.attributes.expression;
                   tsvData +=
                   tsvData +=
                     data.methods[i].name + SEPARATOR +
                     data.methods[i].name + SEPARATOR +
                     data.methods[i].instructions[j].name + SEPARATOR +
                     data.methods[i].instructions[j].name + SEPARATOR +
@@ -79,10 +84,8 @@ dashboardControllers.controller('StudentReportsCtrl', function StudentReportsCtr
                     data.methods[i].instructions[j].working_sessions[k].end + SEPARATOR +
                     data.methods[i].instructions[j].working_sessions[k].end + SEPARATOR +
                     data.methods[i].instructions[j].working_sessions[k].tries[l].begin + SEPARATOR +
                     data.methods[i].instructions[j].working_sessions[k].tries[l].begin + SEPARATOR +
                     data.methods[i].instructions[j].working_sessions[k].tries[l].end + SEPARATOR +
                     data.methods[i].instructions[j].working_sessions[k].tries[l].end + SEPARATOR +
-                    data.methods[i].instructions[j].working_sessions[k].tries[l].actions[m].timestamp + SEPARATOR +
-                    data.methods[i].instructions[j].working_sessions[k].tries[l].actions[m].description &&
-                    data.methods[i].instructions[j].working_sessions[k].tries[l].actions[m].description.attributes &&
-                    data.methods[i].instructions[j].working_sessions[k].tries[l].actions[m].description.attributes.expression ? data.methods[i].instructions[j].working_sessions[k].tries[l].actions[m].description.attributes.expression : '' + '\n';
+                    data.methods[i].instructions[j].working_sessions[k].tries[l].actions[m].timestamp + SEPARATOR + expression + '\n';
+                }
           }
           }
         }
         }
       }
       }