From 61862a0441f686d3cb28afe4527daf89a7aa1c4d Mon Sep 17 00:00:00 2001 From: phl0 Date: Sat, 29 Jul 2023 09:13:01 +0200 Subject: [PATCH] Split SAT mode in (adv) logbook and QSO view --- application/views/view_log/qso.php | 2 +- src/QSLManager/QSO.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index ddbe4af7..5aa66b60 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -197,7 +197,7 @@ COL_SAT_MODE != null) { ?> - COL_SAT_MODE; ?> + COL_SAT_MODE) == 2 ? (strtoupper($row->COL_SAT_MODE[0]).'/'.strtoupper($row->COL_SAT_MODE[1])) : strtoupper($row->COL_SAT_MODE)); ?> name != null) { ?> diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index 3b00aa06..1db43ced 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -150,7 +150,7 @@ class QSO $this->rstR = $data['COL_RST_RCVD']; $this->rstS = $data['COL_RST_SENT']; $this->propagationMode = $data['COL_PROP_MODE'] ?? ''; - $this->satelliteMode = $data['COL_SAT_MODE'] ?? ''; + $this->satelliteMode = $data['COL_SAT_MODE'] != '' ? (strlen($data['COL_SAT_MODE']) == 2 ? (strtoupper($data['COL_SAT_MODE'][0]).'/'.strtoupper($data['COL_SAT_MODE'][1])) : strtoupper($data['COL_SAT_MODE'])) : ''; $this->satelliteName = $data['COL_SAT_NAME'] ?? ''; $this->name = $data['COL_NAME'] ?? '';