fix(): resolution probleme BDD + correction affichage des reservations deja passées

lwadbled
1 parent ceef8241
Showing 9 changed files with 45 additions and 36 deletions Show diff stats
bdd.sql
html/ajoutReservation.php
html/dispoCreneau.php
html/gestionBanc.php
html/gestionReservation.php
html/mesReservations.php
html/supprAppareil.php
html/supprBanc.php
html/supprReservation.php
@@ -4,11 +4,11 @@
 /* Suppression des tables si elles existent */
-drop table if exists utilisateur ;
-drop table if exists creneau ;
-drop table if exists banc ;
-drop table if exists equipement ;
 drop table if exists reservation ;
+drop table if exists equipement ;
+drop table if exists banc ;
+drop table if exists creneau ;
+drop table if exists utilisateur ;
 /* Creation des tables pour l'interface Web */
@@ -17,32 +17,32 @@ create table utilisateur
 	 MDP char(20));
 create table creneau
-	(JOUR char(10) PRIMARY KEY);
+	(JOUR date PRIMARY KEY);
 create table banc
 	(NUMERO int PRIMARY KEY);
 create table equipement
-	(num int REFERENCES banc,
+	(numero int REFERENCES banc,
 	 IP char(15) PRIMARY KEY,
 	 NOM char(50),
 	 TYPE char(30));
 create table reservation
-	(reserve int REFERENCES banc,
-	 moment char(10) REFERENCES creneau,
-	 personne char(8) REFERENCES utilisateur,
+	(numero int REFERENCES banc,
+	 jour date REFERENCES creneau,
+	 login char(8) REFERENCES utilisateur,
 	 HEUREDEBUT char(5),
 	 HEUREFIN char(5),
 	 /*UNIQUE(moment,HEUREDEBUT),*/
-	 PRIMARY KEY(reserve,moment,HEUREDEBUT));
+	 PRIMARY KEY(numero,jour,HEUREDEBUT));
 /* Insertions des donnees dans la BDD */
 insert into utilisateur values ('lwadbled','Louis');
 insert into utilisateur values ('admin','glopglop');
-/* insert into creneau values ('01/12/2021'); */
+insert into creneau values (01/12/2021);
 insert into banc values (1);
@@ -25,12 +25,12 @@
 				$banc = $_POST['banc'];
 				$heure = $_POST['heure'];
 				echo "date = ".$date." // banc = ".$banc." // heure = ".$heure."<br>" ;
-				$explosion = explode('-',$date);
+				/*$explosion = explode('-',$date);
 				$annee = $explosion[0];
 				$mois = $explosion[1];
 				$jour = $explosion[2];
 				$date = $jour."/".$mois."/".$annee;
-				echo "New date = ".$date."<br>";
+				echo "New date = ".$date."<br>";*/
 				$heurefin = (int)$heure + 1;
 				if($heurefin==24){
 					$heurefin = 0;
@@ -46,6 +46,9 @@
 				echo "Heure = ".$heure."<br>";
 				echo "Heure de fin = ".$heurefin."<br>";
+				$requete = "INSERT INTO creneau VALUES('$date')";
+				$exec_requete = mysqli_query($db,$requete);
+
 				$requete = "INSERT INTO reservation VALUES($banc,'$date','$login','$heure','$heurefin')";
 				$exec_requete = mysqli_query($db,$requete);
 				echo "<meta http-equiv=\"refresh\" content=\"0;url=mesReservations.php\">";
@@ -53,10 +56,10 @@
 				$date = $_GET['txtDate'];
 				$banc = $_GET['banc'];
 				$heure = $_GET['heure'];
-				$requete = "INSERT INTO reservation VALUES($banc,'$date','$login','$heure','$heurefin')";
-				$exec_requete = mysqli_query($db,$requete);
 				$requete = "INSERT INTO creneau VALUES('$date')";
 				$exec_requete = mysqli_query($db,$requete);
+				$requete = "INSERT INTO reservation VALUES($banc,'$date','$login','$heure','$heurefin')";
+				$exec_requete = mysqli_query($db,$requete);
 				echo "<meta http-equiv=\"refresh\" content=\"0;url=gestionReservation.php\">";
 			}else{
 				//echo "L'ajout n'a pas fonctionné";
@@ -4,7 +4,7 @@
 		$banc=$_POST['banc'];
 		include("connexion.php");
 		$requete = "SELECT HEUREDEBUT FROM reservation WHERE
-			moment = '$date' AND reserve = $banc";
+			jour = '$date' AND numero = $banc";
 		$exec_requete = mysqli_query($db,$requete);
 		$reponse = mysqli_fetch_all($exec_requete);
 		foreach($reponse as $value){
@@ -44,7 +44,7 @@
 			foreach($banc as $value){
 				echo "<tr>";
 				echo "<td>".$value[0]."</td>";
-				$requete = "SELECT count(*) FROM equipement WHERE num=$value[0]";
+				$requete = "SELECT count(*) FROM equipement WHERE numero=$value[0]";
 				$exec_requete = mysqli_query($db,$requete);
 				$reponse = mysqli_fetch_all($exec_requete);
 				echo "<td>".$reponse[0][0]."</td>";
@@ -47,7 +47,6 @@
 					$txtDate = "$annee-$mois-$jour";
 				}
 			}	
-			echo $txtDate;
 		?>
 		<form method="POST" action="gestionReservation.php"> 
@@ -86,6 +85,17 @@
 			echo "</tr>";
 			echo "</thead>";
 			echo "<tbody>";
+
+			$explosion_date = explode("-",$txtDate);
+			$jour = $explosion_date[2];
+			$mois = $explosion_date[1];
+			$annee = $explosion_date[0];
+			$actualDate = date("Y-m-d");
+			$new = explode("-",$actualDate);
+			$new_jour = $new[2];
+			$new_mois = $new[1];
+			$new_annee = $new[0];
+
 			for($i=0;$i<24;$i++){
 				if($i<10){
 					$heure = "0".$i.":00";
@@ -95,14 +105,7 @@
 				echo "<tr>";
 				echo "<td>$heure</td>";
 				/* Requete pour connaitre l'utilisateur reservant le creneau s'il y en a un */
-				/* Reecriture de la date */
-				$explosion_date = explode("-",$txtDate);
-				$jour = $explosion_date[2];
-				$mois = $explosion_date[1];
-				$annee = $explosion_date[0];
-				$new_date = "$jour/$mois/$annee";
-				/* Fin reecriture date */
-				$requete = "SELECT personne FROM reservation WHERE moment='$new_date' AND reserve=$banc AND HEUREDEBUT='$heure'";
+				$requete = "SELECT login FROM reservation WHERE jour='$txtDate' AND numero=$banc AND HEUREDEBUT='$heure'";
 				$exec_requete = mysqli_query($db,$requete);
 				$reponse = mysqli_fetch_all($exec_requete);
 				if($reponse!=null){
@@ -111,12 +114,14 @@
 				}else{
 					echo "<td></td>";
 				}
-				if($reponse==null){
-					echo "<td><form method='POST' action='ajoutReservation.php?txtDate=$new_date&banc=$banc&heure=$heure'><button class='btn-lg btn-danger' type='submit'>Bloquer le créneau</button></form>";
+				if($new_annee>$annee || ($new_annee>=$annee && $new_mois>=$mois && $new_jour>$jour)){
+					echo "<td><form method='POST' action=''><button disabled class='btn-lg btn-outline-info' type='submit'>Date déjà passée</button></form>";
+				}else if($reponse==null){
+					echo "<td><form method='POST' action='ajoutReservation.php?txtDate=$txtDate&banc=$banc&heure=$heure'><button class='btn-lg btn-danger' type='submit'>Bloquer le créneau</button></form>";
 				}else if($reponse[0][0]=="admin"){
-					echo "<td><form method='POST' action='supprReservation.php?banc=$banc&moment=$new_date&personne=$personne&heuredebut=$heure'><button class='btn-lg btn-success' type='submit'>Débloquer le créneau</button></form>";
+					echo "<td><form method='POST' action='supprReservation.php?banc=$banc&moment=$txtDate&personne=$personne&heuredebut=$heure'><button class='btn-lg btn-success' type='submit'>Débloquer le créneau</button></form>";
 				}else{
-					echo "<td><form method='POST' action='supprReservation.php?banc=$banc&moment=$new_date&personne=$personne&heuredebut=$heure'><button class='btn-lg btn-warning' type='submit'>Supprimer la réservation</button></form>";
+					echo "<td><form method='POST' action='supprReservation.php?banc=$banc&moment=$txtDate&personne=$personne&heuredebut=$heure'><button class='btn-lg btn-warning' type='submit'>Supprimer la réservation</button></form>";
 				}
 				echo "</tr>";
 			}
@@ -25,7 +25,7 @@
 			}
 			include("connexion.php");
 			$requete = "SELECT count(*) FROM reservation WHERE
-				personne = '".$identifiant."'";
+				login = '".$identifiant."'";
 			$exec_requete = mysqli_query($db,$requete);
 			$reponse = mysqli_fetch_array($exec_requete);
 			$count = $reponse['count(*)'];
@@ -35,8 +35,9 @@
 				echo "<div class='px-4 py-4 my-5 text-center'>";
 				echo "Vos reservations ($identifiant) : <br>";
 				echo "</div>";
+				$actualDate = date("Y-m-d");
 				$requete = "SELECT * FROM reservation WHERE
-					personne = '".$identifiant."'";
+					login = '".$identifiant."' AND jour >= '$actualDate'";
 				$exec_requete = mysqli_query($db,$requete);
 				$reponse = mysqli_fetch_all($exec_requete);
 				foreach($reponse as $creneau){
@@ -49,7 +50,7 @@
 					echo "<form method='POST' action='main.php'>";
 					echo "<input type='hidden' name='heure' value='$creneau[3]'>";
 					date_default_timezone_set('Europe/Paris');
-					$ActualDate = date("d/m/Y",time());
+					$ActualDate = date("Y-m-d",time());
 					if($ActualDate==$creneau[1]){
 						$ActualHour = date("h:i",time());
 						$Periode = date("a",time());
@@ -7,7 +7,7 @@ if(isset($_GET[&#39;ip&#39;])){
 	$requete = "DELETE FROM equipement WHERE
 		ip='$ip'";
 	$exec_requete = mysqli_query($db,$requete);
-	$reponse = mysqli_fetch_array($exec_requete);
+	//$reponse = mysqli_fetch_array($exec_requete);
 	echo "<meta http-equiv=\"refresh\" content=\"0;url=gestionAppareil.php\">";
 	mysqli_close($db);
 }
@@ -6,7 +6,7 @@ if(isset($_GET[&#39;banc&#39;])){
 	$requete = "DELETE FROM banc WHERE
 		numero=$banc";
 	$exec_requete = mysqli_query($db,$requete);
-	$reponse = mysqli_fetch_array($exec_requete);
+	//$reponse = mysqli_fetch_array($exec_requete);
 	echo "<meta http-equiv=\"refresh\" content=\"0;url=gestionBanc.php\">";
 	mysqli_close($db);
 }
@@ -12,7 +12,7 @@ if(isset($_GET[&#39;banc&#39;]) &amp;&amp; isset($_GET[&#39;moment&#39;]) &amp;&amp; isset($_GET[&#39;personne&#39;]) &amp;&amp;
 	echo "Banc = $banc moment = $moment personne = $personne heuredebut = $heuredebut";
 	include("connexion.php");
 	$requete = "DELETE FROM reservation WHERE
-		reserve=$banc and moment='$moment' and personne = '$personne' and heuredebut='$heuredebut'";
+		numero=$banc and jour='$moment' and login = '$personne' and heuredebut='$heuredebut'";
 	$exec_requete = mysqli_query($db,$requete);
 	//$reponse = mysqli_fetch_array($exec_requete);
 	if($identifiant=="admin"){