From 2f505a7ac74949cedc107fba1eeeb48dd66fabb8 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 27 Nov 2025 13:42:28 +0100 Subject: [PATCH] Align colors for requested --- .../views/view_log/partial/log_ajax.php | 20 +++++++++++++ src/QSLManager/QSO.php | 28 +++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 7f7952b27..0a8d01b3a 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -377,6 +377,11 @@ function echoQrbCalcLink($mygrid, $grid, $vucc, $isVisitor = false) { echo $timestamp != '' ? " ".$timestamp : ''; echo "\" data-bs-toggle=\"tooltip\" class=\"eqsl-yellow\""; break; + case "Q": + echo "title=\"".__("Queued"); + echo $timestamp != '' ? " ".$timestamp : ''; + echo "\" data-bs-toggle=\"tooltip\" class=\"eqsl-yellow\""; + break; default: echo " class=\"eqsl-red\""; break; @@ -439,6 +444,11 @@ function echoQrbCalcLink($mygrid, $grid, $vucc, $isVisitor = false) { echo $timestamp != '' ? " ".$timestamp : ''; echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-yellow\""; break; + case "Q": + echo "title=\"".__("Queued"); + echo $timestamp != '' ? " ".$timestamp : ''; + echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-yellow\""; + break; default: echo " class=\"lotw-red\""; break; @@ -491,6 +501,11 @@ function echoQrbCalcLink($mygrid, $grid, $vucc, $isVisitor = false) { echo $timestamp != '' ? " ".$timestamp : ''; echo "\" data-bs-toggle=\"tooltip\" class=\"qrz-grey\""; break; + case "Q": + echo "title=\"".__("Queued"); + echo $timestamp != '' ? " ".$timestamp : ''; + echo "\" data-bs-toggle=\"tooltip\" class=\"qrz-yellow\""; + break; case "M": echo 'title="'.__("Modified")."
(".__("last sent")." ".date($custom_date_format, strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE)).")"; echo $timestamp != '' ? " ".$timestamp : ''; @@ -543,6 +558,11 @@ function echoQrbCalcLink($mygrid, $grid, $vucc, $isVisitor = false) { echo $timestamp != '' ? " ".$timestamp : ''; echo "\" data-bs-toggle=\"tooltip\" class=\"clublog-grey\""; break; + case "Q": + echo "title=\"".__("Queued"); + echo $timestamp != '' ? " ".$timestamp : ''; + echo "\" data-bs-toggle=\"tooltip\" class=\"clublog-yellow\""; + break; case "M": echo 'title="'.__("Modified")."
(".__("last sent")." ".date($custom_date_format, strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE)).")"; echo $timestamp != '' ? " ".$timestamp : ''; diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index 24882bbc9..999dffbf0 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -508,6 +508,10 @@ class QSO $lotwstring .= "title=\"" . __("Invalid (Ignore)"); $lotwstring .= $timestamp != '' ? " ".$timestamp : ''; $lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-grey\""; + } elseif ($data['COL_LOTW_QSL_SENT'] == "Q") { + $lotwstring .= "title=\"" . __("Queued"); + $lotwstring .= $timestamp != '' ? " ".$timestamp : ''; + $lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-yellow\""; } elseif ($data['COL_LOTW_QSL_SENT'] == "R") { $lotwstring .= "title=\"" . __("Requested"); $lotwstring .= $timestamp != '' ? " ".$timestamp : ''; @@ -562,6 +566,14 @@ class QSO } elseif ($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] == "I") { $clublogstring .= "title=\"".__("Invalid (Ignore)"); + if ($data['COL_CLUBLOG_QSO_UPLOAD_DATE'] != null) { + $timestamp = strtotime($data['COL_CLUBLOG_QSO_UPLOAD_DATE']); + $clublogstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):''); + } + $clublogstring .= "\" data-bs-toggle=\"tooltip\""; + } elseif ($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] == "Q") { + $clublogstring .= "title=\"".__("Queued"); + if ($data['COL_CLUBLOG_QSO_UPLOAD_DATE'] != null) { $timestamp = strtotime($data['COL_CLUBLOG_QSO_UPLOAD_DATE']); $clublogstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):''); @@ -583,6 +595,8 @@ class QSO $clublogstring .= 'green'; } elseif ($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] == 'I') { $clublogstring .= 'grey'; + } elseif ($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] == 'Q') { + $clublogstring .= 'yellow'; } elseif ($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] == 'M') { $clublogstring .= 'yellow'; } else { @@ -698,6 +712,14 @@ class QSO } elseif ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == "I") { $qrzstring .= "title=\"".__("Invalid (Ignore)"); + if ($data['COL_QRZCOM_QSO_UPLOAD_DATE'] != null) { + $timestamp = strtotime($data['COL_QRZCOM_QSO_UPLOAD_DATE']); + $qrzstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):''); + } + $qrzstring .= "\" data-bs-toggle=\"tooltip\""; + } elseif ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == "Q") { + $qrzstring .= "title=\"".__("Queued"); + if ($data['COL_QRZCOM_QSO_UPLOAD_DATE'] != null) { $timestamp = strtotime($data['COL_QRZCOM_QSO_UPLOAD_DATE']); $qrzstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):''); @@ -719,6 +741,8 @@ class QSO $qrzstring .= 'green'; } elseif ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == 'I') { $qrzstring .= 'grey'; + } elseif ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == 'Q') { + $qrzstring .= 'yellow'; } elseif ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == 'M') { $qrzstring .= 'yellow'; } else { @@ -773,6 +797,10 @@ class QSO $eqslstring .= "title=\"" . __("Invalid (Ignore)"); $eqslstring .= $timestamp != '' ? " ".$timestamp : ''; $eqslstring .= "\" data-bs-toggle=\"tooltip\" class=\"eqsl-grey\""; + } elseif ($data['COL_EQSL_QSL_SENT'] == "Q") { + $eqslstring .= "title=\"" . __("Queued"); + $eqslstring .= $timestamp != '' ? " ".$timestamp : ''; + $eqslstring .= "\" data-bs-toggle=\"tooltip\" class=\"eqsl-yellow\""; } elseif ($data['COL_EQSL_QSL_SENT'] == "R") { $eqslstring .= "title=\"" . __("Requested"); $eqslstring .= $timestamp != '' ? " ".$timestamp : '';