From a06faec64ba54ee08740650c2bbc6822199daaf5 Mon Sep 17 00:00:00 2001
From: Adrien Vannson <adrien.vannson@ens-lyon.fr>
Date: Thu, 14 Oct 2021 22:09:36 +0200
Subject: [PATCH] Room research

---
 api/{salles.php => request.php} | 59 ++++++++++++++++-----------------
 index.html                      |  4 +--
 resources/script.js             | 20 +++++++++--
 3 files changed, 49 insertions(+), 34 deletions(-)
 rename api/{salles.php => request.php} (88%)

diff --git a/api/salles.php b/api/request.php
similarity index 88%
rename from api/salles.php
rename to api/request.php
index 9faaed2..48473aa 100644
--- a/api/salles.php
+++ b/api/request.php
@@ -11,79 +11,78 @@ include 'dbinit.php';
 
 
 if(isset($_GET["salle"])) {
-	
+
 	$idSalle = $_GET["salle"];
-	
+
 	$aliaz = array();
-	
+
 	$stmt = $conn->prepare("SELECT nom FROM salleAlias WHERE salleID=?");
 	$stmt->execute([$idSalle]);
 	$resA = $stmt->fetchAll();
-	
+
 	for($i=0;$i<count($resA);$i++)
 		$aliaz[$i] = $resA[$i]['nom'];
-	
+
 	$fichiers = array();
-	
+
 	$stmt = $conn->prepare("SELECT fichier FROM salleFichier WHERE salleID=?");
 	$stmt->execute([$idSalle]);
 	$resF = $stmt->fetchAll();
-	
+
 	for($i=0;$i<count($resF);$i++)
 		$fichiers[$i] = $resF[$i]['fichier'];
-	
+
 	$locataires = array();
-	
+
 	$stmt = $conn->prepare("SELECT personne FROM locataires WHERE salleID=?");
 	$stmt->execute([$idSalle]);
 	$resP = $stmt->fetchAll();
-	
+
 	for($i=0;$i<count($resP);$i++)
 		$locataires[$i] = $resP[$i]['personne'];
-	
-	
+
+
 	$stmt = $conn->prepare("SELECT id, description FROM salles WHERE id=?");
 	$stmt->execute([$idSalle]);
 	$resS = $stmt->fetchAll();
-	
-	
+
+
 	if(count($resS)==0){
 		echo "404";
 	}else {
 		$out = array("id" => $resS[0]["id"], "description" => $resS[0]["description"], "aliaz" => $aliaz, "locataires" => $locataires, "fichiers" => $fichiers);
 		echo (json_encode($out));
 	}
-	
-} else if (isset($_GET["salleNameSearch"])){
-	
-	$salleNameSearch = $_GET["salleNameSearch"];
-	
+
+} else if (isset($_GET["research"])) {
+	$research = $_GET["research"];
+
 	$stmt = $conn->prepare("SELECT salleID, nom FROM salleAlias  WHERE MATCH nom AGAINST (? IN BOOLEAN MODE)");
-	$stmt->execute([$salleNameSearch]);
+	$stmt->execute([$research]);
 	$res = $stmt->fetchAll();
-	
+
 	$out = array();
-	
+
 	for($i=0;$i<count($res);$i++)
-		$out[$i] = array("salleID" => $res[$i]['salleID'], "nom" => $res[$i]["nom"]);
-	
+		$out[$i] = array("id" => $res[$i]['salleID'], "name" => $res[$i]["nom"]);
+
 	echo (json_encode($out));
-	
+
 } else if (isset($_GET["salleLocSearch"])) {
 
 	$salleLocSearch = $_GET["salleLocSearch"];
-	
+
 	$stmt = $conn->prepare("SELECT salleID, personne FROM `locataires` WHERE MATCH personne AGAINST (? IN BOOLEAN MODE)");
 	$stmt->execute([$salleLocSearch]);
 	$res = $stmt->fetchAll();
-	
+
 	$out = array();
-	
+
 	for($i=0;$i<count($res);$i++)
 		$out[$i] = array("salleID" => $res[$i]['salleID'], "personne" => $res[$i]["personne"]);
-	
+
 	echo (json_encode($out));
-	
+
 }else {
 	echo "Je ne connais pas cette commande ...";
 }
diff --git a/index.html b/index.html
index 4597315..cd76a8a 100644
--- a/index.html
+++ b/index.html
@@ -112,14 +112,14 @@
           <hr/>
 
           <!-- Research results -->
-          <table class="table">
+          <table id="research-results-table" class="table" style="display:none;">
             <thead>
               <tr>
                 <th scope="col">Nom</th>
                 <th scope="col">Occupants</th>
               </tr>
             </thead>
-            <tbody>
+            <tbody id="research-results">
               <tr>
                 <th scope="row">Amphi B</th>
                 <td></td>
diff --git a/resources/script.js b/resources/script.js
index 6bc2476..9967323 100644
--- a/resources/script.js
+++ b/resources/script.js
@@ -12,9 +12,25 @@ function httpGetAsync(theUrl, callback)
 
 function researchRoom()
 {
-  let text = document.getElementById('research').value;
+  var research = document.getElementById('research').value;
 
-  
+  var xhr = new XMLHttpRequest();
+  xhr.open('GET', 'api/request.php?research='+encodeURI(research), true);
+
+  xhr.onload = function() {
+    var table = document.getElementById('research-results');
+    table.innerHTML = '';
+
+    document.getElementById('research-results-table').style.display = 'block';
+
+    res = JSON.parse(xhr.responseText);
+
+    for (var i=0; i<res.length; i++) {
+      table.innerHTML += '<tr><th scope="row">' + res[i].id + '</th><td>' + res[i].name + '</td></tr>';
+    }
+  };
+
+  xhr.send(null);
 }
 
 function putWaitNetworkScreen()