Commit 4beff312 by Fernando Martínez Santiago Committed by root

bugs #534 and #539 fixed

parent 750f7bc3
......@@ -12,7 +12,7 @@ module.exports = {
* @param {request} req
* {
* student: studentId,
* type: 'Add / Select / Delete / Show / Unshow / Pause / tryinit /
* type: 'Add / Select / Delete / Show / Unshow / tryinit /
* tryend / initsession / endsession / pausesession / resumesession',
* timestamp: 'Date()', (optional)
* supervisor: supervisorId, (optional)
......
......@@ -1074,7 +1074,7 @@ module.exports = {
);
var sup = null;
if (attributes.supervisor) sup = attributes.supervisor;
if (attributes.id_sup) sup = attributes.id_sup;
var desc = null;
if (attributes.picto) desc = attributes.picto; // select, add and delete actions data
......
......@@ -389,7 +389,7 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
// as the last action, added $scope.apply() that lets angular know
// what data has updated, and refresh what needs to be refreshed.
if($scope.ws && $scope.actual_try.actions && $scope.paused == false){
if($scope.ws && $scope.actual_try.actions && !data.attributes.id_sup && $scope.paused == false){
switch(data.action){
case 'Add':
......
......@@ -39,9 +39,9 @@
</timer>
</div>
<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 }}" />
<img ng-src="{{ a.attributes.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 == 'Select'" class="glyphicon glyphicon-hand-up color_blue" aria-hidden="true"></span>
......@@ -52,6 +52,7 @@
<span ng-if="a.action == 'tryend'" class="glyphicon glyphicon-log-out" aria-hidden="true"></span>
<span ng-if="a.action == 'pausesession'" class="glyphicon glyphicon-pause" aria-hidden="true"></span>
<span ng-if="a.action == 'resumesession'" class="glyphicon glyphicon-play" aria-hidden="true"></span>
<span ng-if="a.attributes.id_sup" class="glyphicon glyphicon-user color_blue" aria-hidden="true"></span>
</div>
</div>
</div>
......
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