issue #455 fixed

sails/src/api/controllers/GridController.js

@@ -139,21 +139,25 @@ module.exports = {
     duplicate: function(req,res){
 
       Grid.findOne({id:req.params.id})
-      .populate('stuPictos').then(function(grid){
+      .populate('stuPictos')
+      .then(function(grid) {
         Grid.create({
             name: grid.name,
             //categories: grid.categories,
             supervisor: grid.supervisor,
             student: grid.student
-        }).then(newGrid=>{
+        })
+        .then((newGrid) => {
           grid.stuPictos.forEach(function (stuPicto, cb) {
             StuPicto.create({
               student: stuPicto.student,
               picto: stuPicto.picto,
               grid: newGrid.id,
+              childGrid: stuPicto.childGrid,
               attributes: stuPicto.attributes
-            }).catch(function (err){
-              console.log("Error creating stu_picto "+err.details);
+            })
+            .catch(function (err){
+              console.log("Error creating stu_picto " + err.details);
               sails.log.error(err.details);
             });
           });

sails/src/api/controllers/StudentController.js

@@ -1189,7 +1189,7 @@ module.exports = {
 
     StuPicto.update(query, {
       attributes: params.attributes,
-      id_child_grid: params.id_child_grid || null
+      childGrid: params.childGrid || null
     })
     .then(updated => {
       if (!updated)

sails/src/api/models/Grid.js

@@ -101,12 +101,12 @@ module.exports = {
              stuPicto.attributes.uri_sound = stuPicto.attributes.uri_sound ? stuPicto.attributes.uri_sound : null;
              stuPicto.attributes.user_avatar = stuPicto.attributes.user_avatar ? stuPicto.attributes.user_avatar : null;
              var stuPictoToAdd = {
-                "id": stuPicto.id,
-                "picto": stuPicto.picto,
-                "id_grid": stuPicto.grid,
-                "id_child_grid": stuPicto.id_child_grid,
-                "attributes": stuPicto.attributes,
-                "tags": picto.tags ? picto.tags : []
+                id: stuPicto.id,
+                picto: stuPicto.picto,
+                grid: stuPicto.grid,
+                childGrid: stuPicto.childGrid,
+                attributes: stuPicto.attributes,
+                tags: picto.tags ? picto.tags : []
              };
              l.push(stuPictoToAdd);
              next_cb();

sails/src/api/models/StuPicto.js

@@ -37,7 +37,7 @@ module.exports = {
       type: 'integer',
       model: 'Grid'
     },
-    id_child_grid: {
+    childGrid: {
       columnName: 'id_child_grid',
       type: 'integer',
       model: 'Grid'

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

@@ -396,7 +396,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
 
     $http.put(config.backend + '/stu/' + $scope.studentData.id + '/picto/' + studentPicto.id, {
       attributes: studentPicto.attributes,
-      id_child_grid: studentPicto.id_child_grid
+      childGrid: studentPicto.childGrid
     })
     .success(function (newStuPicto) {
       io.socket.post('/stu/vocabulary', {

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

@@ -57,8 +57,8 @@ dashboardControllers.controller('PictoConfigCtrl', function (
         $http
           .put(config.backend+'/stu/'+ stu.id + '/picto/' + $scope.studentPicto.id,
             {
-              'attributes': $scope.studentPicto.attributes,
-              'id_child_grid': $scope.studentPicto.id_child_grid || null
+              attributes: $scope.studentPicto.attributes,
+              childGrid: $scope.studentPicto.childGrid || null
             })
           .success(function(data, status, headers, config) {
             resolve(data);

sails/src/assets/scripts/modules/student/views/collections.html

@@ -59,14 +59,14 @@
 
               <!-- Red cross -->
               <img src="/app/img/redcross.png"
-                ng-click="showGrid(studentPicto.id_child_grid,'parentPicto')"
+                ng-click="showGrid(studentPicto.childGrid,'parentPicto')"
                 class="red-cross-visibility disabled"
                 ng-if="studentPicto.attributes.status == 'disabled'">
               <!--./ Red cross -->
 
               <!-- Picto -->
               <img class="unselectable"
-                ng-click="showGrid(studentPicto.id_child_grid,'parentPicto')"
+                ng-click="showGrid(studentPicto.childGrid,'parentPicto')"
                 ng-src="{{studentPicto.picto.uri}}"
                 ng-class="{ 'novisible': studentPicto.attributes.status == 'invisible', 'deactivate': studentPicto.attributes.status == 'disabled' }"
                 ng-style="{ 'background-color': studentPicto.attributes.color || '#ffffff' }">

sails/src/assets/scripts/modules/student/views/pictoconfig.html

@@ -64,12 +64,12 @@
             </div>
             <div class="row">
               <div class="col-md-6">
-                <select class="form-control" ng-model="studentPicto.id_child_grid">
+                <select class="form-control" ng-model="studentPicto.childGrid">
                   <option value="">--- Ninguno ---</option>
                   <option
                     ng-repeat="grid in gridsList track by $index"
                     ng-if="grid.id != viewingGrid.id"
-                    ng-selected="(grid.id == studentPicto.id_child_grid)"
+                    ng-selected="(grid.id == studentPicto.childGrid)"
                     value="{{ grid.id }}">{{ grid.name }}
                   </option>
                 </select>