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

Show deleted DXCC marker in advanced logbook

pull/2087/head
phl0 2023-04-27 16:00:02 +02:00
rodzic 54e137db90
commit 8c6618cfa7
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 48EA1E640798CA9A
4 zmienionych plików z 13 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
application/models/Logbookadvanced_model.php
Wyświetl plik

@ -89,6 +89,7 @@ class Logbookadvanced_model extends CI_Model {
SELECT *
FROM " . $this->config->item('table_name') . " qsos
INNER JOIN station_profile ON qsos.station_id=station_profile.station_id
LEFT OUTER JOIN dxcc_entities ON qsos.col_dxcc=dxcc_entities.adif
WHERE station_profile.user_id = ?
$where
ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc

6
application/views/logbookadvanced/index.php
Wyświetl plik

@ -167,13 +167,13 @@
<button type="button" class="btn btn-sm btn-primary" id="btnUpdateFromCallbook">Update from Callbook</button>
<button type="button" class="btn btn-sm btn-primary" id="queueBureau">Queue Bureau</button>
<button type="button" class="btn btn-sm btn-primary" id="queueDirect">Queue Direct</button>
<button type="button" class="btn btn-sm btn-primary" id="queueElectronic">Queue Electronic</button>
<button type="button" class="btn btn-sm btn-primary" id="queueElectronic">Queue Electronic</button>
<button type="button" class="btn btn-sm btn-success" id="sentBureau">Sent Bureau</button>
<button type="button" class="btn btn-sm btn-success" id="sentDirect">Sent Direct</button>
<button type="button" class="btn btn-sm btn-success" id="sentElectronic">Sent Electronic</button>
<button type="button" class="btn btn-sm btn-success" id="sentElectronic">Sent Electronic</button>
<button type="button" class="btn btn-sm btn-warning" id="dontSend">Don't Send</button>
<button type="button" class="btn btn-sm btn-info" id="exportAdif">Create ADIF</button>
<button type="button" class="btn btn-sm btn-danger" id="deleteQsos">Delete</button>
<button type="button" class="btn btn-sm btn-danger" id="deleteQsos">Delete</button>
<span id="infoBox"></span>
</div>
</div>

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

@ -68,7 +68,7 @@ function loadQSOTable(rows) {
qso.qslSent,
qso.qslReceived,
qso.qslMessage,
qso.dxcc,
qso.dxcc+(qso.end == null ? '' : ' <span class="badge badge-danger">Deleted DXCC</span>'),
qso.state,
qso.cqzone,
qso.iota,
@ -365,4 +365,4 @@ $(document).ready(function () {
});
$('#searchForm').submit();
});
});

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

@ -54,6 +54,7 @@ class QSO
private string $QSLSent;
private string $QSLSentVia;
private string $QSLVia;
private ?DateTime $end;
/**
* @param array $data Does no validation, it's assumed to be a row from the database in array format
@ -166,6 +167,11 @@ class QSO
$this->state = ($data['COL_STATE'] === null) ? '' :$data['COL_STATE'];
$this->dxcc = ($data['COL_COUNTRY'] === null) ? '' :$data['COL_COUNTRY'];
$this->iota = ($data['COL_IOTA'] === null) ? '' :$data['COL_IOTA'];
if (array_key_exists('end', $data)) {
$this->end = ($data['end'] === null) ? null : DateTime::createFromFormat("Y-m-d", $data['end'], new DateTimeZone('UTC'));
} else {
$this->end = null;
}
}
/**
@ -514,6 +520,7 @@ class QSO
'state' => $this->getState(),
'cqzone' => $this->getCqzone(),
'iota' => $this->getIOTA(),
'end' => $this->end === null ? null : $this->end->format("Y-m-d"),
];
}