From cdb865f10c0f56d72211a6f47ea491d6cac7eac5 Mon Sep 17 00:00:00 2001
From: lwadbled <louis.wadbled@laposte.net>
Date: Fri, 14 Jan 2022 11:05:31 +0100
Subject: [PATCH] feat(Python): Ajout du code python (pour plus tard avec la raspberry) + tentative resolution de bug sur reservation

---
 Python/client.py            |  8 ++++++++
 Python/serveur.py           |  9 +++++++++
 html/Python/client.py       |  8 ++++++++
 html/gestionReservation.php | 11 ++++++++---
 html/index.html             |  2 +-
 html/menu.php               |  2 ++
 html/reservation.php        | 63 +++++++++++++++++++++++++++++++--------------------------------
 7 files changed, 67 insertions(+), 36 deletions(-)
 create mode 100644 Python/client.py
 create mode 100644 Python/serveur.py
 create mode 100644 html/Python/client.py

diff --git a/Python/client.py b/Python/client.py
new file mode 100644
index 0000000..12ee50f
--- /dev/null
+++ b/Python/client.py
@@ -0,0 +1,8 @@
+import socket
+
+if __name__ == '__main__':
+	clientSocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM);
+	data = "Hello Server!";
+	clientSocket.sendto(data.encode(),("172.26.145.62",9090));
+	dataFromServer,sourceAddress = clientSocket.recvfrom(1024);
+	print(dataFromServer.decode());
diff --git a/Python/serveur.py b/Python/serveur.py
new file mode 100644
index 0000000..ec866f8
--- /dev/null
+++ b/Python/serveur.py
@@ -0,0 +1,9 @@
+import socket
+
+if __name__=='__main__':
+	server.Socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM);
+	serverSocket.bind(("172.26.145.62",9090)); # Adresse du serveur à modifer selon l'IP de la RASPBERRY (TODO : prendre un argument qui sera donné par le serveur Web)
+	while(True):
+			dataFromClient, sourceAddress = serverSocket.recvfrom(1024);
+			print("Data from %s is %s"%(sourceAddress,dataFromClient.decode()));
+			serverSocket.sendto("Hello Client!".encode(),sourceAddress);
diff --git a/html/Python/client.py b/html/Python/client.py
new file mode 100644
index 0000000..12ee50f
--- /dev/null
+++ b/html/Python/client.py
@@ -0,0 +1,8 @@
+import socket
+
+if __name__ == '__main__':
+	clientSocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM);
+	data = "Hello Server!";
+	clientSocket.sendto(data.encode(),("172.26.145.62",9090));
+	dataFromServer,sourceAddress = clientSocket.recvfrom(1024);
+	print(dataFromServer.decode());
diff --git a/html/gestionReservation.php b/html/gestionReservation.php
index ae3aff1..157befb 100644
--- a/html/gestionReservation.php
+++ b/html/gestionReservation.php
@@ -36,13 +36,18 @@
 				/* Verification de la syntaxe de la date */
 				$explosion_date = explode("-",$txtDate);
 				$jour = $explosion_date[2];
+				$mois = $explosion_date[1];
+				$annee = $explosion_date[0];
 				if($jour<10){
-					$jour = "0$jour";
-					$mois = $explosion_date[1];
-					$annee = $explosion_date[0];
+					$jour = "0$jour";	
+					$txtDate = "$annee-$mois-$jour";
+				}
+				if($mois<10){
+					$mois = "0$mois";
 					$txtDate = "$annee-$mois-$jour";
 				}
 			}	
+			echo $txtDate;
 		?>
 		
 		<form method="POST" action="gestionReservation.php"> 
diff --git a/html/index.html b/html/index.html
index 0549450..b6344f1 100644
--- a/html/index.html
+++ b/html/index.html
@@ -18,7 +18,7 @@
 				<div class="container">
 					<div class="row">
 						<div style="margin-top: 13rem!important; padding-left: 20rem!important; padding-right: 20rem!important;">
