Commit ddce7b6a by Fernando Martínez Santiago Committed by root

working on json issues on server side

parent a78b4b1f
......@@ -1082,7 +1082,7 @@ module.exports = {
if (attributes.id_sup) sup = attributes.id_sup;
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
Action.create({
......
......@@ -99,7 +99,7 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
.success(function(data, status, headers, config) {
// Add to list
$scope.wsessions = data;
console.log(JSON.stringify(data));
// Refresh navigation vars
$scope.currentPage = 1;
$scope.numPerPage = 5;
......
......@@ -47,10 +47,10 @@
</div>
<div class="try">
<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">
<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 == '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>
......
......@@ -13,7 +13,7 @@
module.exports.sockets = {
pingTimeout: 60000, // set timeout to 60 secs
pingTimeout: 10000, // set timeout to 10 secs
/***************************************************************************
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment