new core categories shown properly

sails/src/api/controllers/SupervisorController.js

@@ -79,7 +79,7 @@ module.exports = {
         });
         });
 
 
       var office = Office.findOne({id: supervisor.office})
       var office = Office.findOne({id: supervisor.office})
-        .then(function (office) {
+        .then(function (office) {          
           return office;
           return office;
         });
         });
 
 
@@ -95,6 +95,8 @@ module.exports = {
       if (!supervisor.isSupAdmin && !stuSup)
       if (!supervisor.isSupAdmin && !stuSup)
         throw new Error("User without students linked to");
         throw new Error("User without students linked to");
 
 
+
+
       return res.ok({
       return res.ok({
         user: supervisor,
         user: supervisor,
         server_time: (new Date()).getTime(),
         server_time: (new Date()).getTime(),
@@ -405,7 +407,7 @@ module.exports = {
         var students = [];
         var students = [];
         async.each(stuSups,
         async.each(stuSups,
           function(stuSup, cb) {
           function(stuSup, cb) {
-            
+
             // Filter logically deleted students
             // Filter logically deleted students
             if (stuSup.student.office == null)
             if (stuSup.student.office == null)
               cb();
               cb();

sails/src/api/models/Student.js

@@ -169,6 +169,7 @@ module.exports = {
       },
       },
       legend: false,
       legend: false,
       legend_size: 'normal',
       legend_size: 'normal',
+      pic: "defaultAvatar.jpg",
       size: 'normal',
       size: 'normal',
       picto_background: '#0000ff',
       picto_background: '#0000ff',
       tape_background: '#00ffff',
       tape_background: '#00ffff',
@@ -194,6 +195,9 @@ module.exports = {
           }
           }
         });
         });
       }
       }
+      if (typeof validAttributes.pic !== 'string') {
+        delete validAttributes.pic;
+      }
       if (typeof validAttributes.input_selection !== 'object') {
       if (typeof validAttributes.input_selection !== 'object') {
         delete validAttributes.input_selection;
         delete validAttributes.input_selection;
       } else {
       } else {

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

@@ -57,7 +57,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
 
 
   $scope.isCategory = function (studentPicto) {
   $scope.isCategory = function (studentPicto) {
     return studentPicto.attributes.id_cat === null &&
     return studentPicto.attributes.id_cat === null &&
-           studentPicto.attributes.coord_x !== 0 &&
+           studentPicto.attributes.coord_y !== 0 &&
            typeof studentPicto.attributes.free_category_coord_x !== 'number' &&
            typeof studentPicto.attributes.free_category_coord_x !== 'number' &&
            typeof studentPicto.attributes.free_category_coord_y !== 'number';
            typeof studentPicto.attributes.free_category_coord_y !== 'number';
   };
   };

sails/src/assets/scripts/modules/supervisor/controllers/students.js

@@ -24,7 +24,7 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
     gender: 'F',
     gender: 'F',
     lang: 'es-es',
     lang: 'es-es',
     notes: '',
     notes: '',
-    pic: '/app/img/default.jpg',
+    pic: 'defaultAvatar.jpg',
     office: $scope.user.office || { name: '' }
     office: $scope.user.office || { name: '' }
   };
   };
 
 

sails/src/assets/styles/picto-grid.less

@@ -62,7 +62,7 @@
 
 
   &__title {
   &__title {
     margin-top: 0;
     margin-top: 0;
-    color: white;
+    color: black;
     text-transform: capitalize;
     text-transform: capitalize;
   }
   }
 }
 }