From 5c61da5082347e1bef5e7c07e38427a2a2e40717 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sun, 20 May 2012 15:54:05 +0100
Subject: [PATCH] Added QSL card status icons to logbook view if logged in

---
 application/models/logbook_model.php |   2 +-
 application/views/view_log/index.php |  25 +++++++++++++++++++++++--
 images/icons/qslcard_in.png          | Bin 0 -> 416 bytes
 images/icons/qslcard_sent.png        | Bin 0 -> 391 bytes
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 images/icons/qslcard_in.png
 create mode 100644 images/icons/qslcard_sent.png

diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php
index 346a90bf..6801cbfe 100644
--- a/application/models/logbook_model.php
+++ b/application/models/logbook_model.php
@@ -196,7 +196,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');
+  $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');
   $this->db->order_by("COL_TIME_ON", "desc"); 
 	$query = $this->db->get($this->config->item('table_name'), $num, $offset);	
 	return $query;
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php
index ac5f0e03..12fdfac2 100644
--- a/application/views/view_log/index.php
+++ b/application/views/view_log/index.php
@@ -91,7 +91,10 @@
 			<td>Recv</td>
 			<td>Band</td>
 			<td>Country</td>
+			<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
 			<td></td>
+			<td></td>
+			<?php } ?>
 		</tr>
 		
 		<?php  $i = 0;  foreach ($results->result() as $row) { ?>
@@ -108,8 +111,26 @@
 			<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 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" />
-			<?php } ?></a></td>
+			<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
+			<td>
+				<?php
+					if($row->COL_QSL_RCVD == "Y" && $row->COL_QSL_SENT == "Y") 
+					{
+				?>
+					<img src="<?php echo base_url();?>images/icons/qslcard.png" alt="QSL Cards Both sent and received" title="QSL Cards Both sent and received" />
+				<?php
+					} elseif($row->COL_QSL_RCVD == "Y") {
+				?>
+					<img src="<?php echo base_url();?>images/icons/qslcard_in.png" alt="QSL Cards received" title="QSL Cards received" />
+				<?php
+					} elseif($row->COL_QSL_SENT == "Y") {
+				?>
+					<img src="<?php echo base_url();?>images/icons/qslcard_sent.png" alt="QSL Cards sent" title="QSL Cards sent" />
+				<?php } ?>
+			</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 } ?>
 		</tr>
 		<?php $i++; } ?>
 		
diff --git a/images/icons/qslcard_in.png b/images/icons/qslcard_in.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0ba4bdef81b9181fbb730e934cf6997c043b564
GIT binary patch
literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000dD000mO1^@s6&7<`>00009a7bBm000XU
z000XU0RWnu7ytkPQb|NXR45gF(mzYXKp4mIi&TSA9O^4@P*H^L6-00m2PX#?9Th=o
z2S>-Q{s9NUS0IX`gNuI<-#{oLF1`byQfn17{r<vTNXyZ{hv)L#^CWkdm?TL|o-roC
zG7hn#`~1Ad10;K|K@tnt!6Jsxb@`f9@P}U;b>DUQnp{IdrMI!*9uWjV#CQ!en8z@d
z5Hj~lyktKuqR9?{VTf&LLT_=}jCT>b14)}m=q+j*M+GW$%iFhk%|~j~@s?47PU{O#
zn8Ye>@B*FYD9#Y8Nrfk9;s75wM+0Nnf>uz28mns3GPI8i)Uk(eJDw$u;1qLMhqjV!
z_=oW|v`n3r9;T>!<u#ukPIlxZ^yQ~<g(FPi4WCdx`!n3~{z<;$82azD_GjpOX|K1a
zVgl(8p@tY6xI?;xo_KHPRi}FMh)o-P4KA0jGesI6;3oS;)fGGAh>iDg!&y220000<
KMNUMnLSTZ<sID&n

literal 0
HcmV?d00001

diff --git a/images/icons/qslcard_sent.png b/images/icons/qslcard_sent.png
new file mode 100644
index 0000000000000000000000000000000000000000..32b7f0f07270688f887922cdf9be08af2385cd0e
GIT binary patch
literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq000mG000jN1^@s6?Q>5r00009a7bBm000XU
z000XU0RWnu7ytkPIY~r8R45gdlCeqyK@>%2Oh_q$2GYBqAZTH!g@sM<18i)x5MmlF
z^doFVmmml>CVoH~6EvuWbqMMF14Ywp&Ru3?Om+hqIQwSbz3<KL%-AGJOy028ZlGB_
z&v_oB23b&0gBMWoNtQ>ssbb6(xObF^D{$xDE0c}>HNdn5uTY;d8gop(2iu{RHXvDm
zb7$BL4dEPp9XfCU1!)?q@CdiC92R8F@hrg=v>*Z#!$FpLR*sr|Xe{vfgaOPuhQ6S|
z<QLAMIBQjD^1vzlz!R8jkRr4fQC<@??U(-D``hXkj$K|#+`v8Jn&wU%5#Qhvc3kc+
zgkPYO(Di))zlx7dr^(}UZRY9meG`vB-TUATlTn&Hhwuemox%s`lNUj&M36V6X%BQ4
ls_+i!ExaMB<2=Opi(~mpDdoC3NaFwi002ovPDHLkV1iU9qHO>G

literal 0
HcmV?d00001