From b80aaf44589584cc0ce7eba3a00a32c51faf8044 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 22 May 2021 08:45:24 +0200
Subject: [PATCH] [QSLPrint] Added function for deleting QSOs from print queue.

---
 application/controllers/Qslprint.php          |  6 ++++
 application/models/Qslprint_model.php         | 16 +++++++++++
 application/views/interface_assets/footer.php | 28 +++++++++++++++++++
 application/views/qslprint/index.php          | 16 ++++++-----
 4 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/application/controllers/Qslprint.php b/application/controllers/Qslprint.php
index 39fa3326..e43d116d 100644
--- a/application/controllers/Qslprint.php
+++ b/application/controllers/Qslprint.php
@@ -114,6 +114,12 @@ class QSLPrint extends CI_Controller {
 
 			redirect('logbook');
 	}
+
+	public function delete_from_qsl_queue($id) {
+		$this->load->model('qslprint_model');
+
+		$this->qslprint_model->delete_from_qsl_queue($this->security->xss_clean($id));
+	}
 }
 
 /* End of file Qslprint.php */
diff --git a/application/models/Qslprint_model.php b/application/models/Qslprint_model.php
index 0ec74294..b6a65064 100644
--- a/application/models/Qslprint_model.php
+++ b/application/models/Qslprint_model.php
@@ -37,6 +37,22 @@ class Qslprint_model extends CI_Model {
 
 		return $query;
 	}
+
+	function delete_from_qsl_queue($id) {
+		$CI =& get_instance();
+		$CI->load->model('Stations');
+		$station_id = $CI->Stations->find_active();
+
+		$data = array(
+			'COL_QSL_SENT' => "N",
+		);
+
+		$this->db->where("COL_PRIMARY_KEY", $id);
+		//$this->db->where("station_id", $station_id);
+		$this->db->update($this->config->item('table_name'), $data);
+
+		return true;
+	}
 }
 
 ?>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 9ba26764..256b8f95 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2022,5 +2022,33 @@ function deleteQsl(id) {
 <?php if ($this->uri->segment(1) == "contesting" && $this->uri->segment(2) == "add") { ?>
 	<script src="<?php echo base_url() ;?>assets/js/sections/contestingnames.js"></script>
 <?php } ?>
+
+<?php if ($this->uri->segment(1) == "qslprint") { ?>
+	<script>
+		function deleteFromQslQueue(id) {
+			$.ajax({
+				url: baseURL + 'index.php/qslprint/delete_from_qsl_queue',
+				type: 'post',
+				data: {'id': id
+				},
+				success: function(html) {
+					BootstrapDialog.show({
+						title: 'QSO Data',
+						size: BootstrapDialog.SIZE_WIDE,
+						cssClass: 'qso-counties-dialog',
+						nl2br: false,
+						message: html,
+						buttons: [{
+							label: 'Close',
+							action: function (dialogItself) {
+								dialogItself.close();
+							}
+						}]
+					});
+				}
+			});
+		}
+	</script>
+<?php } ?>
   </body>
 </html>
diff --git a/application/views/qslprint/index.php b/application/views/qslprint/index.php
index a802138d..188b40dd 100644
--- a/application/views/qslprint/index.php
+++ b/application/views/qslprint/index.php
@@ -15,13 +15,15 @@
 	  <div class="card-header">
 	    Export Requested QSLs for Printing
 	  </div>
-	  <div class="card-body">
-		  <select name="station_profile" class="custom-select mb-2 mr-sm-2" style="width: 20%;">
-			  <option value="0">Select Station Profile</option>
-			  <?php foreach ($station_profile->result() as $station) { ?>
-				  <option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
-			  <?php } ?>
-		  </select>
+		<div class="card-body">
+			<form class="form" action="<?php echo site_url('adif/import'); ?>" method="post" enctype="multipart/form-data">
+				<select name="station_profile" class="custom-select mb-2 mr-sm-2" style="width: 20%;">
+					<option value="0">Select Station Profile</option>
+					<?php foreach ($station_profile->result() as $station) { ?>
+						<option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+					<?php } ?>
+				</select>
+			</form>
 
 	    <p class="card-text">Here you can export requested QSLs as CSV or ADIF files for printing and, optionally, mark them as sent via bureau.</p>
 	    <p class="card-text">Requested QSLs are any QSOs with a value of "Requested" or "Queued" in their "QSL Sent" field.</p>