From 571faf1cf48e7528df057f2e9a61757915743efa Mon Sep 17 00:00:00 2001
From: Christophe SCAYA <>
Date: Mon, 26 Sep 2022 20:47:18 +0200
Subject: [PATCH] =?UTF-8?q?Cr=C3=A9ation=20refresh=20dashboard=20+=20gesti?=
 =?UTF-8?q?on=20plus=20aucune=20salle=20libre?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/functions.py                 | 10 ++++++++--
 app/templates/app/dashboard.html | 17 ++++++++++++++++-
 app/views.py                     |  4 +++-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/functions.py b/app/functions.py
index ab31877..0c92da8 100644
--- a/app/functions.py
+++ b/app/functions.py
@@ -33,11 +33,17 @@ def createChallenge(equipe):
 		max_rank = 0
 	if max_rank == 0:
 		challenge = Challenge(equipe=equipe,zone=attributeZone(),rank=1)
-		challenge.save()
+		try:
+			challenge.save()
+		except Exception:
+			challenge = -1
 		return challenge
 	if max_rank < getSettings().nb_challenges:
 		challenge = Challenge(equipe=equipe,zone=attributeZone(equipe),rank=max_rank+1)
-		challenge.save()
+		try:
+			challenge.save()
+		except Exception:
+			challenge = -1
 		return challenge
 	else:
 		return None
diff --git a/app/templates/app/dashboard.html b/app/templates/app/dashboard.html
index 2702418..9e1451a 100644
--- a/app/templates/app/dashboard.html
+++ b/app/templates/app/dashboard.html
@@ -12,4 +12,19 @@
 <td class='{{affichage.class}}'>{{affichage.text|safe}}</td>{% endfor %}
 </tr>{% endfor %}
 </tbody>
-</table>{% endblock %}
+</table>
+<div class="w-25 p-3 d-flex flex-row align-items-center">
+Réactualisation&nbsp;:&nbsp;<input id="refresh" type="number" onchange="updateRefresh()" class="form-control" value="60">&nbsp;secondes
+</div>
+<script>
+const refreshElement = document.getElementById("refresh")
+setInterval("refresh()", refreshElement.value*1000)
+
+function updateRefresh(){
+	setInterval("refresh()", refreshElement.value*1000);
+}
+
+function refresh(){
+	location.reload();
+}
+</script>{% endblock %}
diff --git a/app/views.py b/app/views.py
index 00d3650..daf7bc3 100644
--- a/app/views.py
+++ b/app/views.py
@@ -41,7 +41,9 @@ def displayZone(request, zone_id=None):
             		zone.save()
             		stopChallengeTime(challenge)
             		challenge = createChallenge(equipe)
-            		if challenge is not None:
+            		if challenge == -1:
+            			messages.warning(request, "Oups, aucune salle n'est disponible. Contactez l'administrateur !")
+            		elif challenge is not None:
 	            		messages.success(request, "Bien joué, rendez-vous maintenant dans la zone "+challenge.zone.nom+" pour la suite de l'aventure");
 	            	else:#escape game terminé
 	            		messages.success(request, "Bien joué, rendez-vous maintenant au point de départ pour scanner le QR code de fin de partie");