From 126ab6b1eb434e00134429f0df8594a5e0b1d015 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sun, 28 Aug 2011 14:51:57 +0100
Subject: [PATCH] Added option to delete a qso when in the Edit QSO area"

---
 application/controllers/qso.php      |   9 +++++++++
 application/models/logbook_model.php |   5 +++++
 application/views/qso/edit.php       |   5 +++--
 application/views/view_log/index.php |   3 ++-
 images/delete.png                    | Bin 0 -> 715 bytes
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 images/delete.png

diff --git a/application/controllers/qso.php b/application/controllers/qso.php
index a47841ed..413e7bae 100644
--- a/application/controllers/qso.php
+++ b/application/controllers/qso.php
@@ -84,6 +84,15 @@ class QSO extends CI_Controller {
 			$this->session->set_flashdata('notice', 'Record Updated');
 			redirect('logbook');
 		}
+	}
+	
+	/* Delete QSO */
+	function delete($id) {
+		$this->load->model('logbook_model');
 		
+		$this->logbook_model->delete($id);
+		
+		$this->session->set_flashdata('notice', 'QSO Deleted Successfully');
+		redirect('logbook');
 	}
 }
diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php
index f243d4d5..910ea3c5 100644
--- a/application/models/logbook_model.php
+++ b/application/models/logbook_model.php
@@ -300,6 +300,11 @@ class Logbook_model extends CI_Model {
 
 		return array('query' => $query, 'results' => $results, 'time' => $time);
 	}
+    
+    function delete($id) {
+        $this->db->where('COL_PRIMARY_KEY', $id);
+        $this->db->delete($this->config->item('table_name')); 
+    }
 }
 
 ?>
diff --git a/application/views/qso/edit.php b/application/views/qso/edit.php
index a3ad8be4..eca88cbc 100644
--- a/application/views/qso/edit.php
+++ b/application/views/qso/edit.php
@@ -1,7 +1,9 @@
 <h2>Add QSO</h2>
 <div class="wrap_content note">
 <?php echo validation_errors(); ?>
-
+<div style="float: right">
+	<p><a href="<?php echo site_url('qso/delete'); ?>/<?php echo $COL_PRIMARY_KEY; ?>" ><img src="<?php echo base_url(); ?>/images/delete.png" width="16" height="16" alt="Delete" /> Delete QSO</a></p>
+</div>
 <form method="post" action="<?php echo site_url('qso/edit'); ?>" name="qsos">
 <table>
 	<tr>
@@ -112,5 +114,4 @@
 <div><input type="submit" value="Submit" /></div>
 
 </form>
-
 </div>
diff --git a/application/views/view_log/index.php b/application/views/view_log/index.php
index f7f5f307..c37f026d 100644
--- a/application/views/view_log/index.php
+++ b/application/views/view_log/index.php
@@ -58,7 +58,8 @@
 		<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>
+		<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>
 	<?php $i++; } ?>
 	
diff --git a/images/delete.png b/images/delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..08f249365afd29594b51210c6e21ba253897505d
GIT binary patch
literal 715
zcmV;+0yO=JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!T}ebiR5;6}
zllx0kVHn5#Tecsf1c`2hgi%nK^D=kV+T5njvrLa$EMjSnone|mjm2E}L#U;8)yiKo
zO>C4}Mrzlg<+1Y8PEBfUp0jJpx4B>@E+cy3`^(Gw`Mf+2&yxZm<$to~Vpgvg&QKNR
z_f#1(r6svZt%iF?s+n<8X?B&!h3g9Dbb8_=MX}!;HiQSAh`bp^WMl~Z-44teO7W_Y
zV4thSL{h;rJY7!l3%5J4H1!tIzB`Dv+YxO(haWeausGZYkI8^hWj6mzo=L0{%;<E2
z80_Y*w_}NMA$su)e0B@`wrYegSP*HT5w@N{_}&f79VIb*XrKGBY>yxzh{5!Htr?51
zvG|W62MzC8BZ76hRpCyO2zOn<%e)K>NHge!-~)Ap33OdWw6hsLYbCxGNt0%wk_2z7
zfyYvXheSG)5HRK1VB~%mq7Dmurw#bi@hEcOr3&G1ZiF*$M=&9nB#VNf&Q^r$4G5kp
zTURh&s)E0%5&hyVD}sp<72~zmAY`Y(9aqO6CXF%=zFHGzO-A&I(pE}v70YQxCPJ{Y
z4L+?5-crdLn3ZRPEs!A4ehEY3ZRpL~w9>@aMN+{F4dI@v&>(QDHQum!mG~E^$OS8l
z!7?%Uwib*ROP67Hw`ika)gX-(<Pal@1N`)16#~~<@x7jghg9OTS^;mJ8T{oIOsMnG
zla<QHU?S-#Kb7w%o*dlEj!JgnOSKW+hV$`!syc>8Ia`-u_IEhxG7U<13kSsMW+$<e
xd62)I>lbb2dUMm5p6pa}cjgA+U$^mJ^AjD?&bdi)8~y+Q002ovPDHLkV1g8IMc@Dc

literal 0
HcmV?d00001