Compare commits

..

10 Commits

Author SHA1 Message Date
Flavien Haas c139f83edf added comments 6 years ago
PALAFFRE Raphaël 0d256c60ef Commentaire code 6 years ago
PALAFFRE Raphaël 6e0465379e Commentaire code 6 years ago
PALAFFRE Raphaël 77796e4df8 Commentaire code 6 years ago
PALAFFRE Raphaël 13064316fd Commentaire code 6 years ago
PALAFFRE Raphaël 508c84a04f Commentaire code 6 years ago
PALAFFRE Raphaël bd4163c5fa Commentaire code 6 years ago
PALAFFRE Raphaël 7c73030e97 Commentaire code 6 years ago
PALAFFRE Raphaël 598feef1f7 Commentaire code 6 years ago
PALAFFRE Raphaël 65b1254997 Mettre à jour 'WEB/avis_laisses/avis_laisses.php' 6 years ago

@ -1,15 +1,11 @@
/* /*General*/
Crée par PALAFFRE Raphael
Fonction: Lister les avis laisses
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-size:cover; background-repeat:no-repeat;
background-size:100%;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }
@ -32,6 +28,8 @@ h2{
font-weight: bold; font-weight: bold;
} }
/*Affichage avis*/
#bouton_retour{ #bouton_retour{
transform : rotate(45deg); transform : rotate(45deg);
} }

@ -1,4 +1,5 @@
<?php <?php
//Importation des fichiers necessaires au fonctionnement
session_start(); session_start();
require_once ("../connexionBD.php"); require_once ("../connexionBD.php");
require_once ("../ressources/user.php"); require_once ("../ressources/user.php");
@ -8,11 +9,15 @@ if (!isset($_SESSION['mail'])) {
header('Location: ../index.php'); header('Location: ../index.php');
exit(); exit();
} }
//Recuperation de la variables de session
$mail = $_SESSION['mail']; $mail = $_SESSION['mail'];
$login = getLogin($db,$mail); $login = getLogin($db,$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;";
//Création et envoie de la requete SQL
$requete = "SELECT DISTINCT Utilisateur.login, Avis.commentaire, Avis.dateavis, Avis.note FROM Utilisateur, Avis, Trajet WHERE Avis.mailemetteur = $1 AND Avis.mailemetteur = Utilisateur.mail;";
$result = pg_query_params($db, $requete, array($mail)); $result = pg_query_params($db, $requete, array($mail));
?> ?>
@ -34,7 +39,7 @@ $result = pg_query_params($db, $requete, array($mail));
<div id = "container"> <div id = "container">
<div id ="entete"> <div id ="entete"> <-- Entete de la page -->
<a href = "../tableauBord/tableauBord.php"><img id = "bouton_retour" src = "../ressources/image/return.png" alt = "Bouton retour"></a> <a href = "../tableauBord/tableauBord.php"><img id = "bouton_retour" src = "../ressources/image/return.png" alt = "Bouton retour"></a>
<h1 id = "titre">Avis Laissés</h1> <h1 id = "titre">Avis Laissés</h1>
<br> <br>
@ -43,20 +48,20 @@ $result = pg_query_params($db, $requete, array($mail));
<div id = "avis"> <div id = "avis">
<table> <table>
<?php <?php
while ($row = pg_fetch_array($result)) { while ($row = pg_fetch_array($result)) { //Stockage des resultats des requete SQL
$nom = $row['login']; $nom = $row['login'];
$date = $row['dateavis']; $date = $row['dateavis'];
$commentaire = $row['commentaire']; $commentaire = $row['commentaire'];
$note = $row['note']; $note = $row['note'];
echo "<tr>"; echo "<tr>";
echo "<td class='avis_tab'>"; echo "<td class='avis_tab'>"; //Affichage sous forme de tableau pour la mise en page
echo "<h3 id='nom'>$nom</h3>"; echo "<h3 id='nom'>$nom</h3>";
echo "<h4 id='date'>".explode(' ',$date)[0]."</h4>"; echo "<h4 id='date'>".explode(' ',$date)[0]."</h4>";
echo "<h5 id='avis'>$commentaire</h5>"; echo "<h5 id='avis'>$commentaire</h5>";
echo "</td>"; echo "</td>";
echo "<td id='note_tab'>"; echo "<td id='note_tab'>";
$i=0; $i=0;
while ($i<intval($note)){ while ($i<intval($note)){ //Affichage de la note laisses
echo "<img class='etoile' src='../ressources/image/star_full.png' alt='star'>"; echo "<img class='etoile' src='../ressources/image/star_full.png' alt='star'>";
$i++; $i++;
} }

@ -1,15 +1,11 @@
/* /*General*/
Crée par PALAFFRE Raphael
Fonction: Lister les avis recus
Page CSS : avis_recu.css
*/
body { 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-attachment: fixed; background-repeat:no-repeat;
background-size:cover; background-size:104%;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }
@ -32,6 +28,8 @@ h2{
font-weight: bold; font-weight: bold;
} }
/*Affichage avis*/
#bouton_retour{ #bouton_retour{
transform : rotate(45deg); transform : rotate(45deg);
} }

