From 7dbf66c3a9910f34d613065d42b2e22e6d1b7653 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Tue, 6 Aug 2013 23:24:23 +0100
Subject: [PATCH] if callsign_tags is set to true in config.php the logbook
 page displays what callsign made the qso based on col_operator or
 col_station_callsign

---
 application/models/logbook_model.php | 2 +-
 application/views/view_log/index.php | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php
index ad068558..71610c04 100644
--- a/application/models/logbook_model.php
+++ b/application/models/logbook_model.php
@@ -272,7 +272,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_QSL_SENT, COL_STX_STRING, COL_SRX_STRING');
+    $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_QSL_SENT, COL_STX_STRING, COL_SRX_STRING, COL_OPERATOR, COL_STATION_CALLSIGN');
     $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/index.php b/application/views/view_log/index.php
index 2ae6af80..0c7869a8 100644
--- a/application/views/view_log/index.php
+++ b/application/views/view_log/index.php
@@ -134,6 +134,13 @@
 			</td>
 			<td><a class="editbox" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" ><img src="<?php echo base_url(); ?>/images/application_edit.png" width="16" height="16" alt="Edit" />
 			</a></td>
+			<?php if($this->config->item('callsign_tags') == true) { ?>
+				<?php if($row->COL_STATION_CALLSIGN	 != null) { ?>
+				<td><span class="label notice"><?php echo $row->COL_STATION_CALLSIGN; ?></span></td>
+				<?php } elseif($row->COL_OPERATOR != null) { ?>
+				<td><span class="label notice"><?php echo $row->COL_OPERATOR; ?></span></td>
+				<?php } ?>
+			<?php } ?>
 			<?php } ?>
 		</tr>
 		<?php $i++; } ?>