From 87c1e9c30734461742a10af037201e027e67ff1f Mon Sep 17 00:00:00 2001
From: Schrolli <bastian@dieschrollis.de>
Date: Tue, 14 Jul 2015 11:01:15 +0200
Subject: [PATCH] edit in old_webend - more information in overview page with
 the mysql concat() method

---
 www/old_webend/tpl/content.overview.php  | 2 +-
 www/old_webend/tpl/template.overview.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/old_webend/tpl/content.overview.php b/www/old_webend/tpl/content.overview.php
index ad768c7..88a5f8c 100644
--- a/www/old_webend/tpl/content.overview.php
+++ b/www/old_webend/tpl/content.overview.php
@@ -2,7 +2,7 @@
 
 
 //read all
-$db->query("SELECT id, time, fms as data, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, ric as data, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC LIMIT 25");
+$db->query("SELECT id, time, concat(fms, ' Stat:', status, ' Dir:', directionText) as data, description, 'fms' AS typ FROM ".$tableFMS." UNION ALL SELECT id, time, zvei as data, description, 'zvei' AS typ FROM ".$tableZVEI." UNION ALL SELECT id, time, concat(ric, ' ', functionChar) as data, description, 'pocsag' AS typ FROM ".$tablePOC." ORDER BY time DESC LIMIT 25");
 $Rows = array();
 while ($daten = $db->fetchAssoc())
 {
diff --git a/www/old_webend/tpl/template.overview.php b/www/old_webend/tpl/template.overview.php
index 37ceb67..68b0f5b 100644
--- a/www/old_webend/tpl/template.overview.php
+++ b/www/old_webend/tpl/template.overview.php
@@ -1,11 +1,12 @@
 <div>
 	<b>Last data (max. 25)</b>
-	<table style="width: 600px;">
+	<table style="width: 800px;">
 		<tr class="tableHead">
 			<td>ID</td>
 			<td>Datum - Zeit</td>
 			<td>Typ</td>
 			<td>Daten</td>
+			<td>Beschreibung</td>
 			<td></td>
 		</tr>
 		<?php
@@ -20,6 +21,7 @@
 				echo "<td>". $time . "</td>";
 				echo "<td>". $lastAla['typ'] . "</td>";
 				echo "<td>". $lastAla['data'] . "</td>";
+				echo "<td>". $lastAla['description'] . "</td>";
 				echo "<td><a href='index.php?" . $lastAla['typ'] . "&id=" . $lastAla['id'] . "'><img src='gfx/lupe.png' alt='show'></a></td>";
 				echo "</tr>";
 			}