Compare commits

...

5 Commits

Author SHA1 Message Date
remi.biette 3a00f1bb99 Ajout commentaires 5 years ago
remi.biette a2ff64d3e1 correstion marges depotTrajet.css 5 years ago
remi.biette 86b329840a un peut de css et debug reservations 5 years ago
remi.biette 9b671fa476 Tout marche 5 years ago
remi.biette 38bd61a394 debug 5 years ago

@ -7,9 +7,9 @@ Page CSS : avis_laisses.css
body { body {
color:black; color:black;
background-color:white; background-color:white;
background-attachment: fixed;
background-image:url("../ressources/image/background.jpg"); background-image:url("../ressources/image/background.jpg");
background-repeat:no-repeat; background-size:cover;
background-size:100%;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }

@ -12,7 +12,7 @@ $mail = $_SESSION['mail'];
$login = getLogin($db,$mail); $login = getLogin($db,$mail);
$requete = "SELECT DISTINCT Utilisateur.login, Avis.commentaire, Avis.dateavis, Avis.note FROM Utilisateur, Avis, Trajet WHERE Avis.mailemetteur = $1 AND Avis.mailemetteur = Utilisateur.mail;"; $requete = "SELECT DISTINCT Avis.codetrajet, Utilisateur.login, Avis.commentaire, Avis.dateavis, Avis.note FROM Utilisateur, Avis, Trajet WHERE Avis.codetrajet = Trajet.codetrajet AND Avis.mailemetteur = $1 AND Trajet.mailproposition = Utilisateur.mail;";
$result = pg_query_params($db, $requete, array($mail)); $result = pg_query_params($db, $requete, array($mail));
?> ?>

@ -8,8 +8,8 @@ body {
color:black; color:black;
background-color:white; background-color:white;
background-image:url("../ressources/image/background.jpg"); background-image:url("../ressources/image/background.jpg");
background-repeat:no-repeat; background-attachment: fixed;
background-size:104%; background-size:cover;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }

@ -12,7 +12,7 @@ $mail = $_SESSION['mail'];
$login = getLogin($db, $mail); $login = getLogin($db, $mail);
$requete = "SELECT DISTINCT Utilisateur.login, Avis.commentaire, Avis.dateavis, Avis.note FROM Utilisateur, Avis, Trajet WHERE Avis.codetrajet = Trajet.codetrajet AND Trajet.mailproposition = $1 AND Trajet.mailproposition = Utilisateur.mail;"; $requete = "SELECT DISTINCT Avis.mailemetteur, Avis.codetrajet, Utilisateur.login, Avis.commentaire, Avis.dateavis, Avis.note FROM Utilisateur, Avis, Trajet WHERE Avis.codetrajet = Trajet.codetrajet AND Trajet.mailproposition = $1 AND Avis.mailemetteur = Utilisateur.mail;";
$result = pg_query_params($db, $requete, array($mail)); $result = pg_query_params($db, $requete, array($mail));
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
@ -37,6 +37,7 @@ $result = pg_query_params($db, $requete, array($mail));
<div id="avis"> <div id="avis">
<table> <table>
<?php while ($row = pg_fetch_array($result)) { <?php while ($row = pg_fetch_array($result)) {
pg_query_params($db, "UPDATE Avis SET estlu = true WHERE mailemetteur = $1 AND codetrajet = $2;", array($row['mailemetteur'], $row['codetrajet']));
$nom = $row['login']; $nom = $row['login'];
$date = $row['dateavis']; $date = $row['dateavis'];
$commentaire = $row['commentaire']; $commentaire = $row['commentaire'];

@ -6,6 +6,8 @@
body{ body{
background-image:url("../ressources/image/background.jpg"); background-image:url("../ressources/image/background.jpg");
background-attachment: fixed;
background-size: cover;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
flex-direction: row; flex-direction: row;
@ -52,10 +54,12 @@ h1{
} }
#formulaire{ #formulaire{
margin-top: 3em;
background-color: white; background-color: white;
border-radius: 10px; border-radius: 10px;
padding: 4em; padding: 4em;
width: 40%; width: 40%;
margin-bottom: 3em;
} }
.form{ .form{

@ -62,7 +62,6 @@ if (isset($_POST['dateDepart']) && isset($_POST['dateArrivee']) && isset($_POST[
<body> <body>
<script type="application/javascript" src="../ressources/libs/jquery-3.4.1.js"></script> <script type="application/javascript" src="../ressources/libs/jquery-3.4.1.js"></script>
<script type="application/javascript" src="../ressources/libs/jquery-ui.min.js"></script> <script type="application/javascript" src="../ressources/libs/jquery-ui.min.js"></script>
<script type="application/javascript" src="../ressources/libs/chosen.jquery.min.js"></script>
<?php require_once ("../ressources/navbarhtml.php"); ?> <?php require_once ("../ressources/navbarhtml.php"); ?>
<div id="formulaire"> <div id="formulaire">
<h1>Déposer un trajet</h1> <h1>Déposer un trajet</h1>

@ -2,8 +2,8 @@ body {
color:black; color:black;
background-color:white; background-color:white;
background-image:url("../ressources/image/background.jpg"); background-image:url("../ressources/image/background.jpg");
background-repeat:no-repeat; background-attachment: fixed;
background-size:104%; background-size:cover;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }

@ -1,5 +1,6 @@
<?php <?php
//Verifier qu'un avis n'a pas déja été envoyer avec le compte $mail pour le trajet $codetrajet
function checkAvis($db, $mail, $codetrajet) function checkAvis($db, $mail, $codetrajet)
{ {
$result = pg_query_params($db, "SELECT COUNT(*) FROM avis WHERE mailEmetteur = $1 AND codetrajet = $2;", array($mail, $codetrajet)); $result = pg_query_params($db, "SELECT COUNT(*) FROM avis WHERE mailEmetteur = $1 AND codetrajet = $2;", array($mail, $codetrajet));
@ -7,6 +8,7 @@ function checkAvis($db, $mail, $codetrajet)
return $row[0] == 0; return $row[0] == 0;
} }
//Verifier que le trajet à bien été fait par l'utilisateur $mail
function checkCodeTrajetAvis($db, $mail, $codetrajet) function checkCodeTrajetAvis($db, $mail, $codetrajet)
{ {
$result = pg_query_params($db, "SELECT COUNT(*) FROM trajet tr, reserver re WHERE tr.codetrajet = $1 AND tr.codetrajet = re.codetrajet AND re.mailutilisateur = $2;", array($codetrajet, $mail)); $result = pg_query_params($db, "SELECT COUNT(*) FROM trajet tr, reserver re WHERE tr.codetrajet = $1 AND tr.codetrajet = re.codetrajet AND re.mailutilisateur = $2;", array($codetrajet, $mail));
@ -30,6 +32,7 @@ if (isset($_POST['codetrajet']) && isset($_POST['avislaisse']) && isset($_POST['
$note = $_POST['note']; $note = $_POST['note'];
$codetrajet = intval($_POST['codetrajet']); $codetrajet = intval($_POST['codetrajet']);
$date = date('Y-m-d H:i:s'); $date = date('Y-m-d H:i:s');
//Verifier que l'utilisateur a bien participé au trajet et qu'il n'en a pas déjà poster un
if (checkAvis($db, $mail, $codetrajet) && checkCodeTrajetAvis($db, $mail, $codetrajet)) { if (checkAvis($db, $mail, $codetrajet) && checkCodeTrajetAvis($db, $mail, $codetrajet)) {
$requete = "INSERT INTO avis (mailemetteur, codetrajet, commentaire, dateavis, note, estlu) VALUES ($1,$2,$3,$4,$5, false);"; $requete = "INSERT INTO avis (mailemetteur, codetrajet, commentaire, dateavis, note, estlu) VALUES ($1,$2,$3,$4,$5, false);";
$envoi = pg_query_params($db, $requete, array($mail, $codetrajet, $avis, $date, $note)); $envoi = pg_query_params($db, $requete, array($mail, $codetrajet, $avis, $date, $note));

@ -10,6 +10,9 @@ html, body{
} }
body{ body{
background-image: url("ressources/image/background.jpg");
background-size: cover;
background-attachment: fixed;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
flex-direction: row; flex-direction: row;

@ -8,6 +8,7 @@ if(!isset($_SESSION['mail'])){
$mail = strtolower(htmlentities(pg_escape_string ($_POST['mail_field']))); $mail = strtolower(htmlentities(pg_escape_string ($_POST['mail_field'])));
$password = htmlentities(pg_escape_string($_POST['password'])); $password = htmlentities(pg_escape_string($_POST['password']));
//Vérification des information d'authentification
$result = authentification($db, $mail, $password); $result = authentification($db, $mail, $password);
if($result) { if($result) {
$_SESSION['mail'] = $mail; $_SESSION['mail'] = $mail;

@ -10,14 +10,17 @@ html, body{
} }
body{ body{
background-image:url("../ressources/image/background.jpg");
background-attachment: fixed;
background-size: cover;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center;
} }
#formulaire{ #formulaire{
margin-top: 3em;
background-color: white; background-color: white;
border-radius: 10px; border-radius: 10px;
padding: 4em; padding: 4em;

@ -3,61 +3,60 @@ session_start();
require_once('../connexionBD.php'); require_once('../connexionBD.php');
require_once('../ressources/user.php'); require_once('../ressources/user.php');
if (!isset($_SESSION['mail'])){ if (!isset($_SESSION['mail'])) {
if (isset($_POST['login']) || isset($_FILES['avatar'])){ if (isset($_POST['login']) || isset($_FILES['avatar'])) {
if (isset($_POST['login']) && isset($_POST['password']) && isset($_POST['confirmation']) && isset($_POST['prenom']) && isset($_POST['nom']) && isset($_POST['phone'])){ if (isset($_POST['login']) && isset($_POST['password']) && isset($_POST['confirmation']) && isset($_POST['prenom']) && isset($_POST['nom']) && isset($_POST['phone'])) {
$login = htmlentities(pg_escape_string($_POST['login'])); $login = htmlentities(pg_escape_string($_POST['login']));
$password = htmlentities(pg_escape_string($_POST['password'])); $password = htmlentities(pg_escape_string($_POST['password']));
$prenom = htmlentities(pg_escape_string($_POST['prenom'])); $prenom = htmlentities(pg_escape_string($_POST['prenom']));
$nom = htmlentities(pg_escape_string($_POST['nom'])); $nom = htmlentities(pg_escape_string($_POST['nom']));
$dateN = htmlentities(pg_escape_string($_POST['dateN'])); $dateN = htmlentities(pg_escape_string($_POST['dateN']));
$mail = strtolower(htmlentities(pg_escape_string($_POST['mail']))); $mail = strtolower(htmlentities(pg_escape_string($_POST['mail'])));
$phone = htmlentities(pg_escape_string($_POST['phone'])); $phone = htmlentities(pg_escape_string($_POST['phone']));
//Verifier que le format du mail est correct
if (!filter_var($mail, FILTER_VALIDATE_EMAIL)) {
header('Location: inscription.php?error=1');
exit();
} //Verifie qu'un compte n'a pas déjà été créé avec ce mail
elseif (!isMailUnique($db, $mail)) {
header('Location: inscription.php?error=2');
exit();
} //Verifie que le login entré est unique
elseif (!isLoginUnique($db, $login)) {
header('Location: inscription.php?error=3');
exit();
} else {
if (!filter_var($mail, FILTER_VALIDATE_EMAIL)){ if (isset($_FILES['avatar']) and !empty($_FILES['avatar']['name'])) {
header('Location: inscription.php?error=1'); $fic = $_FILES['avatar'];
exit(); //Charger l'avatar sur le serveur
} $res = uploadAvatar($mail, $fic);
elseif (!isMailUnique($db, $mail)){ switch ($res) {
header('Location: inscription.php?error=2'); case -1:
exit(); header('Location: inscription.php?error=4');
} exit();
elseif (!isLoginUnique($db, $login)){ case -2:
header('Location: inscription.php?error=3'); header('Location: inscription.php?error=5');
exit(); exit();
} case -3:
else { header('Location: inscription.php?error=6');
if (isset($_FILES['avatar']) and !empty($_FILES['avatar']['name'])) { exit();
$fic = $_FILES['avatar']; }
$res = uploadAvatar($mail, $fic); }
switch ($res){ $result = creerUtilisateur($db, $mail, $password, $prenom, $nom, $login, $phone, $dateN);
case -1: if ($result) {
header('Location: inscription.php?error=4'); header('Location: ../index.php');
exit(); exit();
case -2: } else {
header('Location: inscription.php?error=5'); header('Location: inscription.php?error=6');
exit(); exit();
case -3: }
header('Location: inscription.php?error=6'); }
exit();
} }
}
$result = creerUtilisateur($db, $mail, $password, $prenom, $nom, $login, $phone, $dateN);
if ($result) {
header('Location: ../index.php');
exit();
}
else{
header('Location: inscription.php?error=6');
exit();
}
} }
} } else {
} header('Location: ../tableauBord/tableauBord.php');
} exit();
else {
header('Location: ../tableauBord/tableauBord.php');
exit();
} }
?> ?>
<!DOCTYPE html> <!DOCTYPE html>

@ -2,8 +2,8 @@ body {
color:black; color:black;
background-color:white; background-color:white;
background-image:url("../ressources/image/background.jpg"); background-image:url("../ressources/image/background.jpg");
background-repeat:no-repeat; background-attachment: fixed;
background-size:104%; background-size:cover;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }

@ -36,16 +36,22 @@ require_once("../ressources/navbarhtml.php");
<div id="liste"> <div id="liste">
<table> <table>
<?php <?php
$result = pg_query_params($db, "SELECT * FROM Trajet Where mailproposition = $1 AND estannule = false;", array($mail)); $result = pg_query_params($db, "SELECT * FROM Trajet Where mailproposition = $1 AND estannule = false ORDER BY datedepart DESC;", array($mail));
while ($row = pg_fetch_array($result)) { while ($row = pg_fetch_array($result)) {
$login = getLogin($db, $mail); $login = getLogin($db, $mail);
$date_depart = $row['datedepart']; $date_depart = $row['datedepart'];
$codetrajet = $row['codetrajet']; $codetrajet = $row['codetrajet'];
$source = getDepart($db, $codetrajet); $source = getDepart($db, $codetrajet);
$dest = getFin($db, $codetrajet); $dest = getFin($db, $codetrajet);
$date = date('Y-m-d H:i:s');
echo "<tr><td class='ligne'><hr class='separation'/></td><td class='info'>"; echo "<tr><td class='ligne'><hr class='separation'/></td><td class='info'>";
echo "<p>$date_depart - $source vers $dest proposé par : $login</p></td>"; echo "<p>$date_depart - ".$source['nomville']." (".$source['codepostal'].") vers ".$dest['nomville']." (".$dest['codepostal'].") proposé par : $login</p></td>";
echo "<td><a href='annulerTrajet.php?codetrajet=$codetrajet'>Annuler le trajet</a></td>"; if ($date <= $row['datearrivee']){
echo "<td><a href='annulerTrajet.php?codetrajet=$codetrajet'>Annuler le trajet</a></td>";
}
else{
echo "<td class='info'><p>Trajet effectué</p></td>";
}
echo "</tr>"; echo "</tr>";
} }
?> ?>

@ -2,8 +2,8 @@ body {
color:black; color:black;
background-color:white; background-color:white;
background-image:url("../ressources/image/background.jpg"); background-image:url("../ressources/image/background.jpg");
background-repeat:no-repeat; background-attachment: fixed;
background-size:104%; background-size:cover;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }

@ -34,17 +34,26 @@ require_once("../ressources/navbarhtml.php");
<div id="liste"> <div id="liste">
<table> <table>
<?php <?php
$result = pg_query_params($db, "SELECT DISTINCT ut.login as login, tr.* FROM utilisateur ut, trajet tr, reserver re WHERE ut.mail = re.mailutilisateur AND re.codetrajet = tr.codetrajet AND re.mailutilisateur = $1 AND tr.estannule = false;", array($mail)); $result = pg_query_params($db, "SELECT DISTINCT ut.login as login, tr.* FROM utilisateur ut, trajet tr, reserver re WHERE ut.mail = re.mailutilisateur AND re.codetrajet = tr.codetrajet AND re.mailutilisateur = $1 AND tr.estannule = false ORDER BY datedepart DESC;", array($mail));
while ($row = pg_fetch_array($result)) { while ($row = pg_fetch_array($result)) {
$login = $row['login']; $login = $row['login'];
$date_depart = $row['datedepart']; $date_depart = $row['datedepart'];
$codetrajet = $row['codetrajet']; $codetrajet = $row['codetrajet'];
$source = getDepart($db, $codetrajet); $source = getDepart($db, $codetrajet);
$date = date('Y-m-d H:i:s');
$dest = getFin($db, $codetrajet); $dest = getFin($db, $codetrajet);
echo "<tr><td class='ligne'><hr class='separation'/></td>"; echo "<tr><td class='ligne'><hr class='separation'/></td>";
echo "<td class='info'><p>$date_depart - $source vers $dest proposé par : $login</p></td>"; echo "<td class='info'><p>$date_depart - ".$source['nomville']." (".$source['codepostal'].") vers ".$dest['nomville']." (".$dest['codepostal'].") proposé par : $login</p></td>";
echo "<td><a href='annulerReservation.php?codetrajet=$codetrajet'>Annuler la reservation</a></td>";
echo "<td><a href='../deposer_avis/deposer_avis.php?codetrajet=$codetrajet'>Déposer un avis</a></td>"; if ($date <= $row['datearrivee']){
echo "<td><a href='annulerReservation.php?codetrajet=$codetrajet'>Annuler la reservation</a></td>";
}
else{
echo "<td class='info'><p>Trajet effectué</p></td>";
}
if (!avisExiste($db, $mail, $codetrajet)){
echo "<td><a href='../deposer_avis/deposer_avis.php?codetrajet=$codetrajet'>Déposer un avis</a></td>";
}
echo "</tr>"; echo "</tr>";
} }
?> ?>

@ -2,8 +2,8 @@ body {
color:black; color:black;
background-color:white; background-color:white;
background-image:url("../ressources/image/background.jpg"); background-image:url("../ressources/image/background.jpg");
background-repeat:no-repeat; background-attachment: fixed;
background-size:104%; background-size:cover;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }

@ -9,23 +9,25 @@ if (!isset($_SESSION['mail'])) {
exit(); exit();
} }
$mail = $_SESSION['mail']; $mail = $_SESSION['mail'];
if (!(isset($_POST['lieu_depart']) && isset($_POST['lieu_arrivee']) && isset($_POST['date_heure']))){ if (!(isset($_POST['villeDepart']) && isset($_POST['villeArrive']) && isset($_POST['date_heure']))) {
header('Location: ../tableauBord/tableauBord.php'); header('Location: ../tableauBord/tableauBord.php');
exit(); exit();
} }
if (isset($_POST['lieu_depart']) && isset($_POST['lieu_arrivee']) && isset($_POST['date_heure'])) { $source = explode('%%', $_POST['villeDepart']);
$source = $_POST['lieu_depart']; $cpsource = $source[1];
$dest = $_POST['lieu_arrivee']; $source = $source[0];
$date_depart = $_POST['date_heure']; $dest = explode('%%', $_POST['villeArrive']);
if ($date_depart < date('Y-m-d')){ $cpdest = $dest[1];
echo "Erreur date</br>"; $dest = $dest[0];
echo "<a href='../tableauBord/tableauBord.php'>Retour vers le tableau de bord</a>"; $date_depart = $_POST['date_heure'];
exit(); if ($date_depart < date('Y-m-d')) {
} echo "Erreur date</br>";
echo "<a href='../tableauBord/tableauBord.php'>Retour vers le tableau de bord</a>";
exit();
} }
$result = pg_query_params($db, "(SELECT DISTINCT ut.login, ta.codetrajet, ta.datedepart FROM ville v, traverser tr, utilisateur ut, trajet ta WHERE DATE(ta.datedepart) = DATE($3) AND ta.estannule = false AND ta.codetrajet = tr.codetrajet AND ta.mailproposition = ut.mail AND tr.nomVille = v.nomVille AND tr.codepostal = v.codepostal AND tr.numeroetape = (SELECT MIN(numeroetape) FROM traverser WHERE LOWER(nomVille) = LOWER($1))) $result = pg_query_params($db, "(SELECT DISTINCT ut.login, ta.codetrajet, ta.datedepart FROM ville v, traverser tr, utilisateur ut, trajet ta WHERE DATE(ta.datedepart) = DATE($3) AND ta.estannule = false AND ta.codetrajet = tr.codetrajet AND ta.mailproposition = ut.mail AND tr.nomVille = v.nomVille AND tr.codepostal = v.codepostal AND tr.numeroetape = (SELECT MIN(numeroetape) FROM traverser WHERE LOWER(nomVille) = LOWER($1) AND codepostal = $4))
INTERSECT (SELECT DISTINCT ut.login, ta.codetrajet, ta.datedepart FROM ville v, traverser tr, utilisateur ut, trajet ta WHERE DATE(ta.datedepart) = DATE($3) AND ta.estannule = false AND ta.codetrajet = tr.codetrajet AND ta.mailproposition = ut.mail AND tr.nomVille = v.nomVille AND tr.codepostal = v.codepostal AND tr.numeroetape = (SELECT MAX(numeroetape) FROM traverser WHERE LOWER(nomVille) = LOWER($2)));", array($source, $dest, $date_depart)); INTERSECT (SELECT DISTINCT ut.login, ta.codetrajet, ta.datedepart FROM ville v, traverser tr, utilisateur ut, trajet ta WHERE DATE(ta.datedepart) = DATE($3) AND ta.estannule = false AND ta.codetrajet = tr.codetrajet AND ta.mailproposition = ut.mail AND tr.nomVille = v.nomVille AND LOWER(v.nomville) = LOWER($2) AND v.codepostal = $5 AND tr.codepostal = v.codepostal AND tr.numeroetape != 1);", array($source, $dest, $date_depart, $cpsource, $cpdest));
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
@ -47,7 +49,7 @@ require_once("../ressources/navbarhtml.php");
alt="Bouton retour"></a> alt="Bouton retour"></a>
<h1 class="float" id="titre">Liste des trajets</h1> <h1 class="float" id="titre">Liste des trajets</h1>
<br> <br>
<h2>Trajets recherchés : <?php echo $source . " vers " . $dest; ?></h2> <h2>Trajets recherchés : <?php echo "$source ($cpsource) vers $dest ($cpdest)"; ?></h2>
</div> </div>
<div id="liste"> <div id="liste">
<table> <table>
@ -58,9 +60,9 @@ require_once("../ressources/navbarhtml.php");
$source = getDepart($db, $codetrajet); $source = getDepart($db, $codetrajet);
$dest = getFin($db, $codetrajet); $dest = getFin($db, $codetrajet);
$date_depart = $row['datedepart']; $date_depart = $row['datedepart'];
if (checkPlacesVoiture($db, $codetrajet) && $date_depart >= date('Y-m-d H:i:s')){ if (checkPlacesVoiture($db, $codetrajet) && $date_depart >= date('Y-m-d H:i:s')) {
echo "<tr><td class='ligne'><hr class='separation'/></td><td class='info'>"; echo "<tr><td class='ligne'><hr class='separation'/></td><td class='info'>";
echo "<p>$date_depart - $source vers $dest proposé par : $login</p></td>"; echo "<p>$date_depart - ".$source['nomvile']." (".$source['codepostal'].") vers ".$dest['nomvile']." (".$dest['codepostal'].") proposé par : $login</p></td>";
echo "<td><a href='reserver.php?codetrajet=$codetrajet'>Réserver</a></td>"; echo "<td><a href='reserver.php?codetrajet=$codetrajet'>Réserver</a></td>";
echo "</tr>"; echo "</tr>";
} }

@ -5,7 +5,11 @@ function verifierTrajet($db, $mail, $codetrajet){
if (!$trajet){ if (!$trajet){
return false; return false;
} }
return checkReservations($db, $mail, $codetrajet) && checkDatesReserve($db, $mail, $trajet['datedepart']) && checkPlacesVoiture($db, $codetrajet) && strcmp($trajet['mailproposition'], $mail) != 0; $trajet = pg_fetch_array($trajet);
if (strcmp($mail, $trajet['mailproposition']) == 0){
return false;
}
return checkReservations($db, $mail, $codetrajet) && checkPlacesVoiture($db, $codetrajet);
} }
require_once("../connexionBD.php"); require_once("../connexionBD.php");
@ -19,12 +23,15 @@ $mail = $_SESSION['mail'];
if (isset($_GET['codetrajet'])){ if (isset($_GET['codetrajet'])){
$codetrajet = $_GET['codetrajet']; $codetrajet = $_GET['codetrajet'];
if (verifierTrajet($db, $mail, $codetrajet)){ if (verifierTrajet($db, $mail, $codetrajet) && reserver($db, $mail, $codetrajet)){
reserver($db, $mail, $codetrajet); header('Location: ../tableauBord/tableauBord.php');
exit();
}
else{
header('Location: ../recherche/recherche.php?error=1');
exit();
} }
} }
header('Location: ../tableauBord/tableauBord.php');
exit();

@ -42,13 +42,13 @@ html, body{
} }
body{ body{
background-attachment: fixed;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
background-image: url("../ressources/image/background.jpg"); background-image: url("../ressources/image/background.jpg");
background-size : cover; background-size : cover;
background-position: center, center;
} }
#formulaire{ #formulaire{

@ -58,7 +58,7 @@ if (isset($_POST['login']) || isset($_FILES['avatar'])){
$prenom = htmlentities(pg_escape_string($_POST['prenom'])); $prenom = htmlentities(pg_escape_string($_POST['prenom']));
$nom = htmlentities(pg_escape_string($_POST['nom'])); $nom = htmlentities(pg_escape_string($_POST['nom']));
$phone = htmlentities(pg_escape_string($_POST['phone'])); $phone = htmlentities(pg_escape_string($_POST['phone']));
//Si le login a change on le modifie
if (loginChange($user, $login)) { if (loginChange($user, $login)) {
if (!isLoginUniqueModifier($db, $mail, $login)) { if (!isLoginUniqueModifier($db, $mail, $login)) {
header('Location: profil.php?error=1'); header('Location: profil.php?error=1');
@ -75,7 +75,7 @@ if (isset($_POST['login']) || isset($_FILES['avatar'])){
header('Location: profil.php?error=2'); header('Location: profil.php?error=2');
exit(); exit();
} }
//Modifier l'utilisateur et afficher un message d'erreur si erreur
if (!modifierUtilisateur($db, $mail, $prenom, $nom, $password, $phone)) { if (!modifierUtilisateur($db, $mail, $prenom, $nom, $password, $phone)) {
header('Location: profil.php?error=6'); header('Location: profil.php?error=6');
exit(); exit();
@ -170,7 +170,11 @@ if (isset($_POST['login']) || isset($_FILES['avatar'])){
<label for="avatar">Image du Profil :</label> <label for="avatar">Image du Profil :</label>
<input type="file" id="avatar" class="form" name="avatar" accept="image/png, image/jpeg"> <input type="file" id="avatar" class="form" name="avatar" accept="image/png, image/jpeg">
</div> </div>
<?php getErrorProfil($_GET['error']); ?> <?php
if (isset($_GET['error'])){
echo "<p class='error'>".getErrorProfil($_GET['error'])."</p>";
}
?>
<input id="submit" class="button" type="submit" value="Modifier"> <input id="submit" class="button" type="submit" value="Modifier">
</form> </form>
</div> </div>

@ -1,40 +1,91 @@
.centrage { *{
text-align: center; font-family: "Arial";
font-size: 20px; padding: 0;
margin: 0;
} }
.global { body{
background-attachment: fixed;
background-image:url("../ressources/image/background.jpg");
background-size: cover;
display: flex;
justify-content: center;
flex-direction: column;
}
#container{
margin-top: 3em;
display: flex;
justify-content: center;
}
h1{
font-size: 2em;
text-align: center; text-align: center;
margin-bottom: 3em;
}
.villeSelect, .villeText{
box-sizing: border-box;
margin-bottom: 0.7em;
} }
br { .villeText{
line-height: 50px; width: 20%;
} }
body { .villeSelect{
color: black; margin-bottom: 0.7em;
background-color: white; margin-left: 2%;
background-image: url("../ressources/image/background.jpg"); width: 33%;
background-repeat: no-repeat;
background-size: 104%;
margin: 0;
} }
#container { #submit{
margin: 5% 15% 2% 15%; margin-top: 1em;
margin-left: 50%;
transform: translate(-50%);
}
#formulaire{
background-color: white; background-color: white;
border: 2px solid black; border-radius: 10px;
padding: 4em;
width: 40%;
} }
h1 { .form{
text-align: center; box-sizing: border-box;
font-size: 250%; width: 55%;
margin-bottom: 0.7em;
} }
#form { .button{
text-align: center; cursor: pointer;
font-weight: bold;
padding: 8px;
color: white;
background-color: rgb(65, 154, 28);
border-radius: 5em;
border: none;
}
.line{
display: flex;
flex-wrap: wrap;
flex-direction: row;
justify-content: left;
width: 100%;
} }
.error{
margin-top: 1em;
color: red;
text-align: center;
}
.label{
box-sizing: border-box;
font-size: 1.1em;
width: 45%;
min-width: 8em;
}

@ -0,0 +1,23 @@
$(document).ready(function () {
//Copier les options
let options = $('#villeDepart option').clone();
$('#villeDepartText').keyup(function () {
let val = $(this).val().toString().toLowerCase();
$('#villeDepart').empty();
//Récuperer les option filtrées ou toutes les options si vide
options.filter(function (idx, el) {
return val === '' || $(el).text().toLowerCase().indexOf(val) >= 0;
}).appendTo('#villeDepart');//ajouter à la liste
});
//Copier les options
let optionsArrive = $('#villeArrive option').clone();
$('#villeArriveText').keyup(function () {
let val = $(this).val().toString().toLowerCase();
$('#villeArrive').empty();
//Récuperer les option filtrées ou toutes les options si vide
optionsArrive.filter(function (idx, el) {
return val === '' || $(el).text().toLowerCase().indexOf(val) >= 0;
}).appendTo('#villeArrive');//ajouter à la liste
});
});

@ -1,6 +1,16 @@
<?php <?php
function getError($code)
{
switch ($code) {
case 1:
return "Impossible de réserver ce trajet";
}
}
session_start(); session_start();
require_once('../ressources/verifconnecte.php'); require_once('../ressources/verifconnecte.php');
require_once('../ressources/trajet.php');
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
@ -17,38 +27,44 @@ require_once('../ressources/verifconnecte.php');
require_once("../ressources/navbarhtml.php"); require_once("../ressources/navbarhtml.php");
?> ?>
<div id="container"> <div id="container">
<div id="entete"> <div id="formulaire">
<h1>Rechercher trajet</h1><br/> <h1>Rechercher trajet</h1>
</div>
<div class="global bord">
<form method="post" action="../liste_trajets/liste_trajet.php"> <form method="post" action="../liste_trajets/liste_trajet.php">
<div class="line">
<label> <label class="label" for="villeDepart">Ville de départ : </label>
<input name="lieu_depart" type="text" placeholder="Lieu de départ" class="centrage" required> <input type="text" class="form, villeText" name="villeDepartText" id="villeDepartText">
<br/> <select class="form, villeSelect" name="villeDepart" id="villeDepart" required>
<br/> <option selected></option>
</label> <?php afficherVilles($db); ?>
</select>
<label> </div>
<input name="lieu_arrivee" type="text" placeholder="Lieu d'arrivée" class="centrage" required> <div id="villeEtapeDiv" class="line">
<br/> <label class="label" for="villeArrive">Etape : </label>
<br/> <input type="text" class="form, villeText" id="villeArriveText" name="villeArriveText">
</label> <select class="form, villeSelect" name="villeArrive" id="villeArrive" required>
<option selected></option>
<label> <?php afficherVilles($db); ?>
<input name="date_heure" type="date" placeholder="Date et heure de départ" class="centrage" </select>
</div>
<div class="line">
<label class="label" for="date">Date départ : </label>
<input id="date" class="form" name="date_heure" type="date" placeholder="Date et heure de départ" class="centrage"
required> required>
<br/> </div>
</label>
<br/> <br/>
<label> <label>
<input id="submit" name="submit" type="submit" value="Rechercher" class="centrage"> <input id="submit" class="button" name="submit" type="submit" value="Rechercher" required>
</label> </label>
</form> </form>
<?php
if (isset($_GET['error'])) {
echo "<p class='error'>" . getError($_GET['error']) . "</p>";
}
?>
</div> </div>
</div> </div>
</div>
</body> </body>
<script type="application/javascript" src="../ressources/libs/jquery-3.4.1.js"></script>
<script type="application/javascript" src="../ressources/libs/jquery-ui.min.js"></script>
<script src="recherche.js"></script>
</html> </html>

@ -7,7 +7,7 @@ function getListeVilles($db)
} }
function reserver($db, $mail, $codetrajet){ function reserver($db, $mail, $codetrajet){
return pg_query_params($db, "INSERT INTO Reserver VALUES ($1, $2, $3);", array($mail, $codetrajet, date('Y-m-d H:i:s'))); return pg_query_params($db, "INSERT INTO Reserver VALUES ($1, $2, false, $3);", array($mail, $codetrajet, date('Y-m-d H:i:s')));
} }
function getTrajet($db, $codetrajet) function getTrajet($db, $codetrajet)
@ -37,12 +37,18 @@ function creerEtapes($db, $codeTrajet, $etapes)
//Vérifier la cohérence des dates //Vérifier la cohérence des dates
function checkDates($db, $mail, $dateDepart, $dateArrivee) function checkDates($db, $mail, $dateDepart, $dateArrivee)
{ {
$valide = $dateDepart < $dateArrivee && $dateDepart > date('Y-m-d H:i:s'); $valide = $dateDepart <= $dateArrivee && $dateDepart >= date('Y-m-d H:i:s');
$result = pg_query_params($db, "SELECT COUNT(*) From Trajet WHERE mailproposition = $1 AND $2 BETWEEN datedepart AND datearrivee;", array($mail, $dateDepart)); $result = pg_query_params($db, "SELECT COUNT(*) From Trajet WHERE mailproposition = $1 AND estannule = false AND $2 BETWEEN datedepart AND datearrivee;", array($mail, $dateDepart));
$row = pg_fetch_array($result); $row = pg_fetch_array($result);
return $row[0] == 0 && $valide; return $row[0] == 0 && $valide;
} }
//Récupérer les étapes d'un trajet
function getEtapesTrajet($db, $codetrajet){
$result = pg_query_params($db, "SELECT * FROM Traverser WHERE codetrajet = $1 ;", array($codetrajet));
return $result;
}
//Vérifier le nombre de places restantes //Vérifier le nombre de places restantes
function checkPlacesVoiture($db, $codetrajet) function checkPlacesVoiture($db, $codetrajet)
{ {
@ -80,9 +86,10 @@ function checkVoiture($db, $mail, $matricule)
return !strcmp($matricule, $row[0]); return !strcmp($matricule, $row[0]);
} }
//Recuperer le nombre de trajets restant proposés par l'utilisateur $mail
function getTrajetsProposes($db, $mail) function getTrajetsProposes($db, $mail)
{ {
$result = pg_query_params($db, "SELECT COUNT(*) from Trajet WHERE mailProposition = $1 AND estAnnule = false AND datedepart >= current_date;", array($mail)); $result = pg_query_params($db, "SELECT COUNT(*) from Trajet WHERE mailProposition = $1 AND estAnnule = false AND datedepart >= $2;", array($mail, date('Y-m-d H:i:s')));
if ($result) { if ($result) {
$row = pg_fetch_array($result); $row = pg_fetch_array($result);
return $row[0]; return $row[0];
@ -90,9 +97,10 @@ function getTrajetsProposes($db, $mail)
return 0; return 0;
} }
//Recuperer le nombre de trajets restant reservés par l'utilisateur $mail
function getTrajetsReserves($db, $mail) function getTrajetsReserves($db, $mail)
{ {
$result = pg_query_params($db, "SELECT COUNT(*) FROM trajet tr, reserver re WHERE re.codetrajet = tr.codetrajet AND mailutilisateur = $1 AND estAnnule = false AND datedepart >= current_date;", array($mail)); $result = pg_query_params($db, "SELECT COUNT(*) FROM trajet tr, reserver re WHERE re.codetrajet = tr.codetrajet AND mailutilisateur = $1 AND tr.estannule = false AND re.estannule = false AND tr.datedepart >= $2;", array($mail, date('Y-m-d H:i:s')));
if ($result) { if ($result) {
$row = pg_fetch_array($result); $row = pg_fetch_array($result);
return $row[0]; return $row[0];
@ -150,31 +158,35 @@ function afficherVilles($db)
} }
} }
//Récuperer la ville de départ du trajet $codetrajet
function getDepart($db, $codetajet) function getDepart($db, $codetajet)
{ {
$result = pg_query_params($db, "SELECT v.nomVille FROM ville v, traverser tr WHERE tr.nomVille = v.nomVille AND tr.codepostal = v.codepostal AND tr.codetrajet = $1 AND tr.numeroetape = (SELECT MIN(numeroetape) FROM traverser WHERE codetrajet = $1);", array($codetajet)); $result = pg_query_params($db, "SELECT * FROM ville v, traverser tr WHERE tr.nomVille = v.nomVille AND tr.codepostal = v.codepostal AND tr.codetrajet = $1 AND tr.numeroetape = (SELECT MIN(numeroetape) FROM traverser WHERE codetrajet = $1);", array($codetajet));
$return = false; $return = false;
if ($result) { if ($result) {
$return = pg_fetch_array($result)[0]; $return = pg_fetch_array($result);
} }
return $return; return $return;
} }
//Récuperer la ville d'arrivée du trajet $codetrajet
function getFin($db, $codetajet) function getFin($db, $codetajet)
{ {
$result = pg_query_params($db, "SELECT v.nomVille FROM ville v, traverser tr WHERE tr.nomVille = v.nomVille AND tr.codepostal = v.codepostal AND tr.codetrajet = $1 AND tr.numeroetape = (SELECT MAX(numeroetape) FROM traverser WHERE codetrajet = $1);", array($codetajet)); $result = pg_query_params($db, "SELECT * FROM ville v, traverser tr WHERE tr.nomVille = v.nomVille AND tr.codepostal = v.codepostal AND tr.codetrajet = $1 AND tr.numeroetape = (SELECT MAX(numeroetape) FROM traverser WHERE codetrajet = $1);", array($codetajet));
$return = false; $return = false;
if ($result) { if ($result) {
$return = pg_fetch_array($result)[0]; $return = pg_fetch_array($result);
} }
return $return; return $return;
} }
//Annuler le trajet $codetrajet
function annulerTrajet($db, $codetrajet){ function annulerTrajet($db, $codetrajet){
$result = pg_query_params($db, "UPDATE Trajet SET estannule = true WHERE codetrajet = $1;", array($codetrajet)); $result = pg_query_params($db, "UPDATE Trajet SET estannule = true WHERE codetrajet = $1;", array($codetrajet));
return $result; return $result;
} }
//Annuler la reservation pour le tajet $codetrajet de l'utilisateur $mail
function annulerReservation($db, $mail,$codetrajet){ function annulerReservation($db, $mail,$codetrajet){
$result = pg_query_params($db, "DELETE FROM reserver WHERE codetrajet = $1 AND mailutilisateur = $2;", array($codetrajet, $mail)); $result = pg_query_params($db, "DELETE FROM reserver WHERE codetrajet = $1 AND mailutilisateur = $2;", array($codetrajet, $mail));
return $result; return $result;
@ -194,4 +206,13 @@ function getErrorDepotTrajet($code)
} }
} }
//Verifie l'existance d'un avis pour le trajet $codetrajet émit par l'utilisateur $mail
function avisExiste($db, $mail, $codetrajet){
$result = pg_query_params($db, "SELECT COUNT(*) FROM Avis WHERE mailemetteur = $1 AND codetrajet = $2;", array($mail, $codetrajet));
if(!$result){
return false;
}
return pg_fetch_array($result)[0] != 0;
}
?> ?>

@ -111,6 +111,7 @@ function getLogin($db, $mail)
function getPathImgProfilTableau($mail) function getPathImgProfilTableau($mail)
{ {
//Récuperer le fichier contenant $mail dans son nom
$list = scandir("../imageProfil"); $list = scandir("../imageProfil");
foreach ($list as $entry) { foreach ($list as $entry) {
if (strpos($entry, $mail) !== false) { if (strpos($entry, $mail) !== false) {
@ -122,6 +123,7 @@ function getPathImgProfilTableau($mail)
function getPathImgProfil($mail) function getPathImgProfil($mail)
{ {
//Récuperer le fichier contenant $mail dans son nom
$list = scandir("../imageProfil"); $list = scandir("../imageProfil");
foreach ($list as $entry) { foreach ($list as $entry) {
if (strpos($entry, $mail) !== false) { if (strpos($entry, $mail) !== false) {
@ -133,6 +135,7 @@ function getPathImgProfil($mail)
function supprimerAvatar($mail) function supprimerAvatar($mail)
{ {
//Supprimer le fichier contenant $mail dans son nom
$list = scandir("../imageProfil"); $list = scandir("../imageProfil");
foreach ($list as $entry) { foreach ($list as $entry) {
if (strpos($entry, $mail) !== false) { if (strpos($entry, $mail) !== false) {
@ -188,6 +191,7 @@ function uploadAvatar($mail, $fic)
function deluser($db, $delmail) function deluser($db, $delmail)
{ {
//Remplacer le mail de l'utilisateur à supprimer par l'utilisateur utilisateur_supprime@local
$requete = "UPDATE trajet SET mailproposition = $1 WHERE mailproposition = $2;"; $requete = "UPDATE trajet SET mailproposition = $1 WHERE mailproposition = $2;";
$result1 = pg_query_params($db, $requete, array('utilisateur_supprime@local', $delmail)); $result1 = pg_query_params($db, $requete, array('utilisateur_supprime@local', $delmail));
$requete = "UPDATE reserver SET mailutilisateur = $1 WHERE mailutilisateur = $2;"; $requete = "UPDATE reserver SET mailutilisateur = $1 WHERE mailutilisateur = $2;";
@ -196,6 +200,7 @@ function deluser($db, $delmail)
$result3 = pg_query_params($db, $requete, array($delmail)); $result3 = pg_query_params($db, $requete, array($delmail));
$requete = "UPDATE voiture SET mail = $1 WHERE mail = $2;"; $requete = "UPDATE voiture SET mail = $1 WHERE mail = $2;";
$result4 = pg_query_params($db, $requete, array('utilisateur_supprime@local', $delmail)); $result4 = pg_query_params($db, $requete, array('utilisateur_supprime@local', $delmail));
//Supprimer l'utilisateur $mail
$requete = "DELETE FROM utilisateur WHERE mail = $1;"; $requete = "DELETE FROM utilisateur WHERE mail = $1;";
$result5 = pg_query_params($db, $requete, array($delmail)); $result5 = pg_query_params($db, $requete, array($delmail));
return $result1 && $result2 && $result3 && $result4 && $result5; return $result1 && $result2 && $result3 && $result4 && $result5;

@ -1,16 +1,22 @@
*{ * {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: "Arial"; font-family: "Arial";
} }
h1{ body {
background-image: url("../ressources/image/background.jpg");
background-size: cover;
background-attachment: fixed;
}
h1 {
font-size: 3em; font-size: 3em;
text-align: center; text-align: center;
text-decoration: underline; text-decoration: underline;
} }
#content{ #content {
min-width: 320px; min-width: 320px;
width: 100%; width: 100%;
display: flex; display: flex;
@ -19,20 +25,22 @@ h1{
align-items: center; align-items: center;
} }
#tableauBord{ #tableauBord {
border-radius: 10px;
background-color: white;
margin: 2em; margin: 2em;
padding: 1em; padding: 1em;
width: 100%; width: 70%;
} }
#divImgProfil{ #divImgProfil {
width: 100%; width: 100%;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
justify-content: center; justify-content: center;
} }
#imgProfil{ #imgProfil {
background-color: white; background-color: white;
margin-top: 2.5em; margin-top: 2.5em;
width: 60%; width: 60%;
@ -42,7 +50,22 @@ h1{
border-radius: 10px; border-radius: 10px;
} }
#trajet{ .button{
text-decoration: none;
cursor: pointer;
font-weight: bold;
padding: 12px;
color: white;
background-color: rgb(65, 154, 28);
border-radius: 5em;
border: none;
}
.button:hover{
background-color: rgb(80, 174, 48);
}
#trajet {
margin-top: 2em; margin-top: 2em;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -52,35 +75,18 @@ h1{
width: 100%; width: 100%;
} }
.btnTrajet{ #btnTrajet2 {
display: flex;
flex-wrap: nowrap;
justify-content: center;
align-items: center;
text-decoration: none;
padding: 0.4em;
color: black;
background-color: lightgray;
border: 1px solid black;
}
.btnTrajet:hover{
background-color: grey;
}
#btnTrajet2{
margin-left: 10%; margin-left: 10%;
} }
#recap{ #recap {
margin-top: 2.5em; margin-top: 2.5em;
width: 50%; width: 50%;
margin-left: 50%; margin-left: 50%;
transform: translate(-50%); transform: translate(-50%);
} }
.recapLine{ .recapLine {
margin-bottom: 1.5em; margin-bottom: 1.5em;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -89,11 +95,11 @@ h1{
width: 100%; width: 100%;
} }
.recapIcon{ .recapIcon {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
p{ p {
margin-left: 10%; margin-left: 10%;
} }

@ -23,8 +23,8 @@ require_once ('../ressources/verifconnecte.php');
<img id="imgProfil" src="<?php echo getPathImgProfilTableau($mail); ?>"> <img id="imgProfil" src="<?php echo getPathImgProfilTableau($mail); ?>">
</div> </div>
<div id="trajet"> <div id="trajet">
<a class="btnTrajet" href="../deposerTrajet/depotTrajet.php">Déposer un trajet</a> <a class="button" href="../deposerTrajet/depotTrajet.php">Déposer un trajet</a>
<a id="btnTrajet2" class="btnTrajet" href="../recherche/recherche.php">Rechercher un trajet</a> <a id="btnTrajet2" class="button" href="../recherche/recherche.php">Rechercher un trajet</a>
</div> </div>
<div id="recap"> <div id="recap">
<div class="recapLine"> <div class="recapLine">

Loading…
Cancel
Save