From 17cdf92d0b21af07aeb37f7f766a4d16d8bce489 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Mon, 18 Jul 2016 11:54:08 +0200
Subject: [PATCH] Renommage bdd 'warehouse_module' -> 'module_merge'

---
 manager/repo/warehouse.php |  2 +-
 test/client/interface.php  | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/manager/repo/warehouse.php b/manager/repo/warehouse.php
index ffc68fe..41c8c3a 100644
--- a/manager/repo/warehouse.php
+++ b/manager/repo/warehouse.php
@@ -109,7 +109,7 @@
 			/* [1] On récupère les modules
 			=========================================================*/
 			$getModules = Database::getPDO()->prepare("SELECT m.name
-				FROM warehouse_module as wm, module as m
+				FROM module_merge as wm, module as m
 				WHERE wm.id_module    = m.id_module
 				AND   wm.id_warehouse = :id_warehouse
 				ORDER BY m.name ASC");
diff --git a/test/client/interface.php b/test/client/interface.php
index 5e0025c..134d36b 100644
--- a/test/client/interface.php
+++ b/test/client/interface.php
@@ -65,7 +65,25 @@
 					border-radius: 50% / 50%;
 					border: 2px solid #111;
 
-					background: red;
+					background: #000;
+			}
+
+			#machine-box > #r1,
+			#machine-box > #r2{
+				position: absolute;
+					top: calc( 25% - 3em/2 );
+					left: 100%;
+					width: 4em;
+					height: 3em;
+
+					background: #000;
+
+					color: #ccc;
+					text-align: center;
+					line-height: 3em;
+			}
+			#machine-box > #r2{
+				top: calc( 50% - 3em/2 );
 			}
 
 			#card-stack{
@@ -165,8 +183,8 @@
 
 		<div id='machine-box'>
 			<div id='led'></div>
-			<div id='r1'></div>
-			<div id='r2'></div>
+			<div id='r1'>r1</div>
+			<div id='r2'>r2</div>
 		</div>
 
 
@@ -198,6 +216,8 @@
 			/* (2) Elements du DOM */
 			var mBox = document.getElementById('machine-box');
 			var led  = document.getElementById('led');
+			var r1   = document.getElementById('r1');
+			var r2   = document.getElementById('r2');
 			var cBox = document.getElementById('card-stack');
 			var cAdd = document.getElementById('add-card');
 			var sync = document.getElementById('sync-button');