From 44a9fd812bddd57e5db70db8a68385a35d4cb32e Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Fri, 21 Jul 2017 15:35:07 +0200
Subject: [PATCH] added the AP (access point) and IP address to machine
 database structure

---
 build/database/repo/machine.php     | 8 ++++++++
 build/viewer/view/machine/view.twig | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build/database/repo/machine.php b/build/database/repo/machine.php
index 1050b2b..16cf016 100755
--- a/build/database/repo/machine.php
+++ b/build/database/repo/machine.php
@@ -189,6 +189,8 @@
 				->select('name')
 				->select('token')
 				->select('unlock_code')
+				->select('ap')
+				->select('ip')
 				->orderby('id_machine', Rows::ORDER_ASC)
 				->unique()
 				->fetch();
@@ -233,6 +235,8 @@
 				->select('name')
 				->select('token')
 				->select('unlock_code')
+				->select('ap')
+				->select('ip')
 				->orderby('name', Rows::ORDER_ASC)
 				->unique()
 				->fetch();
@@ -277,6 +281,8 @@
 				->select('name')
 				->select('token')
 				->select('unlock_code')
+				->select('ap')
+				->select('ip')
 				->orderby('name', Rows::ORDER_ASC)
 				->unique()
 				->fetch();
@@ -314,6 +320,8 @@
 			$machine = Table::get('machine')
 				->whereIdWarehouse($id_warehouse)
 				->select('id_machine')
+				->select('ap')
+				->select('ip')
 				->orderby('name', Rows::ORDER_ASC)
 				->select('name');
 
diff --git a/build/viewer/view/machine/view.twig b/build/viewer/view/machine/view.twig
index 3f2033d..94cc93a 100755
--- a/build/viewer/view/machine/view.twig
+++ b/build/viewer/view/machine/view.twig
@@ -1,7 +1,7 @@
 <input type='text' class='searchbar' placeholder='Recherche'>
 
 {% 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='title' style='color: {{ p_theme }}'>{{ machine.name }} <span>#{{ machine.name }}</span></span>