mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

[Advanced Logbook] Added qrblink to grid

pull/2226/head
Andreas 2023-06-26 20:54:36 +02:00
rodzic cba1ba4190
commit 3ef655f4b7
2 zmienionych plików z 16 dodań i 28 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
assets/js/sections/logbookadvanced.js
Wyświetl plik

@ -32,7 +32,7 @@ function updateRow(qso) {
cells.eq(c++).text(qso.rstR);
cells.eq(c++).text(qso.band);
cells.eq(c++).text(qso.deRefs);
cells.eq(c++).text(qso.dxRefs);
cells.eq(c++).html(qso.dxRefs);
cells.eq(c++).text(qso.name);
cells.eq(c++).text(qso.qslVia);
cells.eq(c++).html(qso.qsl);

42
src/QSLManager/QSO.php
Wyświetl plik

@ -38,6 +38,7 @@ class QSO
private string $iota;
/** @var string[] */
private string $deVUCCGridsquares;
private string $stationGridsquare;
private string $dxGridsquare;
private string $dxIOTA;
private string $dxSig;
@ -161,6 +162,8 @@ class QSO
$this->deVUCCGridsquares = $data['COL_MY_VUCC_GRIDS'] ?? '';
$this->stationGridsquare = $data['station_gridsquare'] ?? '';
$this->dxGridsquare = $data['COL_GRIDSQUARE'] ?? '';
$this->dxIOTA = $data['COL_IOTA'] ?? '';
$this->dxSig = $data['COL_SIG'] ?? '';
@ -209,7 +212,6 @@ class QSO
}
}
$this->lotw_hint = $lotw_hint;
}
/**
@ -218,14 +220,6 @@ class QSO
function getQSLString($data, $custom_date_format): string
{
$CI =& get_instance();
// Load language files
$CI->lang->load(array(
'contesting',
'qslcard',
'lotw',
'eqsl',
'qso'
));
$qslstring = '<span ';
@ -324,14 +318,6 @@ class QSO
function getLotwString($data, $custom_date_format): string
{
$CI =& get_instance();
// Load language files
$CI->lang->load(array(
'contesting',
'qslcard',
'lotw',
'eqsl',
'qso'
));
$lotwstring = '<span ';
@ -369,14 +355,6 @@ class QSO
function getEqslString($data, $custom_date_format): string
{
$CI =& get_instance();
// Load language files
$CI->lang->load(array(
'contesting',
'qslcard',
'lotw',
'eqsl',
'qso'
));
$eqslstring = '<span ';
@ -852,9 +830,9 @@ class QSO
{
$refs = [];
if ($this->dxVUCCGridsquares !== '') {
$refs[] = $this->dxVUCCGridsquares;
$refs[] = $this->dxVUCCGridsquares . ' ' .$this->getQrbLink($this->stationGridsquare, $this->dxVUCCGridsquares, $this->dxGridsquare);
} else if ($this->dxGridsquare !== '') {
$refs[] = $this->dxGridsquare;
$refs[] = $this->dxGridsquare . ' ' .$this->getQrbLink($this->stationGridsquare, $this->dxVUCCGridsquares, $this->dxGridsquare);
}
if ($this->dxSOTAReference !== '') {
$refs[] = "SOTA:" . $this->dxSOTAReference;
@ -961,4 +939,14 @@ class QSO
return trim(implode(" ", $label));
}
private function getQrbLink($mygrid, $grid, $vucc)
{
if (!empty($grid)) {
return '<a href="javascript:spawnQrbCalculator(\'' . $mygrid . '\',\'' . $grid . '\')"><i class="fas fa-globe"></i></a>';
} else if (!empty($vucc)) {
return '<a href="javascript:spawnQrbCalculator(\'' . $mygrid . '\',\'' . $vucc . '\')"><i class="fas fa-globe"></i></a>';
}
return '';
}
}