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

added the AP (access point) and IP address to machine database structure

This commit is contained in:
xdrm-brackets 2017-07-21 15:35:07 +02:00
parent 676ecc5720
commit f49a54c43d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/database/repo/machine.php
View File

@ -189,6 +189,8 @@
->select('name') ->select('name')
->select('token') ->select('token')
->select('unlock_code') ->select('unlock_code')
->select('ap')
->select('ip')
->orderby('id_machine', Rows::ORDER_ASC) ->orderby('id_machine', Rows::ORDER_ASC)
->unique() ->unique()
->fetch(); ->fetch();
@ -233,6 +235,8 @@
->select('name') ->select('name')
->select('token') ->select('token')
->select('unlock_code') ->select('unlock_code')
->select('ap')
->select('ip')
->orderby('name', Rows::ORDER_ASC) ->orderby('name', Rows::ORDER_ASC)
->unique() ->unique()
->fetch(); ->fetch();
@ -277,6 +281,8 @@
->select('name') ->select('name')
->select('token') ->select('token')
->select('unlock_code') ->select('unlock_code')
->select('ap')
->select('ip')
->orderby('name', Rows::ORDER_ASC) ->orderby('name', Rows::ORDER_ASC)
->unique() ->unique()
->fetch(); ->fetch();
@ -314,6 +320,8 @@
$machine = Table::get('machine') $machine = Table::get('machine')
->whereIdWarehouse($id_warehouse) ->whereIdWarehouse($id_warehouse)
->select('id_machine') ->select('id_machine')
->select('ap')
->select('ip')
->orderby('name', Rows::ORDER_ASC) ->orderby('name', Rows::ORDER_ASC)
->select('name'); ->select('name');

2
build/viewer/view/machine/view.twig
View File

@ -1,7 +1,7 @@
<input type='text' class='searchbar' placeholder='Recherche'> <input type='text' class='searchbar' placeholder='Recherche'>
{% for machine in f_machines() %} {% for machine in f_machines() %}
<article class='inline-box' id='{{ machine.id_machine }}'> <article class='inline-box' id='{{ machine.id_machine }}' title='{{ machine.ap | default('?') }} ({{ machine.ip | default('?') }})'>
<span class='state' data-state='{{ f_getstate(machine.id_machine) }}'></span> <span class='state' data-state='{{ f_getstate(machine.id_machine) }}'></span>
<span class='title' style='color: {{ p_theme }}'>{{ machine.name }} <span>#{{ machine.name }}</span></span> <span class='title' style='color: {{ p_theme }}'>{{ machine.name }} <span>#{{ machine.name }}</span></span>