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

Add color for LoTW Requested state and remove redundant wording

Browse Source
This commit is contained in:
phl0
2024-07-26 14:23:14 +02:00
parent b7f6d3c341
commit 9cf3385a2d
3 changed files with 74 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,8 +214,8 @@ function echo_table_col($row, $name) {
<?php } if (strpos($this->session->userdata('user_default_confirmation'),'E') !== false && ($this->session->userdata('user_eqsl_name') != "")){ ?> <?php } if (strpos($this->session->userdata('user_default_confirmation'),'E') !== false && ($this->session->userdata('user_eqsl_name') != "")){ ?>
<td class="eqsl"> <td class="eqsl">
<span <?php if ($row->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-<?php echo ($row->COL_EQSL_QSL_SENT=='Y')?'green':'red'?>">&#9650;</span> <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=\"".__("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-<?php echo ($row->COL_EQSL_QSL_RCVD=='Y')?'green':'red'?>"> <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') { ?> <?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> <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 { ?> <?php } else { ?>
@@ -227,34 +227,52 @@ function echo_table_col($row, $name) {
<?php if ( strpos($this->session->userdata('user_default_confirmation'),'L') !== false && ($this->session->userdata('user_lotw_name') != "") ) { ?> <?php if ( strpos($this->session->userdata('user_default_confirmation'),'L') !== false && ($this->session->userdata('user_lotw_name') != "") ) { ?>
<td class="lotw"> <td class="lotw">
<span <?php switch ($row->COL_LOTW_QSL_SENT) { <span <?php
$timestamp = '';
if ($row->COL_LOTW_QSLSDATE != null) {
$timestamp = date($custom_date_format, strtotime($row->COL_LOTW_QSLSDATE));
}
switch ($row->COL_LOTW_QSL_SENT) {
case "Y": case "Y":
echo "title=\"".__("LoTW")." ".__("Sent"); echo "title=\"".__("Sent");
if ($row->COL_LOTW_QSLSDATE != null) { echo $timestamp != '' ? " ".$timestamp : '';
$timestamp = strtotime($row->COL_LOTW_QSLSDATE);
echo " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
}
echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\""; echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\"";
break; break;
case "I": 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; break;
default: default:
echo " class=\"lotw-red\""; echo " class=\"lotw-red\"";
break; break;
} }
?>>&#9650;</span> ?>>&#9650;</span>
<span <?php switch ($row->COL_LOTW_QSL_RCVD) { <span <?php
$timestamp = '';
if ($row->COL_LOTW_QSLRDATE != null) {
$timestamp = date($custom_date_format, strtotime($row->COL_LOTW_QSLRDATE));
}
switch ($row->COL_LOTW_QSL_RCVD) {
case "Y": case "Y":
echo "title=\"".__("LoTW")." ".__("Received"); echo "title=\"".__("Received");
if ($row->COL_LOTW_QSLRDATE != null) { echo $timestamp != '' ? " ".$timestamp : '';
$timestamp = strtotime($row->COL_LOTW_QSLRDATE);
echo " ".($timestamp!=''?date($custom_date_format, $timestamp):'');
}
echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\""; echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\"";
break; break;
case "I": 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; break;
default: default:
echo " class=\"lotw-red\""; echo " class=\"lotw-red\"";
@@ -266,16 +284,16 @@ function echo_table_col($row, $name) {
<?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 class="qrz"> <td class="qrz">
<span <?php if ($row->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-<?php echo ($row->COL_QRZCOM_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">&#9650;</span> <span <?php if ($row->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-<?php echo ($row->COL_QRZCOM_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">&#9650;</span>
<span <?php if ($row->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-<?php echo ($row->COL_QRZCOM_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">&#9660;</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>
</td> </td>
<?php } ?> <?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"> <td class="clublog">
<span <?php if ($row->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-<?php echo ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">&#9650;</span> <span <?php if ($row->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-<?php echo ($row->COL_CLUBLOG_QSO_UPLOAD_STATUS=='Y')?'green':'red'?>">&#9650;</span>
<span <?php if ($row->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-<?php echo ($row->COL_CLUBLOG_QSO_DOWNLOAD_STATUS=='Y')?'green':'red'?>">&#9660;</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>
</td> </td>
<?php } ?> <?php } ?>

7
assets/css/general.css
View File

@@ -409,6 +409,11 @@ TD.lotw {
font-size: 1.1em; font-size: 1.1em;
} }
.lotw-yellow {
color: #d39e00 !important;
font-size: 1.1em;
}
.qso-edit-box { .qso-edit-box {
padding: 10px; padding: 10px;
} }
@@ -1041,4 +1046,4 @@ label {
.uppercase { .uppercase {
text-transform: uppercase; text-transform: uppercase;
} }

47
src/QSLManager/QSO.php
View File

@@ -363,15 +363,22 @@ class QSO
$lotwstring = '<span '; $lotwstring = '<span ';
$timestamp = '';
if ($data['COL_LOTW_QSLSDATE'] != null) {
$timestamp = date($custom_date_format, strtotime($data['COL_LOTW_QSLSDATE']));
}
if ($data['COL_LOTW_QSL_SENT'] == "Y") { if ($data['COL_LOTW_QSL_SENT'] == "Y") {
$lotwstring .= "title=\"" . __("LoTW")." ".__("Sent"); $lotwstring .= "title=\"" . __("Sent");
if ($data['COL_LOTW_QSLSDATE'] != null) { $lotwstring .= $timestamp != '' ? " ".$timestamp : '';
$timestamp = strtotime($data['COL_LOTW_QSLSDATE']);
$lotwstring .= " ". ($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
$lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\""; $lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\"";
} elseif ($data['COL_LOTW_QSL_SENT'] == "I") { } elseif ($data['COL_LOTW_QSL_SENT'] == "I") {
$lotwstring .= "class=\"lotw-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)")."\""; $lotwstring .= "title=\"" . __("Invalid (Ignore)");
$lotwstring .= $timestamp != '' ? " ".$timestamp : '';
$lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-grey\"";
} elseif ($data['COL_LOTW_QSL_SENT'] == "R") {
$lotwstring .= "title=\"" . __("Requested");
$lotwstring .= $timestamp != '' ? " ".$timestamp : '';
$lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-yellow\"";
} else { } else {
$lotwstring .= "class=\"lotw-red\""; $lotwstring .= "class=\"lotw-red\"";
} }
@@ -379,16 +386,22 @@ class QSO
$lotwstring .= '>&#9650;</span>'; $lotwstring .= '>&#9650;</span>';
$lotwstring .= '<span '; $lotwstring .= '<span ';
$timestamp = '';
if ($data['COL_LOTW_QSLRDATE'] != null) {
$timestamp = date($custom_date_format, strtotime($data['COL_LOTW_QSLRDATE']));
}
if ($data['COL_LOTW_QSL_RCVD'] == "Y") { if ($data['COL_LOTW_QSL_RCVD'] == "Y") {
$lotwstring .= "title=\"". __("LoTW") ." ". __("Received"); $lotwstring .= "title=\"". __("Received");
$lotwstring .= $timestamp != '' ? " ".$timestamp : '';
if ($data['COL_LOTW_QSLRDATE'] != null) {
$timestamp = strtotime($data['COL_LOTW_QSLRDATE']);
$lotwstring .= " ". ($timestamp != '' ? date($custom_date_format, $timestamp) : '');
}
$lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\""; $lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\"";
} elseif ($data['COL_LOTW_QSL_RCVD'] == "I") { } elseif ($data['COL_LOTW_QSL_RCVD'] == "I") {
$lotwstring .= "class=\"lotw-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)")."\""; $lotwstring .= "title=\"" . __("Invalid (Ignore)");
$lotwstring .= $timestamp != '' ? " ".$timestamp : '';
$lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-grey\"";
} elseif ($data['COL_LOTW_QSL_RCVD'] == "R") {
$lotwstring .= "title=\"" . __("Requested");
$lotwstring .= $timestamp != '' ? " ".$timestamp : '';
$lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-yellow\"";
} else { } else {
$lotwstring .= "class=\"lotw-red\""; $lotwstring .= "class=\"lotw-red\"";
} }
@@ -407,7 +420,7 @@ class QSO
$clublogstring = '<span '; $clublogstring = '<span ';
if ($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] == "Y") { if ($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] == "Y") {
$clublogstring .= "title=\"".__("Clublog")." ".__("Sent"); $clublogstring .= "title=\"".__("Sent");
if ($data['COL_CLUBLOG_QSO_UPLOAD_DATE'] != null) { if ($data['COL_CLUBLOG_QSO_UPLOAD_DATE'] != null) {
$timestamp = strtotime($data['COL_CLUBLOG_QSO_UPLOAD_DATE']); $timestamp = strtotime($data['COL_CLUBLOG_QSO_UPLOAD_DATE']);
@@ -420,7 +433,7 @@ class QSO
$clublogstring .= ' class="clublog-' . (($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] =='Y') ? 'green':'red') . '">&#9650;</span><span '; $clublogstring .= ' class="clublog-' . (($data['COL_CLUBLOG_QSO_UPLOAD_STATUS'] =='Y') ? 'green':'red') . '">&#9650;</span><span ';
if ($data['COL_CLUBLOG_QSO_DOWNLOAD_STATUS'] == "Y") { if ($data['COL_CLUBLOG_QSO_DOWNLOAD_STATUS'] == "Y") {
$clublogstring .= "title=\"".__("Clublog")." ".__("Received"); $clublogstring .= "title=\"".__("Received");
if ($data['COL_CLUBLOG_QSO_DOWNLOAD_DATE'] != null) { if ($data['COL_CLUBLOG_QSO_DOWNLOAD_DATE'] != null) {
$timestamp = strtotime($data['COL_CLUBLOG_QSO_DOWNLOAD_DATE']); $timestamp = strtotime($data['COL_CLUBLOG_QSO_DOWNLOAD_DATE']);
@@ -443,7 +456,7 @@ class QSO
$eqslstring = '<span '; $eqslstring = '<span ';
if ($data['COL_EQSL_QSL_SENT'] == "Y") { if ($data['COL_EQSL_QSL_SENT'] == "Y") {
$eqslstring .= "title=\"".__("eQSL")." ".__("Sent"); $eqslstring .= "title=\"".__("Sent");
if ($data['COL_EQSL_QSLSDATE'] != null) { if ($data['COL_EQSL_QSLSDATE'] != null) {
$timestamp = strtotime($data['COL_EQSL_QSLSDATE']); $timestamp = strtotime($data['COL_EQSL_QSLSDATE']);
@@ -456,7 +469,7 @@ class QSO
$eqslstring .= ' class="eqsl-' . (($data['COL_EQSL_QSL_SENT'] =='Y') ? 'green':'red') . '">&#9650;</span><span '; $eqslstring .= ' class="eqsl-' . (($data['COL_EQSL_QSL_SENT'] =='Y') ? 'green':'red') . '">&#9650;</span><span ';
if ($data['COL_EQSL_QSL_RCVD'] == "Y") { if ($data['COL_EQSL_QSL_RCVD'] == "Y") {
$eqslstring .= "title=\"".__("eQSL")." ".__("Received"); $eqslstring .= "title=\"".__("Received");
if ($data['COL_EQSL_QSLRDATE'] != null) { if ($data['COL_EQSL_QSLRDATE'] != null) {
$timestamp = strtotime($data['COL_EQSL_QSLRDATE']); $timestamp = strtotime($data['COL_EQSL_QSLRDATE']);