-							<div class="login-panel panel panel-default">
+							<div class="login-panel panel panel-default" style="background-color:white; padding:1em; border-radius:10px;">
 								<div class="panel-heading">
 									<!--Ajouter photo-->
 		 						</div>
diff --git a/html/menu.php b/html/menu.php
index 52c8ada..705b160 100644
--- a/html/menu.php
+++ b/html/menu.php
@@ -28,6 +28,8 @@
 				}else{
 					echo "<meta http-equiv=\"refresh\" content=\"0;url=index.html\">";
 				}
+				//$test = shell_exec('python3 Python/client.py');
+				//echo "Reponse : $test";
 			?>
 			<form method="POST" action="menu.php?deconnexion=true"> 
 				<button class="btn-lg btn-danger" type="submit">Deconnexion</button>
diff --git a/html/reservation.php b/html/reservation.php
index 8d39ac7..b22ae15 100644
--- a/html/reservation.php
+++ b/html/reservation.php
@@ -133,6 +133,34 @@
 				var xhttp = new XMLHttpRequest();
 				var params = "date="+realDate+"&banc="+realBanc;
 				console.log(params);
+				xhttp.onreadystatechange=function(){
+					if(xhttp.readyState==4){
+						// Si requete faite, on modifie les horaires non dispo
+						var elemId;
+						var texte=xhttp.responseText.split("-");
+						if(texte.length>1){
+							for(var i=0;i<texte.length-1;i++){
+								if(texte[i][0]==0){
+									elemId=texte[i][1];
+								}else{
+									elemId=texte[i][0]+texte[i][1];
+								}
+								var chgt = document.getElementById(elemId);
+								chgt.setAttribute('disabled','disabled');
+								chgt.style.color="red";
+							}
+						}else{
+							for(var i=0;i<24;i++){
+								var chgt = document.getElementById(i);
+								chgt.removeAttribute('disabled');
+								chgt.style.color="black";
+							}
+						}
+					}
+				}
+				xhttp.open('POST','dispoCreneau.php',true);
+				xhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
+				xhttp.send(params);
 				/* Enleve les creneaux deja passes dans la journee pour ne plus pouvoir les reserver */ 
 				var horaire = new Date();
 				var mois = parseInt(horaire.getMonth())+1;
@@ -152,46 +180,17 @@
 				console.log(realDate);
 				if(laDate==realDate){
 					var heure = horaire.getHours();
-						for(var i=0;i<parseInt(heure);i++){
+					for(var i=0;i<parseInt(heure);i++){
 						var chgt = document.getElementById(i);
-						chgt.disabled=true;
+						chgt.setAttribute('disabled','disabled');
 						console.log(chgt.value);
-						chgt.color="red";
+						chgt.style.color="red";
 					}
 					var chgt = document.getElementById(heure);
 					chgt.selected=true;
 					calcul_fin();
 				}
 				/* */
-				xhttp.onreadystatechange=function(){
-					if(xhttp.readyState==4){
-						// Si requete faite, on modifie les horaires non dispo
-						var elemId;
-						var texte=xhttp.responseText.split("-");
-						if(texte.length>1){
-							for(var i=0;i<texte.length-1;i++){
-								if(texte[i][0]==0){
-									elemId=texte[i][1];
-								}else{
-									elemId=texte[i][0]+texte[i][1];
-								}
-								var chgt = document.getElementById(elemId);
-								chgt.disabled=true;
-								chgt.style.color="red";
-							}
-						}else{
-							for(var i=0;i<24;i++){
-								var chgt = document.getElementById(i);
-								chgt.disabled=false;	
-								chgt.style.color="black";
-							}
-						}
-					}
-				}
-				
-				xhttp.open('POST','dispoCreneau.php',true);
-				xhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded');
-				xhttp.send(params);
 			}
 		</script>
 	</body>	
--
libgit2 0.21.2