@ -1,4 +1,5 @@
<?php <?php
//Importation des fichiers
session_start(); session_start();
require_once("../connexionBD.php"); require_once("../connexionBD.php");
require_once("../ressources/user.php"); require_once("../ressources/user.php");
@ -8,13 +9,18 @@ if (!isset($_SESSION['mail'])) {
header('Location: ../index.php'); header('Location: ../index.php');
exit(); exit();
} }
//Recuperation variable session
$mail = $_SESSION['mail']; $mail = $_SESSION['mail'];
$login = getLogin($db, $mail); $login = getLogin($db, $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;"; //Creation et envoie de la requete SQL
$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;";
$result = pg_query_params($db, $requete, array($mail)); $result = pg_query_params($db, $requete, array($mail));
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
@ -26,23 +32,23 @@ $result = pg_query_params($db, $requete, array($mail));
</head> </head>
<body> <body>
<?php require_once ("../ressources/navbarhtml.php"); ?> <?php require_once ("../ressources/navbarhtml.php"); ?>
<div id="container"> <div id="container">
<div id="entete"> <div id="entete"> <-- Entete -->
<a href="../tableauBord/tableauBord.php"><img id="bouton_retour" <a href="../tableauBord/tableauBord.php"><img id="bouton_retour"
src="../ressources/image/return.png" src="../ressources/image/return.png"
alt="Bouton retour"></a> alt="Bouton retour"></a>
<h1 id="titre">Avis Recus</h1> <h1 id="titre">Avis Recus</h1>
<br> <br>
</div> </div>
<div id="avis"> <div id="avis"> <-- Avis recus -->
<table> <table>
<?php while ($row = pg_fetch_array($result)) { <?php while ($row = pg_fetch_array($result)) { //Stockage des valeurs de retour de la requete SQL
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'];
$note = $row['note']; $note = $row['note'];
echo "<tr>"; echo "<tr>"; //Affichage des resultat sour forme de tableau
echo "<td class='avis_tab'>"; echo "<td class='avis_tab'>";
echo "<h3 id='nom'>$nom</h3>"; echo "<h3 id='nom'>$nom</h3>";
echo "<h4 id='date'>".explode(' ',$date)[0]."</h4>"; echo "<h4 id='date'>".explode(' ',$date)[0]."</h4>";
@ -50,7 +56,7 @@ $result = pg_query_params($db, $requete, array($mail));
echo "</td>"; echo "</td>";
echo "<td id='note_tab'>"; echo "<td id='note_tab'>";
$i=0; $i=0;
while ($i<intval($note)){ while ($i<intval($note)){ //Affichage des notes recus
echo "<img class='etoile' src='../ressources/image/star_full.png' alt='star'>"; echo "<img class='etoile' src='../ressources/image/star_full.png' alt='star'>";
$i++; $i++;
} }

@ -6,8 +6,6 @@
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;
@ -54,12 +52,10 @@ 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,6 +62,7 @@ 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>

@ -1,9 +1,11 @@
/*General*/
body { 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-attachment: fixed; background-repeat:no-repeat;
background-size:cover; background-size:104%;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }
@ -20,6 +22,8 @@ h1{
font-weight: bold; font-weight: bold;
} }
/*Formulaire*/
#form{ #form{
text-align:center; text-align:center;
} }
@ -35,6 +39,8 @@ h1{
margin-bottom: 1%; margin-bottom: 1%;
} }
/*Etoile de notation*/
.rating { .rating {
direction: rtl; direction: rtl;
} }

