From d8d87c6f94764c9d64402480780a2289309ee556 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 22 Feb 2024 10:25:31 +0100 Subject: [PATCH] Allow logging of Az and El (i.e. fix number format) --- .../language/bulgarian/general_words_lang.php | 2 ++ .../chinese_simplified/general_words_lang.php | 2 ++ application/language/czech/general_words_lang.php | 2 ++ application/language/dutch/general_words_lang.php | 2 ++ .../language/english/general_words_lang.php | 2 ++ .../language/finnish/general_words_lang.php | 2 ++ .../language/french/general_words_lang.php | 2 ++ .../language/german/general_words_lang.php | 2 ++ application/language/greek/general_words_lang.php | 2 ++ .../language/italian/general_words_lang.php | 2 ++ .../language/polish/general_words_lang.php | 2 ++ .../language/russian/general_words_lang.php | 2 ++ .../language/spanish/general_words_lang.php | 2 ++ .../language/swedish/general_words_lang.php | 2 ++ .../language/turkish/general_words_lang.php | 2 ++ application/models/Logbook_model.php | 4 ++-- application/views/view_log/qso.php | 15 +++++++++++++++ 17 files changed, 47 insertions(+), 2 deletions(-) diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index ae9c7254..40fd0914 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Режим'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Sent'; $lang['gen_hamradio_rst_rcvd'] = 'Recv\'d'; $lang['gen_hamradio_band'] = 'Обхват'; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 778edd97..22bdbbad 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -122,6 +122,8 @@ $lang['gen_hamradio_callsign'] = '呼号'; $lang['gen_hamradio_prefix'] = "前缀"; $lang['gen_hamradio_suffix'] = "后缀"; $lang['gen_hamradio_mode'] = '模式'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_de'] = '本台呼号(De)'; $lang['gen_hamradio_dx'] = '对方呼号(Dx)'; $lang['gen_hamradio_rst_sent'] = '发送 信号报告（RST）'; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index 6ae87734..38ff5c84 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Režim'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Odesláno'; $lang['gen_hamradio_rst_rcvd'] = 'Přijato'; $lang['gen_hamradio_band'] = 'Pásmo'; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index e5607902..8ce09d07 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Mode'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Verzonden'; $lang['gen_hamradio_rst_rcvd'] = 'Ontvangen'; $lang['gen_hamradio_band'] = 'Band'; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 9d5dc399..9984ab8e 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Mode'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Sent'; $lang['gen_hamradio_rst_rcvd'] = 'Recv\'d'; $lang['gen_hamradio_band'] = 'Band'; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 358030a9..1004166e 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Lähetelaji'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Annettu raportti'; $lang['gen_hamradio_rst_rcvd'] = 'Saatu raportti'; $lang['gen_hamradio_band'] = 'Bandi'; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index 769a90cb..d073bffb 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = "De"; $lang['gen_hamradio_dx'] = "Dx"; $lang['gen_hamradio_mode'] = "Mode"; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = "Envoyé"; $lang['gen_hamradio_rst_rcvd'] = "Reçu"; $lang['gen_hamradio_band'] = "Bande"; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index e979d804..290fa52d 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Mode'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Gegeben'; $lang['gen_hamradio_rst_rcvd'] = 'Erhalten'; $lang['gen_hamradio_band'] = 'Band'; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index 85dd279c..5311003e 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Τρόπος'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Απεσταλμένα'; $lang['gen_hamradio_rst_rcvd'] = 'Ελήφθη\'d'; $lang['gen_hamradio_band'] = 'Ζώνη'; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index 0ebcdac2..5c876210 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Modo'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Inviato'; $lang['gen_hamradio_rst_rcvd'] = 'Ricevuto'; $lang['gen_hamradio_band'] = 'Banda'; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index 43820d3f..9b37410f 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Modulacja'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Wysłany'; $lang['gen_hamradio_rst_rcvd'] = 'Odebrany\'d'; $lang['gen_hamradio_band'] = 'Pasmo'; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index 21394662..7aaa2e82 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -125,6 +125,8 @@ $lang['gen_hamradio_callsign'] = 'Позывной'; $lang['gen_hamradio_de'] = 'от'; $lang['gen_hamradio_dx'] = 'DX'; $lang['gen_hamradio_mode'] = 'Вид модуляции'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Отправлено'; $lang['gen_hamradio_rst_rcvd'] = 'Получено'; $lang['gen_hamradio_bandgroup'] = "Bandgroup"; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 9097d71d..a9d6a23f 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -125,6 +125,8 @@ $lang['gen_hamradio_suffix'] = "Sufijo"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Modo'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Enviado'; $lang['gen_hamradio_rst_rcvd'] = 'Recibido'; $lang['gen_hamradio_band'] = 'Banda'; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index 7035c6a9..19f12009 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -125,6 +125,8 @@ $lang['gen_hamradio_callsign'] = 'Signal'; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Mode'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Skickat'; $lang['gen_hamradio_rst_rcvd'] = 'Mottagen\'d'; $lang['gen_hamradio_band'] = 'Band'; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 1a15ccbe..85ce297d 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -124,6 +124,8 @@ $lang['gen_hamradio_suffix'] = "Suffix"; $lang['gen_hamradio_de'] = 'De'; $lang['gen_hamradio_dx'] = 'Dx'; $lang['gen_hamradio_mode'] = 'Mod'; +$lang['gen_hamradio_ant_az'] = 'Azimuth'; +$lang['gen_hamradio_ant_el'] = 'Elevation'; $lang['gen_hamradio_rst_sent'] = 'Gönderilen'; $lang['gen_hamradio_rst_rcvd'] = 'Alınan'; $lang['gen_hamradio_band'] = 'Bant'; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 4e772095..9356ef79 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -3432,13 +3432,13 @@ class Logbook_model extends CI_Model } if (isset($record['ant_az'])) { - $input_ant_az = filter_var($record['ant_az'], FILTER_SANITIZE_NUMBER_INT); + $input_ant_az = filter_var($record['ant_az'], FILTER_VALIDATE_FLOAT); } else { $input_ant_az = NULL; } if (isset($record['ant_el'])) { - $input_ant_el = filter_var($record['ant_el'], FILTER_SANITIZE_NUMBER_INT); + $input_ant_el = filter_var($record['ant_el'], FILTER_VALIDATE_FLOAT); } else { $input_ant_el = NULL; } diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 2d28e08f..30e111e4 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -215,6 +215,21 @@ COL_SAT_MODE) == 2 ? (strtoupper($row->COL_SAT_MODE[0]).'/'.strtoupper($row->COL_SAT_MODE[1])) : strtoupper($row->COL_SAT_MODE)); ?> + + COL_ANT_AZ != null) { ?> + + + COL_ANT_AZ; ?>° + + + + COL_ANT_EL != null) { ?> + + + COL_ANT_EL; ?>° + + + name != null) { ?>