diff --git a/bdd.sql b/bdd.sql
index 531c3aa..4910be2 100644
--- a/bdd.sql
+++ b/bdd.sql
@@ -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);
diff --git a/html/ajoutReservation.php b/html/ajoutReservation.php
index 089c9d2..9d9f231 100644
--- a/html/ajoutReservation.php
+++ b/html/ajoutReservation.php
@@ -25,12 +25,12 @@
$banc = $_POST['banc'];
$heure = $_POST['heure'];
echo "date = ".$date." // banc = ".$banc." // heure = ".$heure."
" ;
- $explosion = explode('-',$date);
+ /*$explosion = explode('-',$date);
$annee = $explosion[0];
$mois = $explosion[1];
$jour = $explosion[2];
$date = $jour."/".$mois."/".$annee;
- echo "New date = ".$date."
";
+ echo "New date = ".$date."
";*/
$heurefin = (int)$heure + 1;
if($heurefin==24){
$heurefin = 0;
@@ -46,6 +46,9 @@
echo "Heure = ".$heure."
";
echo "Heure de fin = ".$heurefin."
";
+ $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 "";
@@ -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 "";
}else{
//echo "L'ajout n'a pas fonctionné";
diff --git a/html/dispoCreneau.php b/html/dispoCreneau.php
index c96c0da..926a5f2 100644
--- a/html/dispoCreneau.php
+++ b/html/dispoCreneau.php
@@ -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){
diff --git a/html/gestionBanc.php b/html/gestionBanc.php
index 891f75a..de2e812 100644
--- a/html/gestionBanc.php
+++ b/html/gestionBanc.php
@@ -44,7 +44,7 @@
foreach($banc as $value){
echo "