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 @@