From f7b531d3f4e318b4a6f7989aa99fc965b2eeafbf Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Tue, 23 Aug 2011 16:34:05 +0100
Subject: [PATCH] QSO Lists: If QSO is a satellite QSO then rather than display
 band the satellite name is shown

---
 application/models/logbook_model.php  | 6 +++---
 application/views/dashboard/index.php | 1 -
 application/views/qso/index.php       | 4 ++++
 application/views/view_log/index.php  | 4 ++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php
index 8e2f0b90..21707d12 100644
--- a/application/models/logbook_model.php
+++ b/application/models/logbook_model.php
@@ -75,7 +75,7 @@ class Logbook_model extends CI_Model {
 
 	/* Return last 10 QSOs */
 	function last_ten() {
-		$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');
+		$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');
 		$this->db->order_by("COL_TIME_ON", "desc");
 		$this->db->limit(10);
 		
@@ -139,14 +139,14 @@ 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');
+  $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');
   $this->db->order_by("COL_TIME_ON", "desc"); 
 	$query = $this->db->get($this->config->item('table_name'), $num, $offset);	
 	return $query;
   }
   
 	function get_last_qsos($num) {
-		$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');
+		$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');
 		$this->db->order_by("COL_TIME_ON", "desc"); 
 		$this->db->limit($num);
 		$query = $this->db->get($this->config->item('table_name'));
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 08dde741..df4bbb41 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -97,7 +97,6 @@
 
 	<?php $i = 0; 
  foreach ($last_five_qsos->result() as $row) { ?>
-
 		<?php  echo '<tr class="tr'.($i & 1).'">'; ?>
 		<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); ?></td>
 		<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 32a0b0c1..a45463f7 100644
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -70,7 +70,11 @@ function settime () {
 		<td><?php echo $row->COL_MODE; ?></td>
 		<td><?php echo $row->COL_RST_SENT; ?></td>
 		<td><?php echo $row->COL_RST_RCVD; ?></td>
+		<?php if($row->COL_SAT_NAME != null) { ?>
+		<td><?php echo $row->COL_SAT_NAME; ?></td>
+		<?php } else { ?>
 		<td><?php echo $row->COL_BAND; ?></td>
+		<?php } ?>
 	</tr>
 	<?php $i++; } ?>
 
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php
index 3c416c38..f7f5f307 100644
--- a/application/views/view_log/index.php
+++ b/application/views/view_log/index.php
@@ -52,7 +52,11 @@
 		<td><?php echo $row->COL_MODE; ?></td>
 		<td><?php echo $row->COL_RST_SENT; ?></td>
 		<td><?php echo $row->COL_RST_RCVD; ?></td>
+		<?php if($row->COL_SAT_NAME != null) { ?>
+		<td><?php echo $row->COL_SAT_NAME; ?></td>
+		<?php } else { ?>
 		<td><?php echo $row->COL_BAND; ?></td>
+		<?php } ?>
 		<td><?php echo $row->COL_COUNTRY; ?></td>
 		<td><?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?><a 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" /><?php } ?></a></td>
 	</tr>