From 36ef1f60db2b7f263ba4d4bd2989dc64be968a38 Mon Sep 17 00:00:00 2001
From: Guillaume <grouille@pc.home>
Date: Tue, 17 Mar 2020 23:34:20 +0100
Subject: [PATCH] MAJ site

---
 site/accesBase.php     |  4 ++--
 site/add.php           |  2 +-
 site/addSensor.php     | 13 ++++++++++++-
 site/ansibleSensor.php | 41 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 site/ansibleSensor.php

diff --git a/site/accesBase.php b/site/accesBase.php
index 944867e..2a79116 100644
--- a/site/accesBase.php
+++ b/site/accesBase.php
@@ -207,7 +207,7 @@
 		return (int)$tab['version'];
 	}
 
-	function add($nom, $type, $raspberry, $numero, $unite)
+	function add($nom, $type, $raspberry, $numero, $unite, $version)
 	{
 		$db = connexion();
 		$query = "SELECT * FROM capteurs WHERE nom = '$nom' OR (raspberry = '$raspberry' AND numero = '$numero')";
@@ -217,7 +217,7 @@
 		}
 		else
 		{
-			$query = "INSERT INTO capteurs VALUES($numero, '$nom', '$raspberry', '$type', 0, '$unite')";
+			$query = "INSERT INTO capteurs VALUES($numero, '$nom', '$raspberry', '$type', 0, '$unite', $version)";
 			$result = pg_query($db, $query) or die("La requête a echoué : ".pg_last_error());
 			if (pg_affected_rows($result)!=0){
 			   return True;
diff --git a/site/add.php b/site/add.php
index 5d0fe14..b5d5129 100644
--- a/site/add.php
+++ b/site/add.php
@@ -20,7 +20,7 @@ session_start();
                 			<br/>
                 			<h1 style="margin-bottom:50px; margin-top:50px; border-bottom:1px solid #CCC; padding-bottom:20px;"><i class="fas fa-history"></i> Historique</h1>
 					<?php
-						if(add($_POST['nom'], $_POST['type'], $_POST['raspberry'], $_POST['numero'], $_POST['unite']))
+						if(add($_POST['nom'], $_POST['type'], $_POST['raspberry'], $_POST['numero'], $_POST['unite'], $_POST['version']))
 					{
 						?>
 						<div class="alert alert-success" role="alert">
diff --git a/site/addSensor.php b/site/addSensor.php
index 10f6a75..79621a5 100644
--- a/site/addSensor.php
+++ b/site/addSensor.php
@@ -29,7 +29,18 @@
 						<td><label for="unite">Unite de mesure : </label></td>
 						<td><input type="text" id="unite" name="unite" /></td>
 					</tr>
-					
+
+					<tr>
+						<td><label for="version">Version : </lavel></td>
+						<td>
+							<select id="version" name="version">
+								<option value=0 selected>Arduino USB</option>
+								<option value=1>Arduino SPI</option>
+								<option value=2>Nucléo USB</option>
+							</select>
+						</td>
+					</tr>
+
 					<tr>
 						<td></td>
 						<td><input type="submit" class="btn btn-dark" value="Ajouter le capteur"/></td>
diff --git a/site/ansibleSensor.php b/site/ansibleSensor.php
new file mode 100644
index 0000000..9be7bd9
--- /dev/null
+++ b/site/ansibleSensor.php
@@ -0,0 +1,41 @@
+$ini = "";
+$arduino_simple = "[Arduino_init]\r\n";
+$arduino_spi = "[Arduino_spi_init]\r\n";
+$nucleo = "[Nucleo_init]\r\n";
+
+
+
+foreach($_POST['sensor'] as $sensor => $value)
+{
+	$version = -1;
+	$val = explode(":", $value);
+	
+	if(count($types)<>0 && !in_array($val[2], $types)) {$err = true;}
+	else {$types[] = $val[2];}
+
+	$version = getSensorVersion($val[0], $val[1]);
+	if($version == 0)
+	{
+		$a_simple = true;
+		$arduino_simple = $arduino_simple.$val[0]." capteur=".$val[1]."\n";
+	}
+	elseif($version == 1)
+	{
+		$a_spi = true;
+		$arduino_spi = $arduino_spi.$val[0]." capteur=".$val[1]."\n";
+	}
+	elseif($version == 2)
+	{
+		$n = true;
+		$nucleo = $nucleo.$val[0]." capteur=".$val[1]."\n";
+	}
+}
+
+if($a_simple) {$ini = $ini.$arduino_simple."\n";}
+if($a_spi) {$ini = $ini.$arduino_spi."\n";}
+if($n) {$ini = $ini.$nucleo."\n";}
+
+if(!$err)
+{
+	file_put_contents('upload/inventaire.ini', $ini);
+}
\ No newline at end of file
--
libgit2 0.21.2