Issue #232 injecting id_scene and WS

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

@@ -582,6 +582,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
         },
         },
         stu: function () {
         stu: function () {
           return $scope.studentData;
           return $scope.studentData;
+        },
+        viewingScene: function(){
+            return $scope.viewingScene;
         }
         }
       }
       }
     });
     });
@@ -605,6 +608,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
         },
         },
         stu: function () {
         stu: function () {
           return $scope.studentData;
           return $scope.studentData;
+        },
+        viewingScene: function(){
+            return $scope.viewingScene;
         }
         }
       }
       }
     });
     });

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

@@ -3,7 +3,18 @@
 // Please note that $modalInstance represents a modal window (instance) dependency.
 // Please note that $modalInstance represents a modal window (instance) dependency.
 // It is not the same as the $modal service used above.
 // It is not the same as the $modal service used above.
 
 
-dashboardControllers.controller('PictoConfigCtrl', function ($window, $scope, $translate, $modalInstance, $http, config, ngToast, studentPicto, sup, stu) {
+dashboardControllers.controller('PictoConfigCtrl', function (
+    $window,
+    $scope,
+    $translate,
+    $modalInstance,
+    $http,
+    config,
+    ngToast,
+    studentPicto,
+    sup,
+    stu,
+    viewingScene) {
 
 
   // Picto
   // Picto
   $scope.studentPicto = JSON.parse(JSON.stringify(studentPicto));
   $scope.studentPicto = JSON.parse(JSON.stringify(studentPicto));
@@ -73,6 +84,7 @@ dashboardControllers.controller('PictoConfigCtrl', function ($window, $scope, $t
           action: 'update',
           action: 'update',
           attributes: {
           attributes: {
             id_stu: stu.id,
             id_stu: stu.id,
+            id_scene: viewingScene.id,
             stu_picto: result
             stu_picto: result
           }
           }
         },
         },

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

@@ -13,6 +13,7 @@ dashboardControllers.controller('TagsCtrl', function TagsCtrl(
   studentPicto,
   studentPicto,
   sup,
   sup,
   stu,
   stu,
+  viewingScene,
   $translate,
   $translate,
   ngToast) {
   ngToast) {
 
 
@@ -52,9 +53,9 @@ dashboardControllers.controller('TagsCtrl', function TagsCtrl(
       io.socket.post('/stu/vocabulary', {
       io.socket.post('/stu/vocabulary', {
         action: 'update',
         action: 'update',
         attributes: {
         attributes: {
-          id_stu: $scope.stu,
-          stu_picto: studentPicto.id,
-          id_scene: studentPicto.scene
+          id_stu: stu.id,
+          id_scene: viewingScene.id,
+          stu_picto: studentPicto          
         }
         }
       }, function () {});
       }, function () {});