Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2577 from phl0/qslColors

Browse Source 
Refactor QSL colors for arrows
This commit is contained in:
Florian (DF2ET)
2025-11-27 14:19:23 +01:00
committed by GitHub
parent 34a0af4482 2f505a7ac7
commit f133e94c8d
5 changed files with 389 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/views/qso/edit_ajax.php
View File

@@ -598,7 +598,7 @@
</div>
</div>
</div>
<div class="tab-pane fade" id="dcl-edit" role="tabpanel" aria-labelledby="dcl-tab">
<div class="tab-pane fade" id="dcl-edit" role="tabpanel" aria-labelledby="dcl-tab">
<div class="mt-3 mb-3 row">
<label for="sent" class="col-sm-3 col-form-label"><?= __("Sent"); ?></label>
<div class="col-sm-9">
@@ -624,7 +624,7 @@
</div>
</div>
</div>
<div class="tab-pane fade" id="clublog-edit" role="tabpanel" aria-labelledby="clublog-tab">
<div class="tab-pane fade" id="clublog-edit" role="tabpanel" aria-labelledby="clublog-tab">
<div class="mt-3 mb-3 row">
<label for="sent" class="col-sm-3 col-form-label"><?= __("Sent"); ?></label>
<div class="col-sm-9">

303
application/views/view_log/partial/log_ajax.php
View File

