[Logbookadvanced] Added a few more columns

pull/1847/head
Andreas 2022-12-18 19:50:54 +01:00
rodzic dbc8a5451a
commit 6cd742bea3
3 zmienionych plików z 51 dodań i 4 usunięć

Wyświetl plik

@ -183,6 +183,10 @@
<th>QSL Sent</th>
<th>QSL Received</th>
<th>QSL Msg</th>
<th>DXCC</th>
<th>State</th>
<th>CQ Zone</th>
<th>IOTA</th>
</tr>
</thead>
<tbody>

Wyświetl plik

@ -20,6 +20,10 @@ function updateRow(qso) {
cells.eq(c++).text(qso.qslSent);
cells.eq(c++).text(qso.qslReceived);
cells.eq(c++).text(qso.qslMessage);
cells.eq(c++).text(qso.dxcc);
cells.eq(c++).text(qso.state);
cells.eq(c++).text(qso.cqzone);
cells.eq(c++).text(qso.iota);
return row;
}
@ -64,6 +68,10 @@ function loadQSOTable(rows) {
qso.qslSent,
qso.qslReceived,
qso.qslMessage,
qso.dxcc,
qso.state,
qso.cqzone,
qso.iota,
];
let createdRow = table.row.add(data).index();

Wyświetl plik

@ -31,6 +31,11 @@ class QSO
private string $deSigInfo;
private string $deIOTAIslandID;
private string $deSOTAReference;
/** Awards */
private string $cqzone;
private string $state;
private string $dxcc;
private string $iota;
/** @var string[] */
private array $deVUCCGridsquares;
private string $dxGridsquare;
@ -93,7 +98,11 @@ class QSO
'COL_MY_VUCC_GRIDS',
'COL_SOTA_REF',
'COL_SUBMODE',
'COL_VUCC_GRIDS'
'COL_VUCC_GRIDS',
'COL_CQZ',
'COL_STATE',
'COL_COUNTRY',
'COL_IOTA',
];
@ -152,6 +161,11 @@ class QSO
$this->QSLSent = ($data['COL_QSL_SENT'] === null) ? '' : $data['COL_QSL_SENT'];
$this->QSLSentVia = ($data['COL_QSL_SENT_VIA'] === null) ? '' : $data['COL_QSL_SENT_VIA'];
$this->QSLVia = ($data['COL_QSL_VIA'] === null) ? '' : $data['COL_QSL_VIA'];
$this->cqzone = $data['COL_CQZ'];
$this->state = $data['COL_STATE'];
$this->dxcc = $data['COL_COUNTRY'];
$this->iota = $data['COL_IOTA'];
}
/**
@ -458,6 +472,26 @@ class QSO
return $this->QSLVia;
}
public function getDXCC(): string
{
return $this->dxcc;
}
public function getCqzone(): string
{
return $this->cqzone;
}
public function getState(): string
{
return $this->state;
}
public function getIOTA(): string
{
return $this->iota;
}
public function toArray(): array
{
return [
@ -476,6 +510,10 @@ class QSO
'qslReceived' => $this->getFormattedQSLReceived(),
'qslMessage' => $this->getQSLMsg(),
'name' => $this->getName(),
'dxcc' => $this->getDXCC(),
'state' => $this->getState(),
'cqzone' => $this->getCqzone(),
'iota' => $this->getIOTA(),
];
}
@ -541,9 +579,6 @@ class QSO
} else if ($this->dxGridsquare !== '') {
$refs[] = $this->dxGridsquare;
}
if ($this->dxIOTA !== '') {
$refs[] = "IOTA:" . $this->dxIOTA;
}
if ($this->dxSOTAReference !== '') {
$refs[] = "SOTA:" . $this->dxSOTAReference;
}