nathan.boileau
/
Scripted
0
3
Fork 0
Code Issues 9 Pull Requests Packages Projects 1 Releases Wiki Activity

Merge branch 'master' of https://codefirst.iut.uca.fr/git/nathan.boileau/Scripted
continuous-integration/drone/push Build is failing Details

Browse Source
ServeurDeTest
nathan boileau 2 years ago
parent a113854bd0 190cd33302
commit 581e237628
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File

5
Model/UserModel.php
Unescape View File

@ -130,9 +130,12 @@ class UserModel
if ($leClassement[0] == 0){ if ($leClassement[0] == 0){
$classement = 1; $classement = 1;
} }
else{ else if ($leClassement[$playerNumberPerGame] != null){
$classement = 3; $classement = 3;
} }
else {
$classement = 2;
}
// if ($result == 0){ // if ($result == 0){
// $classement = 1; // $classement = 1;
// } // }

2
View/src/JS/base.js
Unescape View File

@ -132,7 +132,7 @@ function displayHelp() {
function saveCode() { function saveCode() {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
// xhr.open('POST', 'http://localhost/Scripted/WEB/index.php?action=saveCode', true); // xhr.open('POST', 'http://localhost/Scripted/WEB/index.php?action=saveCode', true);
xhr.open('POST', 'http://82.165.180.114/Scripted/WEB/index.php?action=saveCode', true); xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=saveCode', true);
xhr.responseType = 'text'; xhr.responseType = 'text';
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xhr.onload = function () { xhr.onload = function () {

2
View/src/JS/baseTest.js
Unescape View File

@ -132,7 +132,7 @@ function run() {
function saveCode() { function saveCode() {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
// xhr.open('POST', 'http://localhost/Scripted/WEB/index.php?action=saveCodeInCookie', true); // xhr.open('POST', 'http://localhost/Scripted/WEB/index.php?action=saveCodeInCookie', true);
xhr.open('POST', 'http://82.165.180.114/Scripted/WEB/index.php?action=saveCodeInCookie', true); xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=saveCodeInCookie', true);
xhr.responseType = 'text'; xhr.responseType = 'text';
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xhr.onload = function () { xhr.onload = function () {

4
View/src/pages/Multijoueur/FileAttente.php
Unescape View File

@ -70,13 +70,13 @@
function checkIsReady() { function checkIsReady() {
console.log("checkIsReady"); console.log("checkIsReady");
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('POST', 'http://82.165.180.114/Scripted/WEB/index.php?action=waiting', true); xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=waiting', true);
xhr.responseType = 'text'; xhr.responseType = 'text';
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xhr.onload = function () { xhr.onload = function () {
console.log(xhr.responseText); console.log(xhr.responseText);
if (xhr.responseText == "1") { if (xhr.responseText == "1") {
window.location.href = 'http://82.165.180.114/Scripted/WEB/index.php?action=goToGame&idPartie=' + <?php echo $_SESSION['idPartie'] ?> + '&index=1' window.location.href = 'http://82.165.180.114/Scripted/index.php?action=goToGame&idPartie=' + <?php echo $_SESSION['idPartie'] ?> + '&index=1'
} }
}; };
xhr.send(null); xhr.send(null);

6
View/src/pages/Multijoueur/LobbyEnd.php
Unescape View File

@ -34,12 +34,12 @@
<script> <script>
function checkIsEnd() { function checkIsEnd() {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('POST', 'http://82.165.180.114/Scripted/WEB/index.php?action=getGameEtat', true); xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=getGameEtat', true);
xhr.responseType = 'text'; xhr.responseType = 'text';
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xhr.onload = function () { xhr.onload = function () {
if (xhr.responseText == "2") { if (xhr.responseText == "2") {
window.location.href = 'http://82.165.180.114/Scripted/WEB/index.php?action=endGame' window.location.href = 'http://82.165.180.114/Scripted/index.php?action=endGame'
} }
}; };
xhr.send(null); xhr.send(null);
@ -59,7 +59,7 @@
document.getElementById('countdown').innerHTML = hours + " heures " + minutes + " minutes " + remainingSeconds + " secondes"; document.getElementById('countdown').innerHTML = hours + " heures " + minutes + " minutes " + remainingSeconds + " secondes";
if (seconds == 0) { if (seconds == 0) {
clearInterval(countdown); clearInterval(countdown);
window.location.href = 'http://82.165.180.114/Scripted/WEB/index.php?action=endGame' window.location.href = 'http://82.165.180.114/Scripted/index.php?action=endGame'
} else { } else {
seconds--; seconds--;
} }

4
View/src/pages/Multijoueur/Partie.php
Unescape View File

@ -178,7 +178,7 @@
var enigmeId = '<?php echo $enigme->getIdEnigme(); ?>'; var enigmeId = '<?php echo $enigme->getIdEnigme(); ?>';
console.log("[Savecode]index : " + index, "[Savecode]enigmeId : " + enigmeId); console.log("[Savecode]index : " + index, "[Savecode]enigmeId : " + enigmeId);
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('POST', 'http://82.165.180.114/Scripted/WEB/index.php?action=saveCodeMulti', true); xhr.open('POST', 'http://82.165.180.114/Scripted/index.php?action=saveCodeMulti', true);
xhr.responseType = 'text'; xhr.responseType = 'text';
xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
xhr.onload = function () { xhr.onload = function () {
@ -203,7 +203,7 @@
document.getElementById('countdown').innerHTML = hours + " heures " + minutes + " minutes " + remainingSeconds + " secondes"; document.getElementById('countdown').innerHTML = hours + " heures " + minutes + " minutes " + remainingSeconds + " secondes";
if (seconds == 0) { if (seconds == 0) {
clearInterval(countdown); clearInterval(countdown);
window.location.href = 'http://82.165.180.114/Scripted/WEB/index.php?action=endGame' window.location.href = 'http://82.165.180.114/Scripted/index.php?action=endGame'
} else { } else {
seconds--; seconds--;
} }

Write Preview
Loading…
Cancel
Save