logauth
/
SMMP
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renommage bdd 'warehouse_module' -> 'module_merge'

This commit is contained in:
xdrm-brackets 2016-07-18 11:54:08 +02:00
parent 761af0ffa4
commit ad45612588
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manager/repo/warehouse.php
View File

@ -109,7 +109,7 @@
/* [1] On récupère les modules /* [1] On récupère les modules
=========================================================*/ =========================================================*/
$getModules = Database::getPDO()->prepare("SELECT m.name $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 WHERE wm.id_module = m.id_module
AND wm.id_warehouse = :id_warehouse AND wm.id_warehouse = :id_warehouse
ORDER BY m.name ASC"); ORDER BY m.name ASC");

26
test/client/interface.php
View File

@ -65,7 +65,25 @@
border-radius: 50% / 50%; border-radius: 50% / 50%;
border: 2px solid #111; 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{ #card-stack{
@ -165,8 +183,8 @@
<div id='machine-box'> <div id='machine-box'>
<div id='led'></div> <div id='led'></div>
<div id='r1'></div> <div id='r1'>r1</div>
<div id='r2'></div> <div id='r2'>r2</div>
</div> </div>
@ -198,6 +216,8 @@
/* (2) Elements du DOM */ /* (2) Elements du DOM */
var mBox = document.getElementById('machine-box'); var mBox = document.getElementById('machine-box');
var led = document.getElementById('led'); var led = document.getElementById('led');
var r1 = document.getElementById('r1');
var r2 = document.getElementById('r2');
var cBox = document.getElementById('card-stack'); var cBox = document.getElementById('card-stack');
var cAdd = document.getElementById('add-card'); var cAdd = document.getElementById('add-card');
var sync = document.getElementById('sync-button'); var sync = document.getElementById('sync-button');