diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index 3766daf7d..1525af49f 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -214,8 +214,8 @@ function echo_table_col($row, $name) {
session->userdata('user_default_confirmation'),'E') !== false && ($this->session->userdata('user_eqsl_name') != "")){ ?>
- COL_EQSL_QSL_SENT == "Y") { echo "title=\"".__("eQSL")." ".__("Sent"); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲
- COL_EQSL_QSL_RCVD == "Y") { echo "title=\"".__("eQSL")." ".__("Received"); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">
+ COL_EQSL_QSL_SENT == "Y") { echo "title=\"".__("Sent"); if ($row->COL_EQSL_QSLSDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">▲
+ COL_EQSL_QSL_RCVD == "Y") { echo "title=\"".__("Received"); if ($row->COL_EQSL_QSLRDATE != null) { $timestamp = strtotime($row->COL_EQSL_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="eqsl-COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">
COL_EQSL_QSL_RCVD =='Y') { ?>
COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">▼
@@ -227,34 +227,52 @@ function echo_table_col($row, $name) {
session->userdata('user_default_confirmation'),'L') !== false && ($this->session->userdata('user_lotw_name') != "") ) { ?>
|
- COL_LOTW_QSL_SENT) {
+ COL_LOTW_QSLSDATE != null) {
+ $timestamp = date($custom_date_format, strtotime($row->COL_LOTW_QSLSDATE));
+ }
+ switch ($row->COL_LOTW_QSL_SENT) {
case "Y":
- echo "title=\"".__("LoTW")." ".__("Sent");
- if ($row->COL_LOTW_QSLSDATE != null) {
- $timestamp = strtotime($row->COL_LOTW_QSLSDATE);
- echo " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
- }
+ echo "title=\"".__("Sent");
+ echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\"";
break;
case "I":
- echo " class=\"lotw-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)")."\"";
+ echo "title=\"".__("Invalid (Ignore)");
+ echo $timestamp != '' ? " ".$timestamp : '';
+ echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-grey\"";
+ break;
+ case "R":
+ echo "title=\"".__("Requested");
+ echo $timestamp != '' ? " ".$timestamp : '';
+ echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-yellow\"";
break;
default:
echo " class=\"lotw-red\"";
break;
}
?>>▲
- COL_LOTW_QSL_RCVD) {
+ COL_LOTW_QSLRDATE != null) {
+ $timestamp = date($custom_date_format, strtotime($row->COL_LOTW_QSLRDATE));
+ }
+ switch ($row->COL_LOTW_QSL_RCVD) {
case "Y":
- echo "title=\"".__("LoTW")." ".__("Received");
- if ($row->COL_LOTW_QSLRDATE != null) {
- $timestamp = strtotime($row->COL_LOTW_QSLRDATE);
- echo " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
- }
+ echo "title=\"".__("Received");
+ echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\"";
break;
case "I":
- echo " class=\"lotw-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)")."\"";
+ echo "title=\"".__("Invalid (Ignore)");
+ echo $timestamp != '' ? " ".$timestamp : '';
+ echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-grey\"";
+ break;
+ case "R":
+ echo "title=\"".__("Requested");
+ echo $timestamp != '' ? " ".$timestamp : '';
+ echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-yellow\"";
break;
default:
echo " class=\"lotw-red\"";
@@ -266,16 +284,16 @@ function echo_table_col($row, $name) {
session->userdata('user_default_confirmation'),'Z') !== false && ($this->session->userdata('hasQrzKey') != "") ) { ?>
|
- COL_QRZCOM_QSO_UPLOAD_STATUS == "Y") { echo "title=\"QRZ ".__("Sent"); if ($row->COL_QRZCOM_QSO_UPLOAD_DATE != null) { $timestamp = strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="qrz-COL_QRZCOM_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">▲
- COL_QRZCOM_QSO_DOWNLOAD_STATUS == "Y") { echo "title=\"QRZ ".__("Received"); if ($row->COL_QRZCOM_QSO_DOWNLOAD_DATE != null) { $timestamp = strtotime($row->COL_QRZCOM_QSO_DOWNLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="qrz-COL_QRZCOM_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">▼
+ COL_QRZCOM_QSO_UPLOAD_STATUS == "Y") { echo "title=\"".__("Sent"); if ($row->COL_QRZCOM_QSO_UPLOAD_DATE != null) { $timestamp = strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="qrz-COL_QRZCOM_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">▲
+ COL_QRZCOM_QSO_DOWNLOAD_STATUS == "Y") { echo "title=\"".__("Received"); if ($row->COL_QRZCOM_QSO_DOWNLOAD_DATE != null) { $timestamp = strtotime($row->COL_QRZCOM_QSO_DOWNLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="qrz-COL_QRZCOM_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">▼
|
session->userdata('user_default_confirmation'),'C') !== false ) { ?>
- COL_CLUBLOG_QSO_UPLOAD_STATUS == "Y") { echo "title=\"Clublog ".__("Sent"); if ($row->COL_CLUBLOG_QSO_UPLOAD_DATE != null) { $timestamp = strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="clublog-COL_CLUBLOG_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">▲
- COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "Y") { echo "title=\"Clublog ".__("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_STATUS == "Y") { echo "title=\"".__("Sent"); if ($row->COL_CLUBLOG_QSO_UPLOAD_DATE != null) { $timestamp = strtotime($row->COL_CLUBLOG_QSO_UPLOAD_DATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="clublog-COL_CLUBLOG_QSO_UPLOAD_STATUS=='Y')?'green':'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'?>">▼
|
diff --git a/assets/css/general.css b/assets/css/general.css
index 2e59fa8af..0dd274458 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -409,6 +409,11 @@ TD.lotw {
font-size: 1.1em;
}
+.lotw-yellow {
+ color: #d39e00 !important;
+ font-size: 1.1em;
+}
+
.qso-edit-box {
padding: 10px;
}
@@ -1041,4 +1046,4 @@ label {
.uppercase {
text-transform: uppercase;
-}
\ No newline at end of file
+}
diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php
index c7d4137ee..3e524dead 100644
--- a/src/QSLManager/QSO.php
+++ b/src/QSLManager/QSO.php
@@ -363,15 +363,22 @@ class QSO
$lotwstring = '▲▲