From 6bd23ee9f05fe050dce48665718d62dcd4c5828c Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Tue, 4 Apr 2023 01:49:38 +0200
Subject: [PATCH] admin: Fix move between exercices

---
 admin/static/js/app.js                      | 16 +++++++---------
 admin/static/views/exercice-flags.html      |  6 +++---
 admin/static/views/exercice-resolution.html |  6 +++---
 admin/static/views/exercice.html            |  6 +++---
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/admin/static/js/app.js b/admin/static/js/app.js
index c26f7472..53b2eb72 100644
--- a/admin/static/js/app.js
+++ b/admin/static/js/app.js
@@ -1696,20 +1696,18 @@ angular.module("FICApp")
 	} else {
 	    $scope.exercice = Exercice.get({ exerciceId: $routeParams.exerciceId });
 	}
+
+        $scope.my_ex_num = {};
+
 	$http({
 	    url: "api/themes.json",
 	    method: "GET"
 	}).then(function(response) {
 	    $scope.themes = response.data
-	    var last_exercice = null;
-	    angular.forEach($scope.themes[$scope.exercice.id_theme].exercices, function(exercice, k) {
-		if (last_exercice != null) {
-		    $scope.themes[$scope.exercice.id_theme].exercices[last_exercice].next = k;
-		    exercice.previous = last_exercice;
-		}
-		last_exercice = k;
-		exercice.id = k;
-	    });
+            for (var k in $scope.themes[$scope.exercice.id_theme].exercices) {
+              var exercice = $scope.themes[$scope.exercice.id_theme].exercices[k];
+              $scope.my_ex_num[exercice.id] = k;
+	    }
 	});
 	$scope.exercices = Exercice.query();
         $scope.fields = ["title", "urlid", "disabled", "statement", "headline", "overview", "finished", "depend", "gain", "coefficient", "videoURI", "resolution", "issue", "issuekind", "wip"];
diff --git a/admin/static/views/exercice-flags.html b/admin/static/views/exercice-flags.html
index 411d98d4..af95c170 100644
--- a/admin/static/views/exercice-flags.html
+++ b/admin/static/views/exercice-flags.html
@@ -2,9 +2,9 @@
   <button type="button" ng-click="syncFlags()" class="btn btn-light float-right"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> Synchroniser</button>
 <h2>
   <a href="exercices/{{exercice.id}}">{{exercice.title}}</a> <small class="text-muted">Flags</small>
-  <div class="btn-group" role="group" ng-if="themes[exercice.id_theme].exercices[exercice.id]">
-    <a href="exercices/{{ themes[exercice.id_theme].exercices[exercice.id].previous }}/flags" title="Exercice précédent" ng-class="{'disabled': !themes[exercice.id_theme].exercices[exercice.id].previous}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span></a>
-    <a href="exercices/{{ themes[exercice.id_theme].exercices[exercice.id].next }}/flags" title="Exercice suivant" ng-class="{'disabled': !themes[exercice.id_theme].exercices[exercice.id].next}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></a>
+  <div class="btn-group" role="group" ng-if="themes[exercice.id_theme].exercices">
+    <a href="exercices/{{ themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1].id }}/flags" title="Exercice précédent" ng-class="{'disabled': !themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1]}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span></a>
+    <a href="exercices/{{ themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1+2].id }}/flags" title="Exercice suivant" ng-class="{'disabled': !themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1+2]}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></a>
   </div>
 </h2>
 
diff --git a/admin/static/views/exercice-resolution.html b/admin/static/views/exercice-resolution.html
index a661d7e4..88d00e92 100644
--- a/admin/static/views/exercice-resolution.html
+++ b/admin/static/views/exercice-resolution.html
@@ -1,8 +1,8 @@
 <h2>
   <a href="exercices/{{exercice.id}}">{{exercice.title}}</a> <small class="text-muted">Résolution</small>
-  <div class="btn-group" role="group" ng-if="themes[exercice.id_theme].exercices[exercice.id]">
-    <a href="exercices/{{ themes[exercice.id_theme].exercices[exercice.id].previous }}/resolution" title="Exercice précédent" ng-class="{'disabled': !themes[exercice.id_theme].exercices[exercice.id].previous}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span></a>
-    <a href="exercices/{{ themes[exercice.id_theme].exercices[exercice.id].next }}/resolution" title="Exercice suivant" ng-class="{'disabled': !themes[exercice.id_theme].exercices[exercice.id].next}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></a>
+  <div class="btn-group" role="group" ng-if="themes[exercice.id_theme].exercices">
+    <a href="exercices/{{ themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1].id }}/resolution" title="Exercice précédent" ng-class="{'disabled': !themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1]}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span></a>
+    <a href="exercices/{{ themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1+2].id }}/resolution" title="Exercice suivant" ng-class="{'disabled': !themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1+2]}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></a>
   </div>
 </h2>
 
diff --git a/admin/static/views/exercice.html b/admin/static/views/exercice.html
index 0c745afd..43839738 100644
--- a/admin/static/views/exercice.html
+++ b/admin/static/views/exercice.html
@@ -3,9 +3,9 @@
     {{exercice.title}}
     <small ng-if="themes && themes[exercice.id_theme]"><a href="themes/{{ exercice.id_theme }}" title="{{themes[exercice.id_theme].authors | stripHTML}}">{{themes[exercice.id_theme].name}}</a></small>
   </h2>
-  <div class="btn-group" role="group" ng-if="themes[exercice.id_theme].exercices[exercice.id]">
-    <a href="exercices/{{ themes[exercice.id_theme].exercices[exercice.id].previous }}" title="Exercice précédent" ng-class="{'disabled': !themes[exercice.id_theme].exercices[exercice.id].previous}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span></a>
-    <a href="exercices/{{ themes[exercice.id_theme].exercices[exercice.id].next }}" title="Exercice suivant" ng-class="{'disabled': !themes[exercice.id_theme].exercices[exercice.id].next}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></a>
+  <div class="btn-group" role="group" ng-if="themes[exercice.id_theme].exercices">
+    <a href="exercices/{{ themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1].id }}" title="Exercice précédent" ng-class="{'disabled': !themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1]}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span></a>
+    <a href="exercices/{{ themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1+2].id }}" title="Exercice suivant" ng-class="{'disabled': !themes[exercice.id_theme].exercices[my_ex_num[exercice.id]-1+2]}" class="btn btn-sm btn-light"><span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></a>
   </div>
   <div class="ml-auto d-flex flex-row-reverse text-nowrap">
     <a href="exercices/{{exercice.id}}/resolution" ng-disabled="!exercice.videoURI" class="ml-2 btn btn-sm btn-info"><span class="glyphicon glyphicon-facetime-video" aria-hidden="true"></span> Vidéo</a>