issue #701 close - category pictos can be modified

sails/src/api/controllers/StudentController.js

@@ -980,38 +980,41 @@ module.exports = {
     .then((sp) => {
     .then((sp) => {
       if (!sp) throw new Error ("error on update");
       if (!sp) throw new Error ("error on update");
 
 
+      // Get student to get language
       Student.findOne(params.id_stu)
       Student.findOne(params.id_stu)
       .then((s) => {
       .then((s) => {
         if (!s) throw new Error("Student not found");
         if (!s) throw new Error("Student not found");
-        console.log("id_pic: " + sp.picto + ", lang: " + s.lang);
+
         PictoExp.findOne({id_pic: sp.picto, lang: s.lang})
         PictoExp.findOne({id_pic: sp.picto, lang: s.lang})
         .then((pe) => {
         .then((pe) => {
-          if (!pe)
-            throw new Error ("Expression not found");
+          if (!pe) throw new Error ("Expression not found");
 
 
-            var old_picto = sp.picto;
-            sp.picto = params.new_id_pic;
+          // store old picto id to update pictos in category
+          var old_picto = sp.picto;
+          if (sp.attributes.expression == undefined || sp.attributes.expression == null)
             sp.attributes.expression = pe.text;
             sp.attributes.expression = pe.text;
-            // Save modified stu_picto entry for category
-            sp.save((err) => {
-              if (err) throw err;
-              // Update attributes.id_cat for all pictos
-              StuPicto.find({id_stu: params.id_stu})
-              .then(sps => {
-                for (var i=0; i<sps.length; i++) {
-                  if (sps[i].attributes.id_cat == old_picto) {
-                    sps[i].attributes.id_cat = params.new_id_pic;
-                    sps[i].save();
-                  }
+          sp.picto = params.new_id_pic;
+
+          // Save modified stu_picto entry for category
+          sp.save((err) => {
+            if (err) throw err;
+            // Update attributes.id_cat for all pictos
+            StuPicto.find({id_stu: params.id_stu})
+            .then(sps => {
+              for (var i=0; i<sps.length; i++) {
+                if (sps[i].attributes.id_cat == old_picto) {
+                  sps[i].attributes.id_cat = params.new_id_pic;
+                  sps[i].save();
                 }
                 }
-                return res.ok(sp);
-              })
-              .catch(e => {throw e});
-            });
+              }
+              return res.ok(sp);
+            })
+            .catch(err => {throw err});
+          });
         })
         })
-        .catch(e => {throw e});
+        .catch(err => {throw err});
       })
       })
-      .catch(e => {throw e})
+      .catch(err => {throw err})
     })
     })
     .catch(err => {
     .catch(err => {
       return res.serverError('Unable to update category for student: ' + err);
       return res.serverError('Unable to update category for student: ' + err);

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

@@ -52,7 +52,6 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
   $scope.selectedCategory = $scope.emptyStudentPicto;
   $scope.selectedCategory = $scope.emptyStudentPicto;
   $scope.studentPictos = {};
   $scope.studentPictos = {};
   $scope.freeCategoryPictos = null;
   $scope.freeCategoryPictos = null;
-  $scope.categories = [];
   $scope.loadingPictos = true;
   $scope.loadingPictos = true;
 
 
   $scope.isCategory = function (studentPicto) {
   $scope.isCategory = function (studentPicto) {
@@ -109,10 +108,6 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
     $scope.studentPictos[$scope.getCategoryId($scope.selectedCategory)] =
     $scope.studentPictos[$scope.getCategoryId($scope.selectedCategory)] =
       $scope.studentPictos[$scope.getCategoryId($scope.selectedCategory)] || generateGrid();
       $scope.studentPictos[$scope.getCategoryId($scope.selectedCategory)] || generateGrid();
 
 
-    if ($scope.isCategory(picto)) {
-      $scope.categories.push(picto);
-    }
-
     // Categories disabled
     // Categories disabled
     if (typeof freeCategoryPositionX === 'number' &&
     if (typeof freeCategoryPositionX === 'number' &&
         typeof freeCategoryPositionY === 'number') {
         typeof freeCategoryPositionY === 'number') {
@@ -126,6 +121,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
         $scope.getCategoryId(picto);
         $scope.getCategoryId(picto);
       $scope.studentPictos[category] = $scope.studentPictos[category] || generateGrid();
       $scope.studentPictos[category] = $scope.studentPictos[category] || generateGrid();
       $scope.studentPictos[category][positionX][positionY] = picto;
       $scope.studentPictos[category][positionX][positionY] = picto;
+      console.log("picto placed at " + positionX + "  " + positionY);
     }
     }
   };
   };
 
 
@@ -140,7 +136,6 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
     // Get user's pictos
     // Get user's pictos
     $http.get(config.backend + '/stu/' + $scope.studentData.id + '/pictos')
     $http.get(config.backend + '/stu/' + $scope.studentData.id + '/pictos')
     .success(function (studentPictos) {
     .success(function (studentPictos) {
-      $scope.categories = [];
       $scope.showFreeCategory = !$scope.studentData.attributes.categories;
       $scope.showFreeCategory = !$scope.studentData.attributes.categories;
       studentPictos.forEach(placePicto);
       studentPictos.forEach(placePicto);
 
 
@@ -337,8 +332,8 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
         new_id_pic: pictoId
         new_id_pic: pictoId
       })
       })
       .success(function (studentPicto) {
       .success(function (studentPicto) {
-        console.log(attributes);
-        placePicto(studentPicto);
+        console.log(JSON.stringify(studentPicto));
+        $scope.loadPictos();
 
 
         // notify
         // notify
         io.socket.post('/stu/vocabulary', {
         io.socket.post('/stu/vocabulary', {