fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

frontend: Add a message on submission timeout

Browse source
This commit is contained in:
nemunaire 2019-01-18 04:41:17 +01:00
parent 4f98536f91
commit 3b15fda470
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/static/js/challenge.js
View file

@ -291,6 +291,8 @@ angular.module("FICApp", ["ngRoute", "ngSanitize"])
}); });
} }
angular.forEach(data.exercices, function(exercice, eid) { angular.forEach(data.exercices, function(exercice, eid) {
if ($scope.my && $scope.my.exercices[eid] && $scope.my.exercices[eid].submitted)
data.exercices[eid].timeouted = true;
angular.forEach(exercice.flags, function(flag, fid) { angular.forEach(exercice.flags, function(flag, fid) {
if ($scope.my && $scope.my.exercices[eid] && $scope.my.exercices[eid].flags && $scope.my.exercices[eid].flags[fid] && $scope.my.exercices[eid].flags[fid].value !== undefined) if ($scope.my && $scope.my.exercices[eid] && $scope.my.exercices[eid].flags && $scope.my.exercices[eid].flags[fid] && $scope.my.exercices[eid].flags[fid].value !== undefined)
data.exercices[eid].flags[fid].value = $scope.my.exercices[eid].flags[fid].value; data.exercices[eid].flags[fid].value = $scope.my.exercices[eid].flags[fid].value;
@ -504,6 +506,7 @@ angular.module("FICApp", ["ngRoute", "ngSanitize"])
$scope.sberr = "Oups !"; $scope.sberr = "Oups !";
$scope.message = response.data.errmsg; $scope.message = response.data.errmsg;
}); });
$scope.my.exercices[$rootScope.current_exercice].timeouted = false;
$scope.my.exercices[$rootScope.current_exercice].submitted = true; $scope.my.exercices[$rootScope.current_exercice].submitted = true;
}; };

1
frontend/static/views/defi.html
View file

@ -87,6 +87,7 @@
<ul class="list-group" ng-if="(my.exercices[current_exercice].tries || my.exercices[current_exercice].submitted || sberr)"> <ul class="list-group" ng-if="(my.exercices[current_exercice].tries || my.exercices[current_exercice].submitted || sberr)">
<li class="list-group-item text-warning" ng-if="my.exercices[current_exercice].solved_time && my.exercices[current_exercice].tries"><ng-pluralize count="my.exercices[current_exercice].tries" when="{'one': '{} tentative effectuée', 'other': '{} tentatives effectuées'}"></ng-pluralize>. Dernière solution envoyée à {{ my.exercices[current_exercice].solved_time | date:"mediumTime" }}. <span ng-if="my.exercices[current_exercice].solve_dist"><ng-pluralize count="my.exercices[current_exercice].solve_dist" when="{'one': '{} réponse erronée', 'other': '{} réponses erronées'}"></ng-pluralize>.</span></li> <li class="list-group-item text-warning" ng-if="my.exercices[current_exercice].solved_time && my.exercices[current_exercice].tries"><ng-pluralize count="my.exercices[current_exercice].tries" when="{'one': '{} tentative effectuée', 'other': '{} tentatives effectuées'}"></ng-pluralize>. Dernière solution envoyée à {{ my.exercices[current_exercice].solved_time | date:"mediumTime" }}. <span ng-if="my.exercices[current_exercice].solve_dist"><ng-pluralize count="my.exercices[current_exercice].solve_dist" when="{'one': '{} réponse erronée', 'other': '{} réponses erronées'}"></ng-pluralize>.</span></li>
<li class="list-group-item" ng-class="messageClass" ng-if="my.exercices[current_exercice].submitted || sberr"><strong ng-if="!sberr">Votre solution a bien été envoyée !</strong><strong ng-if="sberr">{{ sberr }}</strong> {{ message }}</li> <li class="list-group-item" ng-class="messageClass" ng-if="my.exercices[current_exercice].submitted || sberr"><strong ng-if="!sberr">Votre solution a bien été envoyée !</strong><strong ng-if="sberr">{{ sberr }}</strong> {{ message }}</li>
<li class="list-group-item text-danger" ng-if="my.exercices[current_exercice].timeouted"><strong>Oops</strong> La requête a dépassé le délai d'attente. Vous devriez réessayer dans quelques instant&hellip;</li>
</ul> </ul>
<div class="card-body" ng-if="!my.exercices[current_exercice].submitted || sberr"> <div class="card-body" ng-if="!my.exercices[current_exercice].submitted || sberr">
<form ng-submit="ssubmit()"> <form ng-submit="ssubmit()">