From 8545e94c2976f149d92d224333870c05f90204cd Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sun, 18 Aug 2019 15:34:30 +0100
Subject: [PATCH] Shows contest strings on the logbook page

---
 application/models/Logbook_model.php       |  2 +-
 application/views/view_log/partial/log.php | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 4ea66410..92c118f4 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -465,7 +465,7 @@ class Logbook_model extends CI_Model {
 
 
   function get_qsos($num, $offset) {
-    $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME, COL_GRIDSQUARE, COL_QSL_RCVD, COL_EQSL_QSL_RCVD, COL_EQSL_QSL_SENT, COL_QSL_SENT, COL_STX_STRING, COL_SRX_STRING, COL_OPERATOR, COL_STATION_CALLSIGN, COL_LOTW_QSL_SENT, COL_LOTW_QSL_RCVD, COL_VUCC_GRIDS');
+    $this->db->select('COL_CALL, COL_BAND, COL_TIME_ON, COL_RST_RCVD, COL_RST_SENT, COL_MODE, COL_NAME, COL_COUNTRY, COL_PRIMARY_KEY, COL_SAT_NAME, COL_GRIDSQUARE, COL_QSL_RCVD, COL_EQSL_QSL_RCVD, COL_EQSL_QSL_SENT, COL_QSL_SENT, COL_STX, COL_STX_STRING, COL_SRX, COL_SRX_STRING, COL_OPERATOR, COL_STATION_CALLSIGN, COL_LOTW_QSL_SENT, COL_LOTW_QSL_RCVD, COL_VUCC_GRIDS');
     $this->db->order_by("COL_TIME_ON", "desc");
 
     $query = $this->db->get($this->config->item('table_name'), $num, $offset);
diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php
index 5c534eb3..62c19211 100644
--- a/application/views/view_log/partial/log.php
+++ b/application/views/view_log/partial/log.php
@@ -31,8 +31,15 @@
 			<?php } ?>
 			<td><a data-fancybox data-type="iframe" data-src="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>" href="javascript:;"><?php echo str_replace("0","&Oslash;",strtoupper($row->COL_CALL)); ?></a></td>
 			<td><?php echo $row->COL_MODE; ?></td>
-			<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX_STRING) { ?><span class="label"><?php echo $row->COL_STX_STRING;?></span><?php } ?></td>
-			<td><?php echo $row->COL_RST_RCVD; ?> <?php if ($row->COL_SRX_STRING) { ?><span class="label"><?php echo $row->COL_SRX_STRING;?></span><?php } ?></td>
+			<td><?php echo $row->COL_RST_SENT; ?> <?php if ($row->COL_STX) { ?><span class="badge badge-light"><?php echo $row->COL_STX;?></span><?php } ?><?php if ($row->COL_STX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_STX_STRING;?></span><?php } ?>
+
+			</td>
+			<td><?php echo $row->COL_RST_RCVD; ?> 
+			
+			<?php if ($row->COL_SRX) { ?><span class="badge badge-light"><?php echo $row->COL_SRX;?></span><?php } ?>
+			<?php if ($row->COL_SRX_STRING) { ?><span class="badge badge-light"><?php echo $row->COL_SRX_STRING;?></span><?php } ?>
+
+			</td>
 			<?php if($row->COL_SAT_NAME != null) { ?>
 			<td><?php echo $row->COL_SAT_NAME; ?></td>
 			<?php } else { ?>