From bd353d1caa38bbaa408470d35daee6ff96dd0b91 Mon Sep 17 00:00:00 2001
From: Christophe SCAYA <>
Date: Sat, 2 Apr 2022 22:58:43 +0200
Subject: [PATCH] Gestion chrono

---
 .../static/includes}/vial-solid.svg           |  0
 eduapps_project/templates/basic_template.html |  4 +-
 .../static/quiz_atomes/nav_padding.css        |  1 +
 .../templates/quiz_atomes/quiz_atomes.html    | 47 ++++++++++++++++---
 quiz_atomes/templates/quiz_atomes/scores.html |  3 +-
 .../templates/quiz_atomes/settings.html       | 26 +++++-----
 quiz_atomes/views.py                          |  2 +-
 7 files changed, 59 insertions(+), 24 deletions(-)
 rename {quiz_atomes/static/quiz_atomes => eduapps_project/static/includes}/vial-solid.svg (100%)
 create mode 100644 quiz_atomes/static/quiz_atomes/nav_padding.css

diff --git a/quiz_atomes/static/quiz_atomes/vial-solid.svg b/eduapps_project/static/includes/vial-solid.svg
similarity index 100%
rename from quiz_atomes/static/quiz_atomes/vial-solid.svg
rename to eduapps_project/static/includes/vial-solid.svg
diff --git a/eduapps_project/templates/basic_template.html b/eduapps_project/templates/basic_template.html
index 08f2588..a577fbe 100644
--- a/eduapps_project/templates/basic_template.html
+++ b/eduapps_project/templates/basic_template.html
@@ -4,8 +4,8 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">{% compress css %}
 <link href="{% static 'fontawesomefree/css/all.min.css' %}" rel="stylesheet" type="text/css">
-<!--  <link rel="stylesheet" href="{% static 'wireframe.css' %}">-->
-<link rel="stylesheet" type="text/x-scss" href="{% static 'wireframe.scss' %}" />{% endcompress %}
+<link rel="stylesheet" type="text/x-scss" href="{% static 'wireframe.scss' %}" />
+{% block 'extra_css' %}{% endblock %}{% endcompress %}
 <link rel="icon" href="{% static 'includes/' %}{{favicon}}">
 <title>Edu.apps</title>
 </head>
diff --git a/quiz_atomes/static/quiz_atomes/nav_padding.css b/quiz_atomes/static/quiz_atomes/nav_padding.css
new file mode 100644
index 0000000..5e3ea3a
--- /dev/null
+++ b/quiz_atomes/static/quiz_atomes/nav_padding.css
@@ -0,0 +1 @@
+body { padding-top: 70px; }
diff --git a/quiz_atomes/templates/quiz_atomes/quiz_atomes.html b/quiz_atomes/templates/quiz_atomes/quiz_atomes.html
index 7583078..a66953c 100644
--- a/quiz_atomes/templates/quiz_atomes/quiz_atomes.html
+++ b/quiz_atomes/templates/quiz_atomes/quiz_atomes.html
@@ -1,13 +1,15 @@
-{% extends 'basic_template.html' %}{% block 'body' %}
-  <nav class="navbar navbar-light">
+{% extends 'basic_template.html' %}{% block 'extra_css' %}{% load static %}
+<link href="{% static '/quiz_atomes/nav_padding.css' %}" rel="stylesheet" type="text/css">
+{% endblock %}{% block 'body' %}
+  <nav class="navbar navbar-light fixed-top bg-light">
     <div class="container"> 
       <a class="navbar-brand text-primary" href="{% url "home" %}">
       	<i class="fa fa-home"></i>
       </a> 
-      <div class="navbar-brand text-primary">  
-        <b>{{pseudo}}</b>
+      <div class="navbar-brand">  
+	<time>00m 00s</time>
       </div>
-       <a class="navbar-brand text-primary" href="{% url "settings" %}">
+      <a class="navbar-brand text-primary" href="{% url "settings" %}">
       	<i class="fa fa-gear"></i>
       </a>
     </div>
@@ -33,4 +35,37 @@
 	  </tbody>
 	</table>
 	</form>