@ -1,6 +1,7 @@
<?php <?php
//Verifier qu'un avis n'a pas déja été envoyer avec le compte $mail pour le trajet $codetrajet //Declaration des fonctions
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));
@ -8,7 +9,6 @@ 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));
@ -16,11 +16,14 @@ function checkCodeTrajetAvis($db, $mail, $codetrajet)
return $row[0] >= 1; return $row[0] >= 1;
} }
//Importation des fichiers necessaires
session_start(); session_start();
require_once("../connexionBD.php"); require_once("../connexionBD.php");
require_once("../ressources/user.php"); require_once("../ressources/user.php");
//Si on est pas connecté redirection vers la page de connexion //Si on est pas connecté redirection vers la page de connexion
if (!isset($_SESSION['mail'])) { if (!isset($_SESSION['mail'])) {
header('Location: ../index.php'); header('Location: ../index.php');
exit(); exit();
@ -28,19 +31,19 @@ if (!isset($_SESSION['mail'])) {
$mail = $_SESSION['mail']; $mail = $_SESSION['mail'];
if (isset($_POST['codetrajet']) && isset($_POST['avislaisse']) && isset($_POST['note'])) { if (isset($_POST['codetrajet']) && isset($_POST['avislaisse']) && isset($_POST['note'])) {
//Recuperation des variables passer par le formulaire
$avis = $_POST['avislaisse']; $avis = $_POST['avislaisse'];
$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);"; //Requete d'insertion
$envoi = pg_query_params($db, $requete, array($mail, $codetrajet, $avis, $date, $note)); $envoi = pg_query_params($db, $requete, array($mail, $codetrajet, $avis, $date, $note)); // Envoie de la requete
if (!$envoi) { if (!$envoi) { //Erreur
echo "Erreur d'ecriture dans la BD"; echo "Erreur d'ecriture dans la BD";
echo "<br><a href='../tableauBord/tableauBord.php'>Retour vers le tableau de bord</a>"; echo "<br><a href='../tableauBord/tableauBord.php'>Retour vers le tableau de bord</a>";
exit(); exit();
} else { } else { //Redirection en cas de reussite
header('Location: ../tableauBord/tableauBord.php'); header('Location: ../tableauBord/tableauBord.php');
exit(); exit();
} }
@ -59,14 +62,14 @@ if (isset($_POST['codetrajet']) && isset($_POST['avislaisse']) && isset($_POST['
<body> <body>
<?php require_once("../ressources/navbarhtml.php"); ?> <?php require_once("../ressources/navbarhtml.php"); ?>
<div id="container"> <div id="container">
<div id="entete"> <div id="entete"> <--Entete-->
<h1 id="titre">Deposer un avis</h1> <h1 id="titre">Deposer un avis</h1>
</div> </div>
<div id="form"> <div id="form"><--Formulaire-->
<form id="formulaire_avis" enctype="multipart/form-data" action="deposer_avis.php" method="post"> <form id="formulaire_avis" enctype="multipart/form-data" action="deposer_avis.php" method="post">
<textarea id="avis_laisse" name="avislaisse" form="formulaire_avis" placeholder="Avis"></textarea> <textarea id="avis_laisse" name="avislaisse" form="formulaire_avis" placeholder="Avis"></textarea> <--Champ_de_saisie_d_avis-->
<h2>NOTE</h2> <h2>NOTE</h2>
<div class="rating"> <div class="rating"><--Bouton_note-->
<input type="radio" name="note" id="note3" value="3"> <input type="radio" name="note" id="note3" value="3">
<a href="#3" label for="note3" title="Donner 3 étoiles"></a> <a href="#3" label for="note3" title="Donner 3 étoiles"></a>
<input type="radio" name="note" id="note2" value="2"> <input type="radio" name="note" id="note2" value="2">
@ -81,7 +84,7 @@ if (isset($_POST['codetrajet']) && isset($_POST['avislaisse']) && isset($_POST['
?> ?>
</div> </div>
<br> <br>
<input type="submit" value="Valider" id="submit"> <input type="submit" value="Valider" id="submit"><--Envoie-->
</form> </form>
</div> </div>
</div> </div>

@ -10,9 +10,6 @@ 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,7 +8,6 @@ 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,17 +10,14 @@ 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,60 +3,61 @@ 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 (isset($_FILES['avatar']) and !empty($_FILES['avatar']['name'])) { if (!filter_var($mail, FILTER_VALIDATE_EMAIL)){
$fic = $_FILES['avatar']; header('Location: inscription.php?error=1');
//Charger l'avatar sur le serveur exit();
$res = uploadAvatar($mail, $fic); }
switch ($res) { elseif (!isMailUnique($db, $mail)){
case -1: header('Location: inscription.php?error=2');
header('Location: inscription.php?error=4'); exit();
exit(); }
case -2: elseif (!isLoginUnique($db, $login)){
header('Location: inscription.php?error=5'); header('Location: inscription.php?error=3');
exit(); exit();
case -3: }
header('Location: inscription.php?error=6'); else {
exit(); if (isset($_FILES['avatar']) and !empty($_FILES['avatar']['name'])) {
} $fic = $_FILES['avatar'];
} $res = uploadAvatar($mail, $fic);
$result = creerUtilisateur($db, $mail, $password, $prenom, $nom, $login, $phone, $dateN); switch ($res){
if ($result) { case -1:
header('Location: ../index.php'); header('Location: inscription.php?error=4');
exit(); exit();
} else { case -2:
header('Location: inscription.php?error=6'); header('Location: inscription.php?error=5');
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-attachment: fixed; background-repeat:no-repeat;
background-size:cover; background-size:104%;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }

@ -36,22 +36,16 @@ 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 ORDER BY datedepart DESC;", array($mail)); $result = pg_query_params($db, "SELECT * FROM Trajet Where mailproposition = $1 AND estannule = false;", 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['nomville']." (".$source['codepostal'].") vers ".$dest['nomville']." (".$dest['codepostal'].") proposé par : $login</p></td>"; echo "<p>$date_depart - $source vers $dest proposé par : $login</p></td>";
if ($date <= $row['datearrivee']){ echo "<td><a href='annulerTrajet.php?codetrajet=$codetrajet'>Annuler le trajet</a></td>";
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-attachment: fixed; background-repeat:no-repeat;
background-size:cover; background-size:104%;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }

@ -34,26 +34,17 @@ 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 ORDER BY datedepart DESC;", 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;", 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['nomville']." (".$source['codepostal'].") vers ".$dest['nomville']." (".$dest['codepostal'].") proposé par : $login</p></td>"; echo "<td class='info'><p>$date_depart - $source vers $dest proposé par : $login</p></td>";
echo "<td><a href='annulerReservation.php?codetrajet=$codetrajet'>Annuler la reservation</a></td>";
if ($date <= $row['datearrivee']){ echo "<td><a href='../deposer_avis/deposer_avis.php?codetrajet=$codetrajet'>Déposer un avis</a></td>";
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>";
} }
?> ?>

@ -1,9 +1,11 @@
/*General*/
body { 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-attachment: fixed; background-repeat:no-repeat;
background-size:cover; background-size:104%;
margin: 0; margin: 0;
font-family: Ubuntu,Helvetica,sans-serif; font-family: Ubuntu,Helvetica,sans-serif;
} }
@ -26,6 +28,8 @@ h2{
font-weight: bold; font-weight: bold;
} }
/*Affichage liste trajets*/
#bouton_retour{ #bouton_retour{
transform : rotate(45deg); transform : rotate(45deg);
} }

@ -1,33 +1,39 @@
<?php <?php
session_start(); session_start();
//Importation des fichiers necessaires
require_once("../connexionBD.php"); require_once("../connexionBD.php");
require_once("../ressources/trajet.php"); require_once("../ressources/trajet.php");
//Si on est pas connecté redirection vers la page de connexion //Si on est pas connecté redirection vers la page de connexion
if (!isset($_SESSION['mail'])) { if (!isset($_SESSION['mail'])) {
header('Location: ../index.php'); header('Location: ../index.php');
exit(); exit();
} }
$mail = $_SESSION['mail']; $mail = $_SESSION['mail'];
if (!(isset($_POST['villeDepart']) && isset($_POST['villeArrive']) && isset($_POST['date_heure']))) { if (!(isset($_POST['lieu_depart']) && isset($_POST['lieu_arrivee']) && isset($_POST['date_heure']))){
header('Location: ../tableauBord/tableauBord.php'); header('Location: ../tableauBord/tableauBord.php');
exit(); exit();
} }
$source = explode('%%', $_POST['villeDepart']);
$cpsource = $source[1]; if (isset($_POST['lieu_depart']) && isset($_POST['lieu_arrivee']) && isset($_POST['date_heure'])) {
$source = $source[0]; $source = $_POST['lieu_depart']; //Recuperation des valeurs passé par le form
$dest = explode('%%', $_POST['villeArrive']); $dest = $_POST['lieu_arrivee'];
$cpdest = $dest[1]; $date_depart = $_POST['date_heure'];
$dest = $dest[0]; if ($date_depart < date('Y-m-d')){ //Verification de date
$date_depart = $_POST['date_heure']; echo "Erreur date</br>";
if ($date_depart < date('Y-m-d')) { echo "<a href='../tableauBord/tableauBord.php'>Retour vers le tableau de bord</a>";
echo "Erreur date</br>"; exit();
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) AND codepostal = $4)) //Requete de selection des trajets a affiché
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));
$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)))
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));
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
@ -44,25 +50,25 @@ INTERSECT (SELECT DISTINCT ut.login, ta.codetrajet, ta.datedepart FROM ville v,
require_once("../ressources/navbarhtml.php"); require_once("../ressources/navbarhtml.php");
?> ?>
<div id="container"> <div id="container">
<div id="entete"> <div id="entete"> <--Entete-->
<a href="../tableauBord/tableauBord.php"><img id="bouton_retour" src="../ressources/image/return.png" <a href="../tableauBord/tableauBord.php"><img id="bouton_retour" src="../ressources/image/return.png"
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 ($cpsource) vers $dest ($cpdest)"; ?></h2> <h2>Trajets recherchés : <?php echo $source . " vers " . $dest; ?></h2>
</div> </div>
<div id="liste"> <div id="liste">
<table> <table>
<?php <?php
while ($row = pg_fetch_array($result)) { while ($row = pg_fetch_array($result)) { //Recuperation des resultats de la requete
$codetrajet = $row['codetrajet']; $codetrajet = $row['codetrajet'];
$login = $row['login']; $login = $row['login'];
$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')){ //Affichage des resultats sous forme de tableau
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['nomvile']." (".$source['codepostal'].") vers ".$dest['nomvile']." (".$dest['codepostal'].") proposé par : $login</p></td>"; echo "<p>$date_depart - $source vers $dest 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>";
} }

@ -1,38 +1,38 @@
<?php <?php
session_start(); session_start();
//Declaration de fonction
function verifierTrajet($db, $mail, $codetrajet){ function verifierTrajet($db, $mail, $codetrajet){
$trajet = getTrajet($db, $codetrajet); $trajet = getTrajet($db, $codetrajet);
if (!$trajet){ if (!$trajet){
return false; return false;
} }
$trajet = pg_fetch_array($trajet); return checkReservations($db, $mail, $codetrajet) && checkDatesReserve($db, $mail, $trajet['datedepart']) && checkPlacesVoiture($db, $codetrajet) && strcmp($trajet['mailproposition'], $mail) != 0;
if (strcmp($mail, $trajet['mailproposition']) == 0){
return false;
}
return checkReservations($db, $mail, $codetrajet) && checkPlacesVoiture($db, $codetrajet);
} }
//Importation des fichiers necessaire
require_once("../connexionBD.php"); require_once("../connexionBD.php");
require_once("../ressources/trajet.php"); require_once("../ressources/trajet.php");
if (!isset($_SESSION['mail'])) { if (!isset($_SESSION['mail'])) { // Test si connecté ou non
header('Location: ../index.php'); header('Location: ../index.php');
exit(); exit();
} }
$mail = $_SESSION['mail']; $mail = $_SESSION['mail'];
if (isset($_GET['codetrajet'])){ if (isset($_GET['codetrajet'])){
$codetrajet = $_GET['codetrajet']; $codetrajet = $_GET['codetrajet'];
if (verifierTrajet($db, $mail, $codetrajet) && reserver($db, $mail, $codetrajet)){ if (verifierTrajet($db, $mail, $codetrajet)){ // Test si place dispo et si on peut reserver
header('Location: ../tableauBord/tableauBord.php'); reserver($db, $mail, $codetrajet);
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{

@ -2,6 +2,7 @@
session_start(); session_start();
require_once('../connexionBD.php'); require_once('../connexionBD.php');
require_once ('../ressources/user.php'); require_once ('../ressources/user.php');
require_once ('../ressources/verifconnecte.php');
require_once ('../ressources/voiture.php'); require_once ('../ressources/voiture.php');
$matricule = isset($_POST['matricule']) ? $_POST['matricule'] : NULL; //recuperation valeur formulaire, isset pour eviter l'erreur "Notice: Undefined index" $matricule = isset($_POST['matricule']) ? $_POST['matricule'] : NULL; //recuperation valeur formulaire, isset pour eviter l'erreur "Notice: Undefined index"
@ -10,13 +11,7 @@ $modele = isset($_POST['modele']) ? $_POST['modele'] : NULL;
$nbplaces = isset($_POST['nbplaces']) ? $_POST['nbplaces'] : NULL; $nbplaces = isset($_POST['nbplaces']) ? $_POST['nbplaces'] : NULL;
$anneefab = isset($_POST['anneefab']) ? $_POST['anneefab'] : NULL; $anneefab = isset($_POST['anneefab']) ? $_POST['anneefab'] : NULL;
if (!isset($_SESSION['mail'])) { if (isset($_POST['submitadd'])) { //si formulaire pressé appele la methode
header('Location: index.php');
exit();
}
$mail = $_SESSION['mail'];
if (isset($_POST['submitadd'])) {
$result = pg_query_params($db, "SELECT COUNT(*), matricule FROM voiture WHERE mail = $1 GROUP BY matricule;", array($mail)); $result = pg_query_params($db, "SELECT COUNT(*), matricule FROM voiture WHERE mail = $1 GROUP BY matricule;", array($mail));
$row = pg_fetch_array($result); $row = pg_fetch_array($result);
if($row[0] == 0){ if($row[0] == 0){
@ -34,12 +29,12 @@ if (!$user){
exit(); exit();
} }
if (isset($_POST['login']) || isset($_FILES['avatar'])){ if (isset($_POST['login']) || isset($_FILES['avatar'])){ //si connecte ou si avatar de defini
if (isset($_FILES['avatar']) and !empty($_FILES['avatar']['name'])) { if (isset($_FILES['avatar']) and !empty($_FILES['avatar']['name'])) { //si avatar et pas de fichier au nom de l'utilisateur
$fic = $_FILES['avatar']; $fic = $_FILES['avatar']; //avatar envoyé par l'utilisateur
supprimerAvatar($mail); supprimerAvatar($mail); //supprime l'avatar courant de l'utilisateur
$res = uploadAvatar($mail, $fic); $res = uploadAvatar($mail, $fic); //enregistre l'avatar avec le mail de l'utilisateur
switch ($res){ switch ($res){ //controle d'erreur de la fonction uploadAvatar
case -1: case -1:
header('Location: profil.php?error=4'); header('Location: profil.php?error=4');
exit(); exit();
@ -51,14 +46,14 @@ if (isset($_POST['login']) || isset($_FILES['avatar'])){
exit(); exit();
} }
} }
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'])) { //controle du remplissage du formulaire
$login = htmlentities(pg_escape_string($_POST['login'])); $login = htmlentities(pg_escape_string($_POST['login'])); //recupere la variable du formulaire
$password = htmlentities(pg_escape_string($_POST['password'])); $password = htmlentities(pg_escape_string($_POST['password']));
$confirmation = htmlentities(pg_escape_string($_POST['confirmation'])); $confirmation = htmlentities(pg_escape_string($_POST['confirmation']));
$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 +70,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,11 +165,7 @@ 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 <?php getErrorProfil($_GET['error']); ?>
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,91 +1,40 @@
*{ .centrage {
font-family: "Arial";
padding: 0;
margin: 0;
}
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; font-size: 20px;
} }
.villeSelect, .villeText{ .global {
box-sizing: border-box;
margin-bottom: 0.7em;
}
.villeText{ text-align: center;
width: 20%;
}
.villeSelect{
margin-bottom: 0.7em;
margin-left: 2%;
width: 33%;
} }
#submit{ br {
margin-top: 1em; line-height: 50px;
margin-left: 50%;
transform: translate(-50%);
} }
#formulaire{ body {
color: black;
background-color: white; background-color: white;
border-radius: 10px; background-image: url("../ressources/image/background.jpg");
padding: 4em; background-repeat: no-repeat;
width: 40%; background-size: 104%;
} margin: 0;
.form{
box-sizing: border-box;
width: 55%;
margin-bottom: 0.7em;
} }
.button{ #container {
cursor: pointer; margin: 5% 15% 2% 15%;
font-weight: bold; background-color: white;
padding: 8px; border: 2px solid black;
color: white;
background-color: rgb(65, 154, 28);
border-radius: 5em;
border: none;
} }
.line{ h1 {
display: flex; text-align: center;
flex-wrap: wrap; font-size: 250%;
flex-direction: row;
justify-content: left;
width: 100%;
} }
.error{ #form {
margin-top: 1em;
color: red;
text-align: center; text-align: center;
} }
.label{
box-sizing: border-box;
font-size: 1.1em;
width: 45%;
min-width: 8em;
}

@ -1,23 +0,0 @@
$(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,16 +1,6 @@
<?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>
@ -27,44 +17,38 @@ require_once('../ressources/trajet.php');
require_once("../ressources/navbarhtml.php"); require_once("../ressources/navbarhtml.php");
?> ?>
<div id="container"> <div id="container">
<div id="formulaire"> <div id="entete">
<h1>Rechercher trajet</h1> <h1>Rechercher trajet</h1><br/>
</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 class="label" for="villeDepart">Ville de départ : </label> <label>
<input type="text" class="form, villeText" name="villeDepartText" id="villeDepartText"> <input name="lieu_depart" type="text" placeholder="Lieu de départ" class="centrage" required>
<select class="form, villeSelect" name="villeDepart" id="villeDepart" required> <br/>
<option selected></option> <br/>
<?php afficherVilles($db); ?> </label>
</select>
</div> <label>
<div id="villeEtapeDiv" class="line"> <input name="lieu_arrivee" type="text" placeholder="Lieu d'arrivée" class="centrage" required>
<label class="label" for="villeArrive">Etape : </label> <br/>
<input type="text" class="form, villeText" id="villeArriveText" name="villeArriveText"> <br/>
<select class="form, villeSelect" name="villeArrive" id="villeArrive" required> </label>
<option selected></option>
<?php afficherVilles($db); ?> <label>
</select> <input name="date_heure" type="date" placeholder="Date et heure de départ" class="centrage"
</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>
</div> <br/>
</label>
<br/> <br/>
<label> <label>
<input id="submit" class="button" name="submit" type="submit" value="Rechercher" required> <input id="submit" name="submit" type="submit" value="Rechercher" class="centrage">
</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, false, $3);", array($mail, $codetrajet, date('Y-m-d H:i:s'))); return pg_query_params($db, "INSERT INTO Reserver VALUES ($1, $2, $3);", array($mail, $codetrajet, date('Y-m-d H:i:s')));
} }
function getTrajet($db, $codetrajet) function getTrajet($db, $codetrajet)
@ -37,18 +37,12 @@ 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 estannule = false AND $2 BETWEEN datedepart AND datearrivee;", array($mail, $dateDepart)); $result = pg_query_params($db, "SELECT COUNT(*) From Trajet WHERE mailproposition = $1 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)
{ {
@ -86,10 +80,9 @@ 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 >= $2;", array($mail, date('Y-m-d H:i:s'))); $result = pg_query_params($db, "SELECT COUNT(*) from Trajet WHERE mailProposition = $1 AND estAnnule = false AND datedepart >= current_date;", array($mail));
if ($result) { if ($result) {
$row = pg_fetch_array($result); $row = pg_fetch_array($result);
return $row[0]; return $row[0];
@ -97,10 +90,9 @@ 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 tr.estannule = false AND re.estannule = false AND tr.datedepart >= $2;", array($mail, date('Y-m-d H:i:s'))); $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));
if ($result) { if ($result) {
$row = pg_fetch_array($result); $row = pg_fetch_array($result);
return $row[0]; return $row[0];
@ -158,35 +150,31 @@ 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 * 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 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));
$return = false; $return = false;
if ($result) { if ($result) {
$return = pg_fetch_array($result); $return = pg_fetch_array($result)[0];
} }
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 * 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 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));
$return = false; $return = false;
if ($result) { if ($result) {
$return = pg_fetch_array($result); $return = pg_fetch_array($result)[0];
} }
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;
@ -206,13 +194,4 @@ 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,7 +111,6 @@ 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) {
@ -123,7 +122,6 @@ 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) {
@ -135,7 +133,6 @@ 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) {
@ -191,7 +188,6 @@ 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;";
@ -200,7 +196,6 @@ 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,22 +1,16 @@
* { *{
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: "Arial"; font-family: "Arial";
} }
body { h1{
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;
@ -25,22 +19,20 @@ h1 {
align-items: center; align-items: center;
} }
#tableauBord { #tableauBord{
border-radius: 10px;
background-color: white;
margin: 2em; margin: 2em;
padding: 1em; padding: 1em;
width: 70%; width: 100%;
} }
#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%;
@ -50,22 +42,7 @@ h1 {
border-radius: 10px; border-radius: 10px;
} }
.button{ #trajet{
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;
@ -75,18 +52,35 @@ h1 {
width: 100%; width: 100%;
} }
#btnTrajet2 { .btnTrajet{
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;
@ -95,11 +89,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="button" href="../deposerTrajet/depotTrajet.php">Déposer un trajet</a> <a class="btnTrajet" href="../deposerTrajet/depotTrajet.php">Déposer un trajet</a>
<a id="btnTrajet2" class="button" href="../recherche/recherche.php">Rechercher un trajet</a> <a id="btnTrajet2" class="btnTrajet" 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