From 60db1484121e755c9f71c0e90ac095279a351ddf Mon Sep 17 00:00:00 2001
From: Leo VIALLON-GALINIER <leo.viallon@vln-glr.fr>
Date: Sun, 26 Apr 2020 20:10:43 +0200
Subject: [PATCH] Correction small bugs on visualisation

---
 db.py                      | 4 ++--
 static/game_script.js      | 6 +++++-
 templates/admin_games.html | 2 +-
 templates/base.html        | 4 +++-
 templates/games.html       | 1 +
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/db.py b/db.py
index feb015b..5e9de69 100644
--- a/db.py
+++ b/db.py
@@ -306,6 +306,8 @@ class Game(db.Model):
     
     def restart_jeu(self):
         if (self.turn==0 and (self.atout=='' or self.atout is None)) or self.turn==N_TURN*N_PLAYERS:
+            if self.turn>0:
+                self.partie +=1
             self.turn = -8
             self.atout = None
             self.preneur = None
@@ -315,8 +317,6 @@ class Game(db.Model):
             self.cumul_1 += self.points_1
             self.points_0 = 0
             self.points_1 = 0
-            if self.turn>0:
-                self.partie +=1
             self.first_player = 0
             self.distribute()
             db.session.commit()
diff --git a/static/game_script.js b/static/game_script.js
index acd8c11..adc9083 100644
--- a/static/game_script.js
+++ b/static/game_script.js
@@ -154,7 +154,11 @@ var set_current_player = function(){
     if(jeu['turn']==32 && jeu['admin']==jeu['players'][jeu['nr']]){
         $('#suivant').show();
     }
-    if(jeu['turn']==0 && (jeu['atout'] == null||jeu['atout']=='') && jeu['admin']==jeu['players'][jeu['nr']]){
+    else if(jeu['turn']==0 && (jeu['atout'] == null||jeu['atout']=='') && jeu['admin']==jeu['players'][jeu['nr']]){
+        $('#suivant').show();
+    }
+    else
+    {
         $('#suivant').show();
     }
 }
diff --git a/templates/admin_games.html b/templates/admin_games.html
index c62bc6e..a489184 100644
--- a/templates/admin_games.html
+++ b/templates/admin_games.html
@@ -6,7 +6,7 @@
 
 {% block contenu %}
 <div id="zone-de-contenu">
-    <fieldset class="fieldset" ><legend style="font-size:25px;">Ajouter un utilisateur</legend>
+    <fieldset class="fieldset" ><legend style="font-size:25px;">Ajouter un jeu</legend>
             <button id="add" onclick="javascript:go('/admin/games/new')">
             <img src="/static/plus.png" style="float:left;" alt=''/><div style="float:right; margin:5px;">Nouveau jeu</div>
             </button>
diff --git a/templates/base.html b/templates/base.html
index 43b63a3..cedcf73 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -30,8 +30,10 @@
                     <div id="username-item1" class="menu-item" onclick="javascript:go('/games')">Liste des jeux</div>
                     <div id="username-item2" class="menu-item" onclick="javascript:go('/password')">Changer mon mot de passe</div>
                     <div id="username-item3" class="menu-item" onclick="javascript:go('/logout')">Se déconnecter</div>
-                    {% if user.level > 9 %}
+                    {% if user.level > 8 %}
                     <div id="username-item4" class="menu-item" onclick="javascript:go('/admin/games')">Admin des jeux</div>
+                    {% endif %}
+                    {% if user.level > 9 %}
                     <div id="username-item5" class="menu-item" onclick="javascript:go('/admin/users')">Admin des utilisateurs</div>
                     {% endif %}
                     {% else %}
diff --git a/templates/games.html b/templates/games.html
index 04f48b9..f7db75f 100644
--- a/templates/games.html
+++ b/templates/games.html
@@ -15,6 +15,7 @@
         {% endif %}
         {% if mesjeux|length > 0 %}
         <fieldset class="fieldset" ><legend style="font-size:25px;">Mes jeux</legend>
+            <div style="width:100%;text-align:right;padding-bottom:10px;"><a href="/games" style="color:blue">Recharger la liste des jeux</a></div>
             <table class="tablelist">
             {% for g in mesjeux %}
                 <tr>