From 116d0ea2e13e133ce65047129491c405429f0e51 Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 25 Oct 2023 04:53:03 +0000 Subject: [PATCH 1/4] 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 54869606..cd8878bf 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 a9dbd0f9..1af5b3a1 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 ''; echo '
'; - echo '' . $qsl->COL_CALL . ''; + ?>COL_CALL)); ?> Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.cc' . $qsl->COL_CALL . ''; echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo ''; echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo ''; From 424a1e38c94ed4c2a212537215bc27dbe6e77a4a Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 25 Oct 2023 04:54:46 +0000 Subject: [PATCH 2/4] Removed commtened "Backup-Line" --- application/views/qslprint/qslprint.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index 1af5b3a1..e9d42747 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -44,7 +44,6 @@ if ($qsos->result() != NULL) { echo ''; echo '
'; ?>COL_CALL)); ?> Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.cc' . $qsl->COL_CALL . ''; echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo ''; echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo ''; From 47b090b283e9e79f6bf1dc4a62213d98d6173fe2 Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 25 Oct 2023 05:36:46 +0000 Subject: [PATCH 3/4] Add Detailview to QSLPrint-View --- application/views/qslprint/qslprint.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index e9d42747..d1c49589 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -13,6 +13,7 @@ if (empty($station_id)) { } if ($qsos->result() != NULL) { + echo '
'; echo ' @@ -43,7 +44,7 @@ if ($qsos->result() != NULL) { foreach ($qsos->result() as $qsl) { echo ''; echo ''; - ?>'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo ''; echo ''; echo ''; @@ -56,7 +57,7 @@ if ($qsos->result() != NULL) { echo ''; echo ''; } - echo '
COL_CALL)); ?> Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.ccCOL_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL)); ?>Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.cc'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '
'; + echo '
'; ?>

From f9e1b4b2b73a8d4421f8642de3033678381f8bcc Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 25 Oct 2023 05:44:46 +0000 Subject: [PATCH 4/4] Fixed MapBug at QSO-Detail --- application/views/qslprint/qslprint.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index d1c49589..bfe0b63e 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -44,7 +44,7 @@ if ($qsos->result() != NULL) { foreach ($qsos->result() as $qsl) { echo ''; echo '

'; - ?>COL_PRIMARY_KEY; ?>" href="javascript:;">COL_CALL)); ?>Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.ccCOL_CALL)); ?>Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on QRZ.com Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on HamQTH Lookup <?php echo strtoupper($qsl->COL_CALL); ?> on eQSL.cc'; $timestamp = strtotime($qsl->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo ''; echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo '';