From 1e41b709c6f94205df022d58c7d6013c34299295 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Wed, 9 Mar 2022 21:42:53 +0100
Subject: [PATCH 1/2] maatma: Fix legend on home page

---
 token-validator/htdocs/dashboard.html        | 3 +++
 token-validator/htdocs/js/adlin-dashboard.js | 3 +++
 token-validator/htdocs/js/adlin-main.js      | 1 +
 token-validator/htdocs/views/home.html       | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/token-validator/htdocs/dashboard.html b/token-validator/htdocs/dashboard.html
index bb2daab..8827556 100644
--- a/token-validator/htdocs/dashboard.html
+++ b/token-validator/htdocs/dashboard.html
@@ -79,6 +79,9 @@
                   <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>
                 </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>
             </div>
           </div>
diff --git a/token-validator/htdocs/js/adlin-dashboard.js b/token-validator/htdocs/js/adlin-dashboard.js
index 65a72b5..0992265 100644
--- a/token-validator/htdocs/js/adlin-dashboard.js
+++ b/token-validator/htdocs/js/adlin-dashboard.js
@@ -41,6 +41,7 @@ angular.module("AdLinApp")
     })
     .controller("StudentsProgressionController", function($scope, $interval, Progression) {
 	$scope.tuto_progress = tuto_progress;
+	$scope.tuto_legend = tuto_legend;
 	$scope.stats = {};
         $scope.students = {};
         $scope.filterBadgeState = {};
@@ -105,6 +106,7 @@ angular.module("AdLinApp")
     })
     .controller("StudentProgressionController", function($scope, $interval, $http, Student, StudentProgression) {
       $scope.tuto_progress = tuto_progress;
+      $scope.tuto_legend = tuto_legend;
       var refreshStd = function() {
         var student = Student.get({studentId: $scope.onestudent})
         student.$promise.then(function(stdnt) {
@@ -165,6 +167,7 @@ angular.module("AdLinApp")
     })
     .controller("ProgressionController", function($scope, $interval, $http) {
 	$scope.tuto_progress = tuto_progress;
+	$scope.tuto_legend = tuto_legend;
 	$scope.mychallenges = {};
 	var refreshChal = function() {
 	    $http.get("/api/students/" + $scope.student.id + "/progress").then(function(response) {
diff --git a/token-validator/htdocs/js/adlin-main.js b/token-validator/htdocs/js/adlin-main.js
index c54b76a..2fa5cf0 100644
--- a/token-validator/htdocs/js/adlin-main.js
+++ b/token-validator/htdocs/js/adlin-main.js
@@ -112,6 +112,7 @@ angular.module("AdLinApp")
 
     .controller("ProgressionController", function($scope, $interval, $http) {
         $scope.tuto_progress = tuto_progress;
+        $scope.tuto_legend = tuto_legend;
 
 	$scope.mychallenges = {};
 	var refreshChal = function() {
diff --git a/token-validator/htdocs/views/home.html b/token-validator/htdocs/views/home.html
index cce75d5..27c3cb4 100644
--- a/token-validator/htdocs/views/home.html
+++ b/token-validator/htdocs/views/home.html
@@ -28,7 +28,7 @@
     <div class="mb-2 row">
       <strong class="col-auto mr-2">Légende</strong>
       <div class="col">
-        <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>
+        <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>
       </div>
     </div>
   </div>

From fe731b934adc8498c53dc06fc298add450f30f69 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Wed, 9 Mar 2022 21:43:05 +0100
Subject: [PATCH 2/2] token-validator: Fix static option

---
 token-validator/static.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/token-validator/static.go b/token-validator/static.go
index a73dcbf..dc67404 100644
--- a/token-validator/static.go
+++ b/token-validator/static.go
@@ -30,6 +30,7 @@ func (i *staticDevDir) String() string {
 }
 
 func (i *staticDevDir) Set(value string) error {
+	i.Path = &value
 	return nil
 }