From 116d0ea2e13e133ce65047129491c405429f0e51 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Wed, 25 Oct 2023 04:53:03 +0000
Subject: [PATCH] Added sorting like printing and callbook-lookup to Label-List

---
 application/models/Qslprint_model.php   | 16 ++++++++++++++--
 application/views/qslprint/qslprint.php |  3 ++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/application/models/Qslprint_model.php b/application/models/Qslprint_model.php
index 548696067..cd8878bf8 100644
--- a/application/models/Qslprint_model.php
+++ b/application/models/Qslprint_model.php
@@ -79,7 +79,13 @@ class Qslprint_model extends CI_Model {
 		// always filter user. this ensures that even if the station_id is from another user no inaccesible QSOs will be returned
 		$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
 		$this->db->where_in('COL_QSL_SENT', array('R', 'Q'));
-		$this->db->order_by("COL_TIME_ON", "DESC");
+		$this->db->order_by("COL_DXCC", "ASC");
+        	$this->db->order_by("COL_CALL", "ASC");
+        	$this->db->order_by("COL_SAT_NAME", "ASC");
+        	$this->db->order_by("COL_SAT_MODE", "ASC");
+        	$this->db->order_by("COL_BAND_RX", "ASC");
+        	$this->db->order_by("COL_TIME_ON", "ASC");
+        	$this->db->order_by("COL_MODE", "ASC");
 		$query = $this->db->get($this->config->item('table_name'));
 
 		return $query;
@@ -133,7 +139,13 @@ class Qslprint_model extends CI_Model {
 		$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
 		$this->db->where('COL_CALL like "%'.$callsign.'%"');
 		$this->db->where('coalesce(COL_QSL_SENT, "") not in ("R", "Q")');
-		$this->db->order_by("COL_TIME_ON", "DESC");
+		$this->db->order_by("COL_DXCC", "ASC");
+        	$this->db->order_by("COL_CALL", "ASC");
+        	$this->db->order_by("COL_SAT_NAME", "ASC");
+        	$this->db->order_by("COL_SAT_MODE", "ASC");
+        	$this->db->order_by("COL_BAND_RX", "ASC");
+        	$this->db->order_by("COL_TIME_ON", "ASC");
+        	$this->db->order_by("COL_MODE", "ASC");
 		$query = $this->db->get($this->config->item('table_name'));
 
 		return $query;
diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php
index a9dbd0f9b..1af5b3a1c 100644
--- a/application/views/qslprint/qslprint.php
+++ b/application/views/qslprint/qslprint.php
@@ -43,7 +43,8 @@ if ($qsos->result() != NULL) {
 	foreach ($qsos->result() as $qsl) {
 		echo '<tr id="qslprint_'.$qsl->COL_PRIMARY_KEY.'">';
 		echo '<td style=\'text-align: center\'><div class="form-check"><input class="form-check-input" type="checkbox" /></div></td>';
-		echo '<td style=\'text-align: center\'>' . $qsl->COL_CALL . '</td>';
+                ?><td style='text-align: center'><b><?php echo str_replace("0","&Oslash;",strtoupper($qsl->COL_CALL)); ?></b> <a target="_blank" href="https://www.qrz.com/db/<?php echo strtoupper($qsl->COL_CALL); ?>"><img width="16" height="16" src="<?php echo base_url(); ?>images/icons/qrz.png" alt="Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com"></a> <a target="_blank" href="https://www.hamqth.com/<?php echo strtoupper($qsl->COL_CALL); ?>"><img width="16" height="16" src="<?php echo base_url(); ?>images/icons/hamqth.png" alt="Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH"></a> <a target="_blank" href="http://www.eqsl.cc/Member.cfm?<?php echo strtoupper($qsl->COL_CALL); ?>"><img width="16" height="16" src="<?php echo base_url(); ?>images/icons/eqsl.png" alt="Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.cc"></a></td><?php 
+		//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>';