From 54c31a6b3f943a9fef7d92b09b3f0451b2d3e4ba Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Mon, 26 Dec 2022 16:29:28 +0100
Subject: [PATCH] [QSLPrint] Added the display of qsl sent via

---
 application/views/qslprint/index.php    | 65 +++----------------------
 application/views/qslprint/qslprint.php | 45 +++++++++++------
 2 files changed, 37 insertions(+), 73 deletions(-)

diff --git a/application/views/qslprint/index.php b/application/views/qslprint/index.php
index b8250c57..2d9c4401 100644
--- a/application/views/qslprint/index.php
+++ b/application/views/qslprint/index.php
@@ -29,63 +29,12 @@
 	    <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>
 
-		  <?php
-		  echo '<div class="resulttable">';
-		  if ($qsos->result() != NULL) {
-			  echo '<table style="width:100%" class="table table-sm table-bordered table-hover table-striped table-condensed">
-        <thead>
-        <tr>
-        <th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
-        <th style=\'text-align: center\'>' . $this->lang->line('general_word_date') . '</th>
-        <th style=\'text-align: center\'>'. $this->lang->line('general_word_time') .'</th>
-        <th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_mode') . '</th>
-        <th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_band') . '</th>
-        <th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_qsl') . ' ' . $this->lang->line('general_word_qslcard_via') . '</th>
-        <th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_station') . '</th>
-        <th style=\'text-align: center\'></th>
-        <th style=\'text-align: center\'></th>
-        </tr>
-        </thead><tbody>';
-
-			  // Get Date format
-			  if($this->session->userdata('user_date_format')) {
-				  // If Logged in and session exists
-				  $custom_date_format = $this->session->userdata('user_date_format');
-			  } else {
-				  // Get Default date format from /config/cloudlog.php
-				  $custom_date_format = $this->config->item('qso_date_format');
-			  }
-
-			  foreach ($qsos->result() as $qsl) {
-				  echo '<tr id="qslprint_'.$qsl->COL_PRIMARY_KEY.'">';
-				  echo '<td style=\'text-align: center\'>' . $qsl->COL_CALL . '</td>';
-				  echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo '</td>';
-				  echo '<td style=\'text-align: center\'>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo '</td>';
-				  echo '<td style=\'text-align: center\'>'; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '</td>';
-				  echo '<td style=\'text-align: center\'>'; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo '</td>';
-				  echo '<td style=\'text-align: center\'>' . $qsl->COL_QSL_VIA . '</td>';
-				  echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qsl->station_callsign . '</span></td>';
-				  echo '<td style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger">Delete from queue</button></td>';
-				  echo '<td style=\'text-align: center\'><button onclick="openQsoList(\''.$qsl->COL_CALL.'\')" class="btn btn-sm btn-success">Open QSO list</button></td>';
-				  echo '</tr>';
-			  }
-
-			  echo '</tbody></table>';
-			  ?>
-
-			  <p><a href="<?php echo site_url('qslprint/exportcsv/all'); ?>" title="Export CSV-file" target="_blank" class="btn btn-primary">Export requested QSLs to CSV-file</a></p>
-
-			  <p><a href="<?php echo site_url('qslprint/exportadif/all'); ?>" title="Export ADIF" target="_blank" class="btn btn-primary">Export requested QSLs to ADIF-file</a></p>
-
-			  <p><a href="<?php echo site_url('qslprint/qsl_printed/all'); ?>" title="Mark QSLs as printed" target="_blank" class="btn btn-primary">Mark requested QSLs as sent</a></p>
-
-			<?php
-		  } else {
-			  echo '<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>No QSL\'s to print were found!</div>';
-		  }
-		  ?>
-
+		<div class="resulttable">
+		<?php 
+			$data2['qsos'] = $qsos;
+			$this->load->view('qslprint/qslprint', $data2); 
+		?>
+			</div>
 		</div>
-	  </div>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php
index 8c7a4bcf..0198e6f8 100644
--- a/application/views/qslprint/qslprint.php
+++ b/application/views/qslprint/qslprint.php
@@ -1,19 +1,33 @@
 <?php
+
+function echo_qsl_sent_via($method) {
+	switch($method) {
+		case 'B': echo 'Bureau'; break;
+		case 'D': echo 'Direct'; break;
+		case 'E': echo 'Electronic'; break;
+	}
+}
+
+if (empty($station_id)) {
+	$station_id = 'all';
+}
+
 if ($qsos->result() != NULL) {
 	echo '<table style="width:100%" class="table table-sm table-bordered table-hover table-striped table-condensed">
-	<thead>
-	<tr>
-	<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('general_word_date') . '</th>
-	<th style=\'text-align: center\'>'. $this->lang->line('general_word_time') .'</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_mode') . '</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_band') . '</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_qsl') . ' ' . $this->lang->line('general_word_qslcard_via') . '</th>
-	<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_station') . '</th>
-	<th style=\'text-align: center\'></th>
-	<th style=\'text-align: center\'></th>
-	</tr>
-	</thead><tbody>';
+<thead>
+<tr>
+<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_callsign').'</th>
+<th style=\'text-align: center\'>' . $this->lang->line('general_word_date') . '</th>
+<th style=\'text-align: center\'>'. $this->lang->line('general_word_time') .'</th>
+<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_mode') . '</th>
+<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_band') . '</th>
+<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_qsl') . ' ' . $this->lang->line('general_word_qslcard_via') . '</th>
+<th style=\'text-align: center\'>' . $this->lang->line('gen_hamradio_station') . '</th>
+<th style=\'text-align: center\'>Sent method</th>
+<th style=\'text-align: center\'>Delete</th>
+<th style=\'text-align: center\'>QSO List</th>
+</tr>
+</thead><tbody>';
 
 	// Get Date format
 	if($this->session->userdata('user_date_format')) {
@@ -33,8 +47,9 @@ if ($qsos->result() != NULL) {
 		echo '<td style=\'text-align: center\'>'; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo '</td>';
 		echo '<td style=\'text-align: center\'>' . $qsl->COL_QSL_VIA . '</td>';
 		echo '<td style=\'text-align: center\'><span class="badge badge-light">' . $qsl->station_callsign . '</span></td>';
-		echo '<td style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger">Delete from queue</button></td>';
-		echo '<td style=\'text-align: center\'><button onclick="openQsoList(\''.$qsl->COL_CALL.'\')" class="btn btn-sm btn-success">Open QSO list</button></td>';
+		echo '<td style=\'text-align: center\'>'; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo '</td>';
+		echo '<td style=\'text-align: center\'><button onclick="deleteFromQslQueue(\''.$qsl->COL_PRIMARY_KEY.'\')" class="btn btn-sm btn-danger"><i class="fas fa-trash-alt"></i></button></td>';
+		echo '<td style=\'text-align: center\'><button onclick="openQsoList(\''.$qsl->COL_CALL.'\')" class="btn btn-sm btn-success"><i class="fas fa-search"></i></button></td>';
 		echo '</tr>';
 	}