From d09b9282fb6fe2c667bfe0eba1240e02a2e7d9a0 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Fri, 2 Jun 2023 17:09:02 +0200
Subject: [PATCH] Fix QSL marking functions

---
 application/views/search/search_result_ajax.php | 4 ++--
 application/views/view_log/partial/log_ajax.php | 4 ++--
 assets/js/sections/common.js                    | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php
index 60a25ddd..cc358d13 100644
--- a/application/views/search/search_result_ajax.php
+++ b/application/views/search/search_result_ajax.php
@@ -113,7 +113,7 @@ $ci =& get_instance();
                     $custom_date_format = $this->config->item('qso_date_format');
                 }
             ?>
-            <?php  echo '<tr class="tr'.($i & 1).'" id ="qso_'. $row->COL_PRIMARY_KEY .'">'; ?>
+            <?php  echo '<tr class="tr'.($i & 1).'" id="qso_'. $row->COL_PRIMARY_KEY .'">'; ?>
             <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date($custom_date_format, $timestamp); ?></td>
             <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
                 <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
@@ -207,7 +207,7 @@ $ci =& get_instance();
 				if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
 
                 <?php
-                  echo '<td style=\'text-align: center\' class="qsl">';
+                  echo '<td id="qsl_'.$row->COL_PRIMARY_KEY.'" style=\'text-align: center\' class="qsl">';
                   echo '<span ';
                   if ($row->COL_QSL_SENT != "N") {
                      if ($row->COL_QSLSDATE != null) {
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index 944fccdf..ab48725a 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -92,7 +92,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
                     // Get Default date format from /config/cloudlog.php
                     $custom_date_format = $this->config->item('qso_date_format');
                 }
-                echo '<tr class="tr'.($i & 1).'" id ="qso_'. $row->COL_PRIMARY_KEY .'">'; ?>
+                echo '<tr class="tr'.($i & 1).'" id="qso_'. $row->COL_PRIMARY_KEY .'">'; ?>
             <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date($custom_date_format, $timestamp); ?></td>
             <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
                 <td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
@@ -109,7 +109,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
                 echo_table_col($row, $this->session->userdata('user_column5'));
 			
 				if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
-                <td class="qsl">
+                <td id="qsl_<?php echo $row->COL_PRIMARY_KEY; ?>" class="qsl">
                 <span <?php if ($row->COL_QSL_SENT != "N") {
                        switch ($row->COL_QSL_SENT) {
                        case "Y":
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js
index 92caf191..1f9e764d 100644
--- a/assets/js/sections/common.js
+++ b/assets/js/sections/common.js
@@ -7,7 +7,7 @@ function qsl_rcvd(id, method) {
         },
         success: function(data) {
             if (data.message == 'OK') {
-                $("#qso_" + id).find("td:eq(8)").find("span:eq(1)").attr('class', 'qsl-green'); // Paints arrow green
+                $("#qsl_" + id).find("span:eq(1)").attr('class', 'qsl-green'); // Paints arrow green
                 $(".qsl_rcvd_" + id).remove(); // removes choice from menu
             }
             else {
@@ -26,7 +26,7 @@ function qsl_sent(id, method) {
         },
         success: function(data) {
             if (data.message == 'OK') {
-                $("#qso_" + id).find("td:eq(8)").find("span:eq(0)").attr('class', 'qsl-green'); // Paints arrow green
+                $("#qsl_" + id).find("span:eq(0)").attr('class', 'qsl-green'); // Paints arrow green
                 $(".qsl_sent_" + id).remove(); // removes choice from menu
             }
             else {
@@ -47,7 +47,7 @@ function qsl_requested(id, method) {
         },
         success: function(data) {
             if (data.message == 'OK') {
-                $("#qso_" + id).find("td:eq(8)").find("span:eq(0)").attr('class', 'qsl-yellow'); // Paints arrow green
+                $("#qsl_" + id).find("span:eq(0)").attr('class', 'qsl-yellow'); // Paints arrow yellow
             }
             else {
                 $(".bootstrap-dialog-message").append('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>You are not allowed to update QSL status!</div>');
@@ -67,7 +67,7 @@ function qsl_ignore(id, method) {
         },
         success: function(data) {
             if (data.message == 'OK') {
-                $("#qso_" + id).find("td:eq(8)").find("span:eq(0)").attr('class', 'qsl-grey'); // Paints arrow grey
+                $("#qsl_" + id).find("span:eq(0)").attr('class', 'qsl-grey'); // Paints arrow grey
             }
             else {
                 $(".bootstrap-dialog-message").append('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>You are not allowed to update QSL status!</div>');