diff --git a/bdd.db b/bdd.db
deleted file mode 100755
index 3379a57..0000000
Binary files a/bdd.db and /dev/null differ
diff --git a/index.php b/index.php
deleted file mode 100755
index 90a6dae..0000000
--- a/index.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
- Roulette à eau
-
-
-
-
- query('SELECT * FROM Info');
-$res = $query -> fetchArray();
-var_dump($res);
-?>
-
-
-
-
-
-
-
-
-
diff --git a/script.js b/script.js
index b42d0ad..4220c0e 100755
--- a/script.js
+++ b/script.js
@@ -18,6 +18,7 @@ function draw_roulette(x, y, r, names){
text.setAttribute("y", text_coo[1]);
text.setAttribute("textLength", r/2);
text.setAttribute('text-anchor', 'middle');
+ text.setAttribute('alignment-baseline', 'middle');
text.setAttribute("font-size", r/5)
text.setAttribute("stroke-width", "1");
text.setAttribute("transform", "rotate("+(360)/nb_person*(i+0.5)+", "+center[0]+", "+center[1]+")");
@@ -31,31 +32,46 @@ function draw_roulette(x, y, r, names){
};
-function rotate(nb_person){
+function rotate(){
+ nb_person = names.length;
let winner = Math.random() * nb_person;
let angle = Math.floor(Math.random()*15)*360 - winner * 360/nb_person;
let result = new Promise((resolve, reject) => {
let i = 0;
let add = 0;
let interval = setInterval(() => {
- if (i >= angle){
- document.getElementById('roulette').style.transform = 'rotate('+angle+'deg)';
- clearInterval(interval);
- resolve(names[Math.floor(winner)]);
- }
- else {
- if (i > angle/2){
- add -= 1;
- }
- else{
- add += 1;
- }
- add = Math.abs(add);
- i += add;
- document.getElementById('roulette').style.transform = 'rotate('+i+'deg)';
- }
+ if (i >= angle){
+ document.getElementById('roulette').style.transform = 'rotate('+angle+'deg)';
+ clearInterval(interval);
+ resolve(names[Math.floor(winner)]);
+ }
+ else {
+ if (i > angle/2){
+ add -= 1;
+ }
+ else{
+ add += 1;
+ }
+ add = Math.abs(add);
+ i += add;
+ document.getElementById('roulette').style.transform = 'rotate('+i+'deg)';
+ }
}, 5);
});
- console.log(result);
- result.then((val) => console.log(val));
+ result.then((val) => show_winner(val));
};
+
+function show_winner(winner){
+ let h1 = document.getElementById('winner');
+ h1.innerText = winner;
+};
+
+function validateForm() {
+ let x = document.forms["myForm"]["fname"].value;
+ if (x == "") {
+ alert("Name must be filled out");
+ return false;
+ }
+ names.push(x);
+ draw_roulette(200,200,200, names);
+}