-  </div>{% endblock %}
+  </div>{% endblock %}{% block 'extra_scripts' %}{% load static %}
+  <script>
+	var chrono = document.getElementsByTagName('time')[0];
+	var sec = 0;
+	var min = 0;
+	var t;
+
+	function tick(){
+	    sec++;
+	    if (sec >= 60) {
+		sec = 0;
+		min++;
+		if (min >= 60) {
+		    min = 0;
+		}
+	    }
+	}
+	function add() {
+	    tick();
+	    chrono.textContent = (min > 9 ? min : "0" + min)
+	       		 + "m " + (sec > 9 ? sec : "0" + sec) +"s";
+	    timer();
+	}
+	function timer() {
+	    t = setTimeout(add, 1000);
+	}
+
+	timer();
+
+	$(document).ready(function() {
+	    timer;
+	});
+  </script>
+  {% endblock %}
diff --git a/quiz_atomes/templates/quiz_atomes/scores.html b/quiz_atomes/templates/quiz_atomes/scores.html
index fe10152..e7380aa 100644
--- a/quiz_atomes/templates/quiz_atomes/scores.html
+++ b/quiz_atomes/templates/quiz_atomes/scores.html
@@ -6,7 +6,8 @@
       </a> 
     </div>
   </nav>
-  <div class="d-flex justify-content-center align-items-center">
+  <div class="d-flex flex-column justify-content-center align-items-center">
+	<h3><b>Tableau des meilleurs scores</b></h3>
 	<table class="table table-striped w-auto table-responsive-lg">
 	  <thead>
 	    <tr>
diff --git a/quiz_atomes/templates/quiz_atomes/settings.html b/quiz_atomes/templates/quiz_atomes/settings.html
index 7e2cd5d..d93b8f9 100644
--- a/quiz_atomes/templates/quiz_atomes/settings.html
+++ b/quiz_atomes/templates/quiz_atomes/settings.html
@@ -5,18 +5,17 @@
       </a>
     </div>
   </nav>
-  <div class="d-flex justify-content-center align-items-center">
-      <div class="py-2 d-flex flex-column align-items-center">
-        <h2><b>Paramètres du quiz</b></h2>
-        <form action="{% url "settings" %}" method="POST" name="settings">{% csrf_token %}
-        <table class="table w-auto table-responsive-lg">
-        	<tr>
-        		<td>NOM :</td>
-        		<td><input id="nom" name="nom" maxlength="20"></td>
+  <div class="d-flex flex-column justify-content-center align-items-center">
+	<h3><b>Paramètres du quiz</b></h3>
+	<form action="{% url "settings" %}" method="POST" name="settings">{% csrf_token %}
+	<table class="table w-auto table-responsive-lg">
+		<tr>
+			<td>NOM :</td>
+			<td><input id="nom" name="nom" maxlength="20"></td>
 		</tr>
-        	<tr>
-        		<td>Prénom :</td>
-        		<td><input id="prenom" name="prenom" maxlength="20"></td>
+		<tr>
+			<td>Prénom :</td>
+			<td><input id="prenom" name="prenom" maxlength="20"></td>
 		</tr>
 		<tr>
 			<td>Nombre<br/>d'atomes :</td>
@@ -42,7 +41,6 @@
 		<tr>
 			<td colspan="2"><input type="submit" value="OK"></td>
 		</tr>	
-        </table>
-        </form>
-      </div>
+	</table>
+	</form>
   </div>{% endblock %}
diff --git a/quiz_atomes/views.py b/quiz_atomes/views.py
index 14ff2a8..320326d 100644
--- a/quiz_atomes/views.py
+++ b/quiz_atomes/views.py
@@ -56,7 +56,7 @@ def quiz_atomes(request):
 def resultats(request):
     	
     points = 0
-    dt = round(time.time()-request.session['time'])*-1
+    dt = round(time.time()-request.session['time']-1)*-1
     
     for i in range(int(request.session['difficulte'])):
 	    if request.POST.get('input'+str(i+1)).casefold()==request.session['quiz'][i].casefold():