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

Adjust clublog QSL colors

Browse Source
This commit is contained in:
phl0
2025-11-24 09:14:34 +01:00
parent 83f0c6d93f
commit b2d4c3559b
5 changed files with 84 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -626,9 +626,7 @@
<select class="form-select" id="clublog_sent" name="clublog_sent">
<option value="N" <?php if ($qso->COL_CLUBLOG_QSO_UPLOAD_STATUS == "N") echo "selected=\"selected\""; ?>><?= __("No"); ?></option>
<option value="Y" <?php if ($qso->COL_CLUBLOG_QSO_UPLOAD_STATUS == "Y") echo "selected=\"selected\""; ?>><?= __("Yes"); ?></option>
<option value="R" <?php if ($qso->COL_CLUBLOG_QSO_UPLOAD_STATUS == "R") echo "selected=\"selected\""; ?>><?= __("Requested"); ?></option>
<option value="Q" <?php if ($qso->COL_CLUBLOG_QSO_UPLOAD_STATUS == "Q") echo "selected=\"selected\""; ?>><?= __("Queued"); ?></option>
<option value="I" <?php if ($qso->COL_CLUBLOG_QSO_UPLOAD_STATUS == "I") echo "selected=\"selected\""; ?>><?= __("Invalid (Ignore)"); ?></option>
<option value="M" <?php if ($qso->COL_CLUBLOG_QSO_UPLOAD_STATUS == "M") echo "selected=\"selected\""; ?>><?= __("Modified"); ?></option>
</select>
</div>
</div>
@@ -638,9 +636,7 @@
<select class="form-select" id="clublog_rcvd" name="clublog_rcvd">
<option value="N" <?php if ($qso->COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "N") echo "selected=\"selected\""; ?>><?= __("No"); ?></option>
<option value="Y" <?php if ($qso->COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "Y") echo "selected=\"selected\""; ?>><?= __("Yes"); ?></option>
<option value="R" <?php if ($qso->COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "R") echo "selected=\"selected\""; ?>><?= __("Requested"); ?></option>
<option value="I" <?php if ($qso->COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "I") echo "selected=\"selected\""; ?>><?= __("Invalid (Ignore)"); ?></option>
<option value="V" <?php if ($qso->COL_CLUBLOG_QSO_DOWNLOAD_STATUS == "V") echo "selected=\"selected\""; ?>><?= __("Verified (Match)"); ?></option>
</select>
</div>
</div>

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

@@ -520,40 +520,50 @@ function echoQrbCalcLink($mygrid, $grid, $vucc, $isVisitor = false) {
</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 "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 } ?>

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

@@ -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;
}
}

5
assets/css/general.css
View File

@@ -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;

39
src/QSLManager/QSO.php
View File

@@ -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 .= "<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'] == '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 +599,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;
}
@@ -723,7 +737,6 @@ class QSO
return $qrzstring;
}
function getEqslString($data, $custom_date_format): string
{
$eqslstring = '<span ';