Compare commits
No commits in common. "fe731b934adc8498c53dc06fc298add450f30f69" and "c9a4de7a7d6193d410c0e11f6a6d28d4ec3fd407" have entirely different histories.
fe731b934a
...
c9a4de7a7d
@ -79,9 +79,6 @@
|
|||||||
<h6>TP {{tutoid+1}}</h6>
|
<h6>TP {{tutoid+1}}</h6>
|
||||||
<span class="badge mr-1" ng-repeat="(ch,t) in tuto_progress[tutoid]" ng-class="{'badge-warning': mychallenges[ch] && mychallenges[ch].recent && (tutoid != 0 && mychallenges[ch].recent > 300), 'badge-info': mychallenges[ch] && mychallenges[ch].recent && mychallenges[ch].recent <= 300 && mychallenges[ch].recent >= 120, 'badge-success': mychallenges[ch] && mychallenges[ch].recent && (tutoid == 0 || mychallenges[ch].recent < 120), 'badge-danger': !mychallenges[ch] || !mychallenges[ch].recent}" title="{{ t.title }} @ {{ mychallenges[ch].time | date: 'medium' }} {{ mychallenges[ch].recent }}" ng-bind="t.label"></span>
|
<span class="badge mr-1" ng-repeat="(ch,t) in tuto_progress[tutoid]" ng-class="{'badge-warning': mychallenges[ch] && mychallenges[ch].recent && (tutoid != 0 && mychallenges[ch].recent > 300), 'badge-info': mychallenges[ch] && mychallenges[ch].recent && mychallenges[ch].recent <= 300 && mychallenges[ch].recent >= 120, 'badge-success': mychallenges[ch] && mychallenges[ch].recent && (tutoid == 0 || mychallenges[ch].recent < 120), 'badge-danger': !mychallenges[ch] || !mychallenges[ch].recent}" title="{{ t.title }} @ {{ mychallenges[ch].time | date: 'medium' }} {{ mychallenges[ch].recent }}" ng-bind="t.label"></span>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
|
||||||
<h6>Légende</h6>
|
|
||||||
<span ng-repeat="(k,v) in tuto_legend" class="badge mr-2" ng-class="{'badge-success': k == 'success','badge-danger': k == 'danger','badge-warning': k == 'warning','badge-info': k == 'info'}">{{ v }}</span>
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -41,7 +41,6 @@ angular.module("AdLinApp")
|
|||||||
})
|
})
|
||||||
.controller("StudentsProgressionController", function($scope, $interval, Progression) {
|
.controller("StudentsProgressionController", function($scope, $interval, Progression) {
|
||||||
$scope.tuto_progress = tuto_progress;
|
$scope.tuto_progress = tuto_progress;
|
||||||
$scope.tuto_legend = tuto_legend;
|
|
||||||
$scope.stats = {};
|
$scope.stats = {};
|
||||||
$scope.students = {};
|
$scope.students = {};
|
||||||
$scope.filterBadgeState = {};
|
$scope.filterBadgeState = {};
|
||||||
@ -106,7 +105,6 @@ angular.module("AdLinApp")
|
|||||||
})
|
})
|
||||||
.controller("StudentProgressionController", function($scope, $interval, $http, Student, StudentProgression) {
|
.controller("StudentProgressionController", function($scope, $interval, $http, Student, StudentProgression) {
|
||||||
$scope.tuto_progress = tuto_progress;
|
$scope.tuto_progress = tuto_progress;
|
||||||
$scope.tuto_legend = tuto_legend;
|
|
||||||
var refreshStd = function() {
|
var refreshStd = function() {
|
||||||
var student = Student.get({studentId: $scope.onestudent})
|
var student = Student.get({studentId: $scope.onestudent})
|
||||||
student.$promise.then(function(stdnt) {
|
student.$promise.then(function(stdnt) {
|
||||||
@ -167,7 +165,6 @@ angular.module("AdLinApp")
|
|||||||
})
|
})
|
||||||
.controller("ProgressionController", function($scope, $interval, $http) {
|
.controller("ProgressionController", function($scope, $interval, $http) {
|
||||||
$scope.tuto_progress = tuto_progress;
|
$scope.tuto_progress = tuto_progress;
|
||||||
$scope.tuto_legend = tuto_legend;
|
|
||||||
$scope.mychallenges = {};
|
$scope.mychallenges = {};
|
||||||
var refreshChal = function() {
|
var refreshChal = function() {
|
||||||
$http.get("/api/students/" + $scope.student.id + "/progress").then(function(response) {
|
$http.get("/api/students/" + $scope.student.id + "/progress").then(function(response) {
|
||||||
|
@ -112,7 +112,6 @@ angular.module("AdLinApp")
|
|||||||
|
|
||||||
.controller("ProgressionController", function($scope, $interval, $http) {
|
.controller("ProgressionController", function($scope, $interval, $http) {
|
||||||
$scope.tuto_progress = tuto_progress;
|
$scope.tuto_progress = tuto_progress;
|
||||||
$scope.tuto_legend = tuto_legend;
|
|
||||||
|
|
||||||
$scope.mychallenges = {};
|
$scope.mychallenges = {};
|
||||||
var refreshChal = function() {
|
var refreshChal = function() {
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
<div class="mb-2 row">
|
<div class="mb-2 row">
|
||||||
<strong class="col-auto mr-2">Légende</strong>
|
<strong class="col-auto mr-2">Légende</strong>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<span ng-repeat="(k,v) in tuto_legend" class="badge mr-2" ng-class="{'badge-success': k == 'success','badge-danger': k == 'danger','badge-warning': k == 'warning','badge-info': k == 'info'}">{{ v }}</span>
|
<span ng-repeat="(kid,k) in Object.keys(tuto_legend)" class="badge mr-2" ng-class="{'badge-success': k == 'success','badge-danger': k == 'danger','badge-warning': k == 'warning','badge-info': k == 'info'}">{{ tuto_legend[k] }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -30,7 +30,6 @@ func (i *staticDevDir) String() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (i *staticDevDir) Set(value string) error {
|
func (i *staticDevDir) Set(value string) error {
|
||||||
i.Path = &value
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user