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

QRZ QSL stati refactored according to ADIF v3.1.6

Browse Source
This commit is contained in:
phl0
2025-11-23 21:59:03 +01:00
parent cfb0229c3d
commit 79e251183e
3 changed files with 61 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -577,9 +577,6 @@
<select class="form-select" id="qrz_sent" name="qrz_sent">
<option value="N" <?php if ($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "N") echo "selected=\"selected\""; ?>><?= __("No"); ?></option>
<option value="Y" <?php if ($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "Y") echo "selected=\"selected\""; ?>><?= __("Yes"); ?></option>
<option value="R" <?php if ($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "R") echo "selected=\"selected\""; ?>><?= __("Requested"); ?></option>
<option value="Q" <?php if ($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "Q") echo "selected=\"selected\""; ?>><?= __("Queued"); ?></option>
<option value="I" <?php if ($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "I") echo "selected=\"selected\""; ?>><?= __("Invalid (Ignore)"); ?></option>
<option value="M" <?php if ($qso->COL_QRZCOM_QSO_UPLOAD_STATUS == "M") echo "selected=\"selected\""; ?>><?= __("Modified"); ?></option>
</select>
</div>
@@ -591,9 +588,7 @@
<select class="form-select" id="qrz_rcvd" name="qrz_rcvd">
<option value="N" <?php if ($qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "N") echo "selected=\"selected\""; ?>><?= __("No"); ?></option>
<option value="Y" <?php if ($qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "Y") echo "selected=\"selected\""; ?>><?= __("Yes"); ?></option>
<option value="R" <?php if ($qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "R") echo "selected=\"selected\""; ?>><?= __("Requested"); ?></option>
<option value="I" <?php if ($qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "I") echo "selected=\"selected\""; ?>><?= __("Invalid (Ignore)"); ?></option>
<option value="V" <?php if ($qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS == "V") echo "selected=\"selected\""; ?>><?= __("Verified (Match)"); ?></option>
</select>
</div>
</div>

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

@@ -473,14 +473,53 @@ 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 "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) {
$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 ) { ?>
<td class="clublog">
<span <?php

31
src/QSLManager/QSO.php
View File

@@ -671,9 +671,7 @@ class QSO
}
$qrzstring .= "\" data-bs-toggle=\"tooltip\"";
}
if ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == "M") {
} elseif ($data['COL_QRZCOM_QSO_UPLOAD_STATUS'] == "M") {
$qrzstring .= "title=\"".__("Modified");
if ($data['COL_QRZCOM_QSO_UPLOAD_DATE'] != null) {
@@ -684,18 +682,11 @@ 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';
} else {
$qrzstring .= 'red';
}
@@ -704,6 +695,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,9 +710,15 @@ 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;
}