@@ -356,14 +356,68 @@ function echoQrbCalcLink($mygrid, $grid, $vucc, $isVisitor = false) {
<?php } if (strpos($this->session->userdata('user_default_confirmation'),'E') !== false && ($this->session->userdata('user_eqsl_name') != "")){ ?>
<td class="eqsl">
<span <?php if ($row->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-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span>
<span <?php if ($row->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-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>">
<?php if($row->COL_EQSL_QSL_RCVD =='Y') { ?>
<a class="eqsl-green" href="<?php echo site_url("eqsl/image/".$row->COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">&#9660;</a>
<?php } else { ?>
&#9660;
<?php } ?>
</span>
<span <?php
$timestamp = '';
if ($row->COL_EQSL_QSLSDATE != null) {
$timestamp = date($custom_date_format, strtotime($row->COL_EQSL_QSLSDATE));
}
switch ($row->COL_EQSL_QSL_SENT) {
case "Y":
echo "title=\"".__("Sent");
echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" class=\"eqsl-green\"";
break;
case "I":
echo "title=\"".__("Invalid (Ignore)");
echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" class=\"eqsl-grey\"";
break;
case "R":
echo "title=\"".__("Requested");
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;
}
?>>&#9650;</span>
<span <?php
$timestamp = '';
if ($row->COL_EQSL_QSLRDATE != null) {
$timestamp = date($custom_date_format, strtotime($row->COL_EQSL_QSLRDATE));
}
switch ($row->COL_EQSL_QSL_RCVD) {
case "Y":
echo "title=\"".__("Received");
echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" class=\"eqsl-green\"";
break;
case "I":
echo "title=\"".__("Invalid (Ignore)");
echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" class=\"eqsl-grey\"";
break;
case "R":
echo "title=\"".__("Requested");
echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" class=\"eqsl-yellow\"";
break;
default:
echo " class=\"eqsl-red\"";
break;
}?>>
<?php if($row->COL_EQSL_QSL_RCVD =='Y') { ?>
<a class="eqsl-green" href="<?php echo site_url("eqsl/image/".$row->COL_PRIMARY_KEY); ?>" data-fancybox="images" data-width="528" data-height="336">&#9660;</a>
<?php } else { ?>
&#9660;
<?php } ?>
</span>
</td>
<?php } ?>
@@ -390,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;
@@ -424,85 +483,169 @@ function echoQrbCalcLink($mygrid, $grid, $vucc, $isVisitor = false) {
</td>
<?php } ?>
<?php if ( strpos($this->session->userdata('user_default_confirmation'),'Z') !== false && ($this->session->userdata('hasQrzKey') != "") ) { ?>
<?php if ( strpos($this->session->userdata('user_default_confirmation'),'Z') !== false && ($this->session->userdata('hasQrzKey') != "") ) { ?>
<td id="qrz_<?php echo $row->COL_PRIMARY_KEY; ?>" class="qrz">
<span <?php if ($row->COL_QRZCOM_QSO_UPLOAD_STATUS == "Y") { echo 'title="'.__("Sent").($row->COL_QRZCOM_QSO_UPLOAD_DATE != null ? " ".date($custom_date_format, strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE)) : '').'" data-bs-toggle="tooltip"'; } elseif ($row->COL_QRZCOM_QSO_UPLOAD_STATUS == 'M' && $row->COL_QRZCOM_QSO_UPLOAD_DATE != NULL) { echo 'title="'.__("Modified")."<br />(".__("last sent")." ".date($custom_date_format, strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE)).")".'" data-bs-toggle="tooltip" data-bs-html="true"'; } elseif ($row->COL_QRZCOM_QSO_UPLOAD_STATUS == 'I') { echo 'title="'.__("Invalid (Ignore)").'" data-bs-toggle="tooltip"'; }?> class="qrz-<?php if ($row->COL_QRZCOM_QSO_UPLOAD_STATUS == 'Y') { echo 'green'; } elseif ($row->COL_QRZCOM_QSO_UPLOAD_STATUS == 'M' && $row->COL_QRZCOM_QSO_UPLOAD_DATE != NULL) { echo 'yellow'; } elseif ($row->COL_QRZCOM_QSO_UPLOAD_STATUS == 'I') { echo 'grey'; } else { echo 'red'; } ?>">&#9650;</span>
<span <?php if ($row->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-<?php echo ($row->COL_QRZCOM_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">&#9660;</span>
<span <?php
$timestamp = '';
if ($row->COL_QRZCOM_QSO_UPLOAD_DATE != null) {
$timestamp = date($custom_date_format, strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE));
}
switch ($row->COL_QRZCOM_QSO_UPLOAD_STATUS) {
case "Y":
echo "title=\"".__("Sent");
echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" class=\"qrz-green\"";
break;
case "I":
echo "title=\"".__("Invalid (Ignore)");
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")."<br />(".__("last sent")." ".date($custom_date_format, strtotime($row->COL_QRZCOM_QSO_UPLOAD_DATE)).")";
echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" data-bs-html=\"true\" class=\"qrz-yellow\"";
break;
default:
echo " class=\"qrz-red\"";
break;
}
?>>&#9650;</span>
<span <?php
$timestamp = '';
if ($row->COL_QRZCOM_QSO_DOWNLOAD_STATUS != null && $row->COL_QRZCOM_QSO_DOWNLOAD_DATE != null) {
$timestamp = date($custom_date_format, strtotime($row->COL_QRZCOM_QSO_DOWNLOAD_DATE));
}
switch ($row->COL_QRZCOM_QSO_DOWNLOAD_STATUS) {
case "Y":
echo "title=\"".__("Received");
echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" class=\"qrz-green\"";
break;
case "I":
echo "title=\"".__("Invalid (Ignore)");
echo $timestamp != '' ? " ".$timestamp : '';
echo "\" data-bs-toggle=\"tooltip\" class=\"qrz-grey\"";
break;
default:
echo " class=\"qrz-red\"";
break;
}
?>>&#9660;</span>
</td>
<?php } ?>
<?php if ( strpos($this->session->userdata('user_default_confirmation'),'C') !== false ) { ?>
<?php if ( strpos($this->session->userdata('user_default_confirmation'),'C') !== false ) { ?>
<td class="clublog">
<span <?php
if ($row->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 "<br />(".__("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-<?php
if ($row->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';
} ?>">&#9650;</span>
<span <?php
if ($row->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-<?php
echo ($row->COL_CLUBLOG_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">&#9660;</span>
<span <?php
$timestamp = '';
if ($row->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 "I":
echo "title=\"".__("Invalid (Ignore)");
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")."<br />(".__("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;
}
?>>&#9650;</span>
<span <?php
$timestamp = '';
if ($row->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;
}
?>>&#9660;</span>
</td>
<?php }
if ( strpos($this->session->userdata('user_default_confirmation'),'D') !== false ) { ?>
<td class="dcl">
<span <?php
if ($row->COL_DCL_QSL_SENT == "Y") {
echo 'title="'.__("Sent").($row->COL_DCL_QSLSDATE != null ? " ".date($custom_date_format, strtotime($row->COL_DCL_QSLSDATE)) : '').'" data-bs-toggle="tooltip"';
} elseif ($row->COL_DCL_QSL_SENT == 'M') {
echo 'title="'.__("Modified");
if ($row->COL_DCL_QSLSDATE != null) {
echo "<br />(".__("last sent")." ".date($custom_date_format, strtotime($row->COL_DCL_QSLSDATE)).")";
}
echo '" data-bs-toggle="tooltip" data-bs-html="true"';
} elseif ($row->COL_DCL_QSL_SENT == 'I') {
echo 'title="'.__("Invalid (Ignore)").'" data-bs-toggle="tooltip"';
}?> class="dcl-<?php
<?php } ?>
if ($row->COL_DCL_QSL_SENT == 'Y') {
echo 'green';
} elseif ($row->COL_DCL_QSL_SENT == 'M') {
echo 'yellow';
} elseif ($row->COL_DCL_QSL_SENT == 'I') {
echo 'grey';
} else {
echo 'red';
} ?>">&#9650;</span>
<span <?php
if ($row->COL_DCL_QSL_RCVD == "Y") {
echo "title=\"".__("Received");
if ($row->COL_DCL_QSLRDATE != null) {
$timestamp = strtotime($row->COL_DCL_QSLRDATE);
echo " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
}
echo "\" data-bs-toggle=\"tooltip\"";
} ?> class="dcl-<?php
echo ($row->COL_DCL_QSL_RCVD=='Y')?'green':'red'?>">&#9660;</span>
</td>
<?php if ( strpos($this->session->userdata('user_default_confirmation'),'D') !== false ) { ?>
<td class="dcl">
<span <?php if ($row->COL_DCL_QSL_SENT != "N") {
switch ($row->COL_DCL_QSL_SENT) {
case "Y":
echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Sent");
break;
case "Q":
echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued");
break;
case "R":
echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested");
break;
case "I":
echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)");
break;
default:
echo "class=\"qsl-red";
break;
}
if ($row->COL_DCL_QSLSDATE != null) {
$timestamp = strtotime($row->COL_DCL_QSLSDATE); echo " " .($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
} else { echo "class=\"qsl-red"; }
echo "\">&#9650;</span>"; ?>
<span <?php if ($row->COL_DCL_QSL_RCVD != "N") {
switch ($row->COL_DCL_QSL_RCVD) {
case "Y":
echo "class=\"qsl-green\" data-bs-toggle=\"tooltip\" title=\"".__("Received");
break;
case "Q":
echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued");
break;
case "R":
echo "class=\"qsl-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested");
break;
case "I":
echo "class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)");
break;
default:
echo "class=\"qsl-red";
break;
}
if ($row->COL_DCL_QSLRDATE != null) {
$timestamp = strtotime($row->COL_DCL_QSLRDATE); echo " " .($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
} else { echo "class=\"qsl-red"; }
echo "\">&#9660;</span>"; ?>
</td>
<?php } ?>
<?php } ?>

18
assets/css/color_impaired/overrides.css
View File

@@ -12,6 +12,10 @@
color: #A95AA1 !important;
}
.eqsl-yellow {
color: #FFFF00 !important;
}
.eqsl-grey {
color: #C0C0C0 !important;
}
@@ -40,6 +44,10 @@
color: #A95AA1 !important;
}
.lotw-yellow {
color: #FFFF00 !important;
}
.lotw-grey {
color: #C0C0C0 !important;
}
@@ -52,6 +60,14 @@
color: #A95AA1 !important;
}
.clublog-yellow {
color: #FFFF00 !important;
}
.clublog-grey {
color: #C0C0C0 !important;
}
.qrz-green {
color: #F5793A !important;
}
@@ -97,4 +113,4 @@ span.grid-text-unworked > font {
span.grid-text-worked > font {
color: rgb(255, 255, 255) !important;
font-weight: 400 !important;
}
}

10
assets/css/general.css
View File

@@ -314,6 +314,11 @@ TD.eqsl {
font-size: 1.1em;
}
.eqsl-yellow {
color: #d39e00 !important;
font-size: 1.1em;
}
.eqsl-grey {
color: #dddddd !important;
font-size: 1.1em;
@@ -364,6 +369,11 @@ TD.clublog {
font-size: 1.1em;
}
.clublog-grey {
color: #dddddd !important;
font-size: 1.1em;
}
TD.dcl {
width: 33px;
white-space: nowrap;

208
src/QSLManager/QSO.php
View File

@@ -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 : '';
@@ -557,8 +561,24 @@ class QSO
$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'] == "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):'');
}
$clublogstring .= "\" data-bs-toggle=\"tooltip\"";
$clublogstring .= ' class="clublog-green';
} elseif ($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] == "M") {
$clublogstring .= "title=\"".__("Modified");
@@ -566,16 +586,35 @@ class QSO
$timestamp = strtotime($data['COL_CLUBLOG_QSO_UPLOAD_DATE']);
$clublogstring .= "<br />(".__("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.= '">&#9650;</span><span ';
$clublogstring .= ' class="clublog-';
if ($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] =='Y') {
$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 {
$clublogstring .= 'red';
}
$clublogstring .= '">&#9650;</span><span ';
if ($data['COL_CLUBLOG_QSO_DOWNLOAD_STATUS'] == "Y") {
$clublogstring .= "title=\"".__("Received");
if ($data['COL_CLUBLOG_QSO_DOWNLOAD_DATE'] != null) {
$timestamp = strtotime($data['COL_CLUBLOG_QSO_DOWNLOAD_DATE']);
$clublogstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
}
$clublogstring .= "\" data-bs-toggle=\"tooltip\"";
} elseif ($data['COL_CLUBLOG_QSO_DOWNLOAD_STATUS'] == "I") {
$clublogstring .= "title=\"".__("Invalid (Ignore)");
if ($data['COL_CLUBLOG_QSO_DOWNLOAD_DATE'] != null) {
$timestamp = strtotime($data['COL_CLUBLOG_QSO_DOWNLOAD_DATE']);
$clublogstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
@@ -584,15 +623,14 @@ class QSO
}
$clublogstring .= ' class="clublog-';
if ($data['COL_CLUBLOG_QSO_DOWNLOAD_STATUS']=='Y') {
$clublogstring.='green';
} elseif ($data['COL_CLUBLOG_QSO_DOWNLOAD_STATUS']=='M') {
$clublogstring.='yellow';
if ($data['COL_CLUBLOG_QSO_DOWNLOAD_STATUS'] =='Y') {
$clublogstring .= 'green';
} elseif ($data['COL_CLUBLOG_QSO_DOWNLOAD_STATUS'] == 'I') {
$clublogstring .= 'grey';
} else {
$clublogstring.='red';
$clublogstring .= 'red';
}
$clublogstring.='">&#9660;</span>';
$clublogstring .= '">&#9660;</span>';
return $clublogstring;
}
@@ -603,59 +641,59 @@ class QSO
function getDclString($data, $custom_date_format): string {
$dclstring = '<span ';
if ($data['COL_DCL_QSL_SENT'] == "Y") {
$dclstring .= "title=\"".__("Sent");
if ($data['COL_DCL_QSL_SENT'] != "N") {
switch ($data['COL_DCL_QSL_SENT']) {
case "Y":
$dclstring .= "class=\"qrz-green\" data-bs-toggle=\"tooltip\" title=\"".__("Sent");
break;
case "Q":
$dclstring .= "class=\"qrz-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued");
break;
case "R":
$dclstring .= "class=\"qrz-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested");
break;
case "I":
$dclstring .= "class=\"qrz-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)");
break;
default:
$dclstring .= "class=\"qrz-red";
break;
}
if ($data['COL_DCL_QSLSDATE'] != null) {
$timestamp = strtotime($data['COL_DCL_QSLSDATE']);
$dclstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
$dclstring .= " " .($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
$dclstring .= "\" data-bs-toggle=\"tooltip\"";
}
if ($data['COL_DCL_QSL_SENT'] == "M") {
$dclstring .= "title=\"".__("Modified");
if ($data['COL_DCL_QSLSDATE'] != null) {
$timestamp = strtotime($data['COL_DCL_QSLSDATE']);
$dclstring .= "<br />(".__("last sent")." ".($timestamp!=''?date($custom_date_format, $timestamp):'').")";
}
$dclstring .= "\" data-bs-toggle=\"tooltip\" data-bs-html=\"true\"";
}
if ($data['COL_DCL_QSL_SENT'] == "I") {
$dclstring .= "title=\"".__("Invalid (Ignore)");
$dclstring .= "\" data-bs-toggle=\"tooltip\"";
}
$dclstring .= ' class="qrz-';
if ($data['COL_DCL_QSL_SENT'] =='Y') {
$dclstring .= 'green';
} elseif ($data['COL_DCL_QSL_SENT'] == 'M') {
$dclstring .= 'yellow';
} elseif ($data['COL_DCL_QSL_SENT'] == 'I') {
$dclstring .= 'grey';
} else {
$dclstring .= 'red';
$dclstring .= "class=\"qrz-red";
}
$dclstring .= '">&#9650;</span><span ';
$dclstring .= '">&#9650;</span><span ';
if ($data['COL_DCL_QSL_RCVD'] == "Y") {
$dclstring .= "title=\"".__("Received");
if ($data['COL_DCL_QSLRDATE'] != null) {
$timestamp = strtotime($data['COL_DCL_QSLRDATE']);
$dclstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
if ($data['COL_DCL_QSL_RCVD'] != "N") {
switch ($data['COL_DCL_QSL_RCVD']) {
case "Y":
$dclstring .= "class=\"qrz-green\" data-bs-toggle=\"tooltip\" title=\"".__("Received");
break;
case "Q":
$dclstring .= "class=\"qrz-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Queued");
break;
case "R":
$dclstring .= "class=\"qrz-yellow\" data-bs-toggle=\"tooltip\" title=\"".__("Requested");
break;
case "I":
$dclstring .= "class=\"qrz-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)");
break;
default:
$dclstring .= "class=\"qrz-red";
break;
}
if ($data['COL_DCL_QSLRDATE'] != null) {
$timestamp = strtotime($data['COL_DCL_QSLRDATE']);
$dclstring .= " " .($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
} else {
$dclstring .= "class=\"qrz-red";
}
$dclstring .= "\" data-bs-toggle=\"tooltip\"";
}
$dclstring .= ' class="qrz-' . (($data['COL_DCL_QSL_RCVD']=='Y') ? 'green':'red') . '">&#9660;</span>';
$dclstring .= '</span>';
$dclstring .= '">&#9660;</span>';
return $dclstring;
}
@@ -671,9 +709,23 @@ class QSO
}
$qrzstring .= "\" data-bs-toggle=\"tooltip\"";
}
} elseif ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == "I") {
$qrzstring .= "title=\"".__("Invalid (Ignore)");
if ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == "M") {
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):'');
}
$qrzstring .= "\" data-bs-toggle=\"tooltip\"";
} elseif ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == "M") {
$qrzstring .= "title=\"".__("Modified");
if ($data['COL_QRZCOM_QSO_UPLOAD_DATE'] != null) {
@@ -684,18 +736,15 @@ class QSO
$qrzstring .= "\" data-bs-toggle=\"tooltip\" data-bs-html=\"true\"";
}
if ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == "I") {
$qrzstring .= "title=\"".__("Invalid (Ignore)");
$qrzstring .= "\" data-bs-toggle=\"tooltip\"";
}
$qrzstring .= ' class="qrz-';
if ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] =='Y') {
$qrzstring .= 'green';
} elseif ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == 'M') {
$qrzstring .= 'yellow';
} 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 {
$qrzstring .= 'red';
}
@@ -704,6 +753,14 @@ class QSO
if ($data['COL_QRZCOM_QSO_DOWNLOAD_STATUS'] == "Y") {
$qrzstring .= "title=\"".__("Received");
if ($data['COL_QRZCOM_QSO_DOWNLOAD_DATE'] != null) {
$timestamp = strtotime($data['COL_QRZCOM_QSO_DOWNLOAD_DATE']);
$qrzstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
}
$qrzstring .= "\" data-bs-toggle=\"tooltip\"";
} elseif ($data['COL_QRZCOM_QSO_DOWNLOAD_STATUS'] == "I") {
$qrzstring .= "title=\"".__("Invalid (Ignore)");
if ($data['COL_QRZCOM_QSO_DOWNLOAD_DATE'] != null) {
$timestamp = strtotime($data['COL_QRZCOM_QSO_DOWNLOAD_DATE']);
$qrzstring .= " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
@@ -711,14 +768,19 @@ class QSO
$qrzstring .= "\" data-bs-toggle=\"tooltip\"";
}
$qrzstring .= ' class="qrz-' . (($data['COL_QRZCOM_QSO_DOWNLOAD_STATUS']=='Y') ? 'green':'red') . '">&#9660;</span>';
$qrzstring .= '</span>';
$qrzstring .= ' class="qrz-';
if ($data['COL_QRZCOM_QSO_DOWNLOAD_STATUS'] =='Y') {
$qrzstring .= 'green';
} elseif ($data['COL_QRZCOM_QSO_DOWNLOAD_STATUS'] == 'I') {
$qrzstring .= 'grey';
} else {
$qrzstring .= 'red';
}
$qrzstring .= '">&#9660;</span>';
return $qrzstring;
}
function getEqslString($data, $custom_date_format): string
{
$eqslstring = '<span ';
@@ -735,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 : '';