working on json issues on server side

sails/src/api/controllers/StudentController.js

@@ -1082,7 +1082,7 @@ module.exports = {
       if (attributes.id_sup) sup = attributes.id_sup;
       if (attributes.id_sup) sup = attributes.id_sup;
 
 
       var desc = null;
       var desc = null;
-      if (attributes.picto) desc = attributes.picto; // select, add and delete actions data
+      if (attributes.stu_picto) desc = attributes.stu_picto; // select, add and delete actions data
       if (attributes.pictos) desc = attributes.pictos; // show action data
       if (attributes.pictos) desc = attributes.pictos; // show action data
 
 
       Action.create({
       Action.create({

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

@@ -99,7 +99,7 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
        .success(function(data, status, headers, config) {
        .success(function(data, status, headers, config) {
             // Add to list
             // Add to list
             $scope.wsessions = data;
             $scope.wsessions = data;
-
+console.log(JSON.stringify(data));
             // Refresh navigation vars
             // Refresh navigation vars
             $scope.currentPage = 1;
             $scope.currentPage = 1;
             $scope.numPerPage = 5;
             $scope.numPerPage = 5;

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

@@ -47,10 +47,10 @@
         </div>
         </div>
         <div class="try">
         <div class="try">
           <div class="pull-left" ng-repeat="a in actual_try.actions track by $index"> 
           <div class="pull-left" ng-repeat="a in actual_try.actions track by $index"> 
-            <div class="picto" popover="{{ a.attributes.picto.expression.text | translate }}" popover-trigger="mouseenter">
-              <img ng-src="{{  a.attributes.picto.picto.uri }}" />
+            <div class="picto" popover="{{ a.attributes.stu_picto.expression.text | translate }}" popover-trigger="mouseenter">
+              <img ng-src="{{  a.attributes.stu_picto.picto.uri }}" />
               <div class="action-type">
               <div class="action-type">
-                <span ng-if="a.action == 'add'" class="glyphicon glyphicon-plus color_green" aria-hidden="true"></span>
+                <span ng-if="a.action == 'Add'" class="glyphicon glyphicon-plus color_green" aria-hidden="true"></span>
                 <span ng-if="a.action == 'Select'" class="glyphicon glyphicon-hand-up color_blue" aria-hidden="true"></span>
                 <span ng-if="a.action == 'Select'" class="glyphicon glyphicon-hand-up color_blue" aria-hidden="true"></span>
                 <span ng-if="a.action == 'Delete'" class="glyphicon glyphicon-remove color_red" aria-hidden="true"></span>
                 <span ng-if="a.action == 'Delete'" class="glyphicon glyphicon-remove color_red" aria-hidden="true"></span>
                 <span ng-if="a.action == 'Show'" class="glyphicon glyphicon-eye-open color_blue" aria-hidden="true"></span>
                 <span ng-if="a.action == 'Show'" class="glyphicon glyphicon-eye-open color_blue" aria-hidden="true"></span>

sails/src/config/sockets.js

@@ -13,7 +13,7 @@
 
 
 module.exports.sockets = {
 module.exports.sockets = {
 
 
-  pingTimeout: 60000, // set timeout to 60 secs
+  pingTimeout: 10000, // set timeout to 10 secs
 
 
   /***************************************************************************
   /***************************************************************************
   *                                                                          *
   *                                                                          *