diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index 225b37e4d..b2dbb1e4f 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -626,9 +626,7 @@
@@ -638,9 +636,7 @@
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index a8d9703f7..0bc4829f8 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -520,40 +520,50 @@ function echoQrbCalcLink($mygrid, $grid, $vucc, $isVisitor = false) {
- session->userdata('user_default_confirmation'),'C') !== false ) { ?>
+ session->userdata('user_default_confirmation'),'C') !== false ) { ?>
- COL_CLUBLOG_QSO_UPLOAD_STATUS == "Y") {
- echo 'title="'.__("Sent").($row->COL_CLUBLOG_QSO_UPLOAD_DATE != null ? " ".date($custom_date_format, strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE)) : '').'" data-bs-toggle="tooltip"';
- } elseif ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS == 'M') {
- echo 'title="'.__("Modified");
- if ($row->COL_CLUBLOG_QSO_UPLOAD_DATE != null) {
- echo " (".__("last sent")." ".date($custom_date_format, strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE)).")";
- }
- echo '" data-bs-toggle="tooltip" data-bs-html="true"';
- } elseif ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS == 'I') {
- echo 'title="'.__("Invalid (Ignore)").'" data-bs-toggle="tooltip"';
- }?> class="clublog-COL_CLUBLOG_QSO_UPLOAD_STATUS == 'Y') {
- echo 'green';
- } elseif ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS == 'M') {
- echo 'yellow';
- } elseif ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS == 'I') {
- echo 'grey';
- } else {
- echo 'red';
- } ?>">▲
- COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "Y") {
- echo "title=\"".__("Received");
- if ($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE != null) {
- $timestamp = strtotime($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE);
- echo " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
- }
- echo "\" data-bs-toggle=\"tooltip\"";
- } ?> class="clublog-COL_CLUBLOG_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">▼
+ COL_CLUBLOG_QSO_UPLOAD_DATE != null) {
+ $timestamp = date($custom_date_format, strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE));
+ }
+ switch ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS) {
+ case "Y":
+ echo "title=\"".__("Sent");
+ echo $timestamp != '' ? " ".$timestamp : '';
+ echo "\" data-bs-toggle=\"tooltip\" class=\"clublog-green\"";
+ break;
+ case "M":
+ echo 'title="'.__("Modified")." (".__("last sent")." ".date($custom_date_format, strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE)).")";
+ echo $timestamp != '' ? " ".$timestamp : '';
+ echo "\" data-bs-toggle=\"tooltip\" data-bs-html=\"true\" class=\"clublog-yellow\"";
+ break;
+ default:
+ echo " class=\"clublog-red\"";
+ break;
+ }
+ ?>>▲
+ COL_CLUBLOG_QSO_DOWNLOAD_STATUS != null && $row->COL_CLUBLOG_QSO_DOWNLOAD_DATE != null) {
+ $timestamp = date($custom_date_format, strtotime($row->COL_CLUBLOG_QSO_DOWNLOAD_DATE));
+ }
+ switch ($row->COL_CLUBLOG_QSO_DOWNLOAD_STATUS) {
+ case "Y":
+ echo "title=\"".__("Received");
+ echo $timestamp != '' ? " ".$timestamp : '';
+ echo "\" data-bs-toggle=\"tooltip\" class=\"clublog-green\"";
+ break;
+ case "I":
+ echo "title=\"".__("Invalid (Ignore)");
+ echo $timestamp != '' ? " ".$timestamp : '';
+ echo "\" data-bs-toggle=\"tooltip\" class=\"clublog-grey\"";
+ break;
+ default:
+ echo " class=\"clublog-red\"";
+ break;
+ }
+ ?>>▼
|
diff --git a/assets/css/color_impaired/overrides.css b/assets/css/color_impaired/overrides.css
index c98e8d4fb..21bde0a1b 100644
--- a/assets/css/color_impaired/overrides.css
+++ b/assets/css/color_impaired/overrides.css
@@ -52,6 +52,14 @@
color: #A95AA1 !important;
}
+.clublog-yellow {
+ color: #FFFF00 !important;
+}
+
+.clublog-grey {
+ color: #C0C0C0 !important;
+}
+
.qrz-green {
color: #F5793A !important;
}
@@ -97,4 +105,4 @@ span.grid-text-unworked > font {
span.grid-text-worked > font {
color: rgb(255, 255, 255) !important;
font-weight: 400 !important;
-}
\ No newline at end of file
+}
diff --git a/assets/css/general.css b/assets/css/general.css
index 0066ed66c..0a8e9f9c7 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -364,6 +364,11 @@ TD.clublog {
font-size: 1.1em;
}
+.clublog-grey {
+ color: #dddddd !important;
+ font-size: 1.1em;
+}
+
TD.dcl {
width: 33px;
white-space: nowrap;
diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php
index 5cc57b7a6..d78e1d0fb 100644
--- a/src/QSLManager/QSO.php
+++ b/src/QSLManager/QSO.php
@@ -557,8 +557,8 @@ class QSO
$timestamp = strtotime($data['COL_CLUBLOG_QSO_UPLOAD_DATE']);
$clublogstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
}
+
$clublogstring .= "\" data-bs-toggle=\"tooltip\"";
- $clublogstring .= ' class="clublog-green';
} elseif ($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] == "M") {
$clublogstring .= "title=\"".__("Modified");
@@ -566,16 +566,31 @@ class QSO
$timestamp = strtotime($data['COL_CLUBLOG_QSO_UPLOAD_DATE']);
$clublogstring .= "
(".__("last sent")." ".($timestamp!=''?date($custom_date_format, $timestamp):'').")";
}
+
$clublogstring .= "\" data-bs-toggle=\"tooltip\" data-bs-html=\"true\"";
- $clublogstring .= ' class="clublog-yellow';
- } else {
- $clublogstring .= ' class="clublog-red';
}
- $clublogstring.= '">▲▼';
-
+ $clublogstring .= '">▼';
return $clublogstring;
}
@@ -723,7 +737,6 @@ class QSO
return $qrzstring;
}
-
function getEqslString($data, $custom_date_format): string
{
$eqslstring = '