kopia lustrzana https://github.com/magicbug/Cloudlog
[LBA] Use station profile table for MY_xxx info
rodzic
8400654d3d
commit
4d331d427e
|
@ -38,7 +38,6 @@ class QSO
|
||||||
private string $iota;
|
private string $iota;
|
||||||
/** @var string[] */
|
/** @var string[] */
|
||||||
private string $deVUCCGridsquares;
|
private string $deVUCCGridsquares;
|
||||||
private string $stationGridsquare;
|
|
||||||
private string $dxGridsquare;
|
private string $dxGridsquare;
|
||||||
private string $dxIOTA;
|
private string $dxIOTA;
|
||||||
private string $dxSig;
|
private string $dxSig;
|
||||||
|
@ -156,17 +155,15 @@ class QSO
|
||||||
$this->email = $data['COL_EMAIL'] ?? '';
|
$this->email = $data['COL_EMAIL'] ?? '';
|
||||||
$this->address = $data['COL_ADDRESS'] ?? '';
|
$this->address = $data['COL_ADDRESS'] ?? '';
|
||||||
|
|
||||||
$this->deGridsquare = $data['COL_MY_GRIDSQUARE'] ?? '';
|
$this->deGridsquare = $data['station_gridsquare'] ?? '';
|
||||||
$this->deIOTA = $data['COL_MY_IOTA'] ?? '';
|
$this->deIOTA = $data['station_iota'] ?? '';
|
||||||
$this->deSig = $data['COL_MY_SIG'] ?? '';
|
$this->deSig = $data['station_sig'] ?? '';
|
||||||
$this->deSigInfo = $data['COL_MY_SIG_INFO'] ?? '';
|
$this->deSigInfo = $data['station_sig_info'] ?? '';
|
||||||
$this->deIOTAIslandID = $data['COL_MY_IOTA_ISLAND_ID'] ?? '';
|
$this->deIOTAIslandID = $data['COL_MY_IOTA_ISLAND_ID'] ?? '';
|
||||||
$this->deSOTAReference = $data['COL_MY_SOTA_REF'] ?? '';
|
$this->deSOTAReference = $data['station_sota'] ?? '';
|
||||||
|
|
||||||
$this->deVUCCGridsquares = $data['COL_MY_VUCC_GRIDS'] ?? '';
|
$this->deVUCCGridsquares = $data['COL_MY_VUCC_GRIDS'] ?? '';
|
||||||
|
|
||||||
$this->stationGridsquare = $data['station_gridsquare'] ?? '';
|
|
||||||
|
|
||||||
$this->dxGridsquare = $data['COL_GRIDSQUARE'] ?? '';
|
$this->dxGridsquare = $data['COL_GRIDSQUARE'] ?? '';
|
||||||
$this->dxIOTA = $data['COL_IOTA'] ?? '';
|
$this->dxIOTA = $data['COL_IOTA'] ?? '';
|
||||||
$this->dxSig = $data['COL_SIG'] ?? '';
|
$this->dxSig = $data['COL_SIG'] ?? '';
|
||||||
|
@ -862,9 +859,9 @@ class QSO
|
||||||
{
|
{
|
||||||
$refs = [];
|
$refs = [];
|
||||||
if ($this->dxVUCCGridsquares !== '') {
|
if ($this->dxVUCCGridsquares !== '') {
|
||||||
$refs[] = '<span id="dxgrid">' . $this->dxVUCCGridsquares . '</span> ' .$this->getQrbLink($this->stationGridsquare, $this->dxVUCCGridsquares, $this->dxGridsquare);
|
$refs[] = '<span id="dxgrid">' . $this->dxVUCCGridsquares . '</span> ' .$this->getQrbLink($this->deGridsquare, $this->dxVUCCGridsquares, $this->dxGridsquare);
|
||||||
} else if ($this->dxGridsquare !== '') {
|
} else if ($this->dxGridsquare !== '') {
|
||||||
$refs[] = '<span id="dxgrid">' . $this->dxGridsquare . '</span> ' .$this->getQrbLink($this->stationGridsquare, $this->dxVUCCGridsquares, $this->dxGridsquare);
|
$refs[] = '<span id="dxgrid">' . $this->dxGridsquare . '</span> ' .$this->getQrbLink($this->deGridsquare, $this->dxVUCCGridsquares, $this->dxGridsquare);
|
||||||
}
|
}
|
||||||
if ($this->dxSOTAReference !== '') {
|
if ($this->dxSOTAReference !== '') {
|
||||||
$refs[] = "SOTA: " . '<span id="dxsota">' . $this->dxSOTAReference. '</span>';
|
$refs[] = "SOTA: " . '<span id="dxsota">' . $this->dxSOTAReference. '</span>';
|
||||||
|
|
Ładowanie…
Reference in New Issue