issue #511 resolved

sails/src/api/models/Student.js

@@ -274,7 +274,7 @@ module.exports = {
   //
   //
   // Class method for getting the list of therapists associated to a given
   // Class method for getting the list of therapists associated to a given
   // student
   // student
-  // NOTE: A therapist is a supervisor assigned to an office  
+  // NOTE: A therapist is a supervisor assigned to an office
   therapists: function(id_stu, callback) {
   therapists: function(id_stu, callback) {
     StuSup.find({id_stu: id_stu}).populate('supervisor').exec(function(err, stuSups) {
     StuSup.find({id_stu: id_stu}).populate('supervisor').exec(function(err, stuSups) {
       var l = [];
       var l = [];
@@ -328,43 +328,75 @@ module.exports = {
   // Class method for getting the list of pictos associated to a given
   // Class method for getting the list of pictos associated to a given
   // student
   // student
   pictos: function(id_stu, callback) {
   pictos: function(id_stu, callback) {
-    Student.findOne(id_stu).exec(function(err, student) {
-      if (student){
-
-        StuPicto.find({student: id_stu}).populate('picto').exec(function(err, stuPictos) {
-
-          var l = [];
-
-          if (err || !stuPictos || stuPictos.length == 0)
-            return callback(err, l);
-
-          async.eachSeries(stuPictos, function(stuPicto, cb) {
+    var l = [];
+
+    Student.findOne(id_stu)
+    .then((student) => {
+      if (!student)
+        throw new Error("No student found");
+
+      var stuPictos = StuPicto.find({student: id_stu})
+      .populate('picto')
+      .then((stuPictos) => {
+          if (!stuPictos || stuPictos.length == 0)
+            return [];
+          return stuPictos;
+      })
+      .catch((err) => {
+        throw err;
+      });
 
 
-            // Populate expressions to get it with the picto
-            Picto.findOne(stuPicto.picto.id)
-            .populate('expressions', {lang: student.lang})
-            .exec(function(err, picto) {
-              if (err) throw err;
+      return [student, stuPictos];
+    })
+    .spread((student, stuPictos) => {
+      async.eachSeries(stuPictos, function(stuPicto, next_cb) {
 
 
-              var stuPictoToAdd = {
-                 "id": stuPicto.id,
-                 "picto": stuPicto.picto,
-                 "expression": picto.expressions[0],
-                 "attributes": stuPicto.attributes
-              };
+        // Populate expressions to get it with the picto
+        Picto.findOne(stuPicto.picto.id)
+        .populate('expressions', {lang: student.lang})
+        .then((picto) => {
 
 
-              l.push(stuPictoToAdd);
+          // check picto has expressions associated in student language
+          if (picto.expressions.length == 0 || picto.expressions[0].text.length == 0) {
+            sails.log.debug("No expression for picto " + picto.id);
+            return;
+          }
 
 
-              cb(); // next in the series
-            });
-          },
-          function(err) {
-            callback(err, l); // out loop finished, return result
+          // check picto image is available
+          var fs = require('fs');
+          var img_path = sails.config.pictogram.paths.public + stuPicto.picto.uri;
+          fs.access(img_path, fs.F_OK, function(err) {
+            if (err) {
+              sails.log.debug("No image file for " + img_path);
+              return;
+            }
+
+            // Now we have everythin, so we add the picto to the list
+            var stuPictoToAdd = {
+               "id": stuPicto.id,
+               "picto": stuPicto.picto,
+               "expression": picto.expressions[0],
+               "attributes": stuPicto.attributes
+            };
+
+            l.push(stuPictoToAdd);
           });
           });
-
-        });
-      }
-    });
+        })
+        .catch((err) => {
+          sails.log.debug("Error found obtaining pictos: " + err);
+        })
+        .then(() => next_cb()); // end Picto.findOne
+      },
+      function (err) { // loop has end
+        if (err)
+          sails.log.debug("Error found obtaining pictos: " + err);
+        callback(err, l);
+      }); // end async.eachSeries
+    })
+    .catch((err) => {
+      sails.log.debug("Error found obtaining pictos: " + err);
+      callback(err, l);
+    }); // end Student.findOne
   },
   },
 
 
   //
   //