From 65ca50a05c02f6a349beb9806ee006b84cd86dbb Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 21 May 2024 15:01:46 +0200 Subject: [PATCH 01/13] Link POTA references in awards view --- application/views/awards/pota/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/awards/pota/index.php b/application/views/awards/pota/index.php index 53dceedc6..cac3e77fd 100644 --- a/application/views/awards/pota/index.php +++ b/application/views/awards/pota/index.php @@ -47,7 +47,7 @@ ?> - + COL_TIME_ON); echo date($custom_date_format, $timestamp); ?> COL_TIME_ON); echo date('H:i', $timestamp); ?> COL_CALL; ?> From 833a22e6864b01873e6a4887341978aa5e2bff3b Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 21 May 2024 13:02:43 +0000 Subject: [PATCH 02/13] Disable Upload-Button while uploading --- assets/js/sections/adif.js | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/js/sections/adif.js b/assets/js/sections/adif.js index 2cb376182..be48e5859 100644 --- a/assets/js/sections/adif.js +++ b/assets/js/sections/adif.js @@ -14,6 +14,7 @@ $(document).ready(function(){ arrayBuffer = this.result; let chker = partof(arrayBuffer,4096); if (chker.toUpperCase().includes(' Date: Tue, 21 May 2024 13:06:16 +0000 Subject: [PATCH 03/13] Re-Enable if Format is wrong --- assets/js/sections/adif.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/js/sections/adif.js b/assets/js/sections/adif.js index be48e5859..3e19699c4 100644 --- a/assets/js/sections/adif.js +++ b/assets/js/sections/adif.js @@ -3,6 +3,7 @@ $(document).ready(function(){ e.preventDefault(); var fi = document.getElementById("userfile"); var file = fi.files[0];; + $("#prepare_sub").prop("disabled",true); if (JSZip.support.blob) { // Check if Browser supports ZIP var zip = new JSZip(); //add all files to zip @@ -14,7 +15,6 @@ $(document).ready(function(){ arrayBuffer = this.result; let chker = partof(arrayBuffer,4096); if (chker.toUpperCase().includes(' Date: Wed, 22 May 2024 08:14:31 +0200 Subject: [PATCH 04/13] Check and hide double announced grids in hams.at --- assets/js/sections/hamsat.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/js/sections/hamsat.js b/assets/js/sections/hamsat.js index c544ee3d7..e45c1607f 100644 --- a/assets/js/sections/hamsat.js +++ b/assets/js/sections/hamsat.js @@ -106,10 +106,12 @@ function loadActivationsTable(rows, show_workable_only) { data.push(""+activation.mode+""); grids = []; for (var j=0; j < activation.grids_wkd.length; j++) { - if (activation.grids_wkd[j] == 1) { - grids.push(""+activation.grids[j].substring(0, 4)+"") - } else { - grids.push(""+activation.grids[j].substring(0, 4)+"") + if (!grids.some(str => str.includes(activation.grids[j].substring(0, 4)))) { + if (activation.grids_wkd[j] == 1) { + grids.push(""+activation.grids[j].substring(0, 4)+"") + } else { + grids.push(""+activation.grids[j].substring(0, 4)+"") + } } } data.push(grids.join(' ')); From 5a18bb6457b5868d5d78a418a73f003911636288 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 22 May 2024 12:31:47 +0200 Subject: [PATCH 05/13] language --- application/language/bulgarian/filter_lang.php | 1 + application/language/chinese_simplified/filter_lang.php | 1 + application/language/czech/filter_lang.php | 1 + application/language/dutch/filter_lang.php | 1 + application/language/english/filter_lang.php | 1 + application/language/finnish/filter_lang.php | 1 + application/language/french/filter_lang.php | 1 + application/language/german/filter_lang.php | 1 + application/language/greek/filter_lang.php | 1 + application/language/italian/filter_lang.php | 1 + application/language/polish/filter_lang.php | 1 + application/language/russian/filter_lang.php | 1 + application/language/spanish/filter_lang.php | 1 + application/language/swedish/filter_lang.php | 1 + application/language/turkish/filter_lang.php | 1 + 15 files changed, 15 insertions(+) diff --git a/application/language/bulgarian/filter_lang.php b/application/language/bulgarian/filter_lang.php index 58dae364b..90b2c1377 100644 --- a/application/language/bulgarian/filter_lang.php +++ b/application/language/bulgarian/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/chinese_simplified/filter_lang.php b/application/language/chinese_simplified/filter_lang.php index 3f7f5b2a1..b196b1186 100644 --- a/application/language/chinese_simplified/filter_lang.php +++ b/application/language/chinese_simplified/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = '未获取 QSL'; $lang['filter_actions_recv_bureau'] = '已接收 (卡片局)'; $lang['filter_actions_recv_direct'] = '已接收 (直邮)'; $lang['filter_actions_recv_electronic'] = '已接收 (电子)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = '创建 ADIF'; $lang['filter_actions_print_label'] = '打印标签'; $lang['filter_actions_start_print_title'] = '打印标签'; diff --git a/application/language/czech/filter_lang.php b/application/language/czech/filter_lang.php index 58dae364b..90b2c1377 100644 --- a/application/language/czech/filter_lang.php +++ b/application/language/czech/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/dutch/filter_lang.php b/application/language/dutch/filter_lang.php index 58dae364b..90b2c1377 100644 --- a/application/language/dutch/filter_lang.php +++ b/application/language/dutch/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/english/filter_lang.php b/application/language/english/filter_lang.php index 904186b72..1b144727f 100644 --- a/application/language/english/filter_lang.php +++ b/application/language/english/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/finnish/filter_lang.php b/application/language/finnish/filter_lang.php index 58dae364b..90b2c1377 100644 --- a/application/language/finnish/filter_lang.php +++ b/application/language/finnish/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/french/filter_lang.php b/application/language/french/filter_lang.php index 0d1dbf481..17b62d194 100644 --- a/application/language/french/filter_lang.php +++ b/application/language/french/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = "QSL Non requis"; $lang['filter_actions_recv_bureau'] = "Reçue (Bureau)"; $lang['filter_actions_recv_direct'] = "Reçue (Direct)"; $lang['filter_actions_recv_electronic'] = "Reçue (Numérique)"; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = "Exporter en ADIF"; $lang['filter_actions_print_label'] = "Imprimer Etiquette"; $lang['filter_actions_start_print_title'] = "Impression d'étiquettes"; diff --git a/application/language/german/filter_lang.php b/application/language/german/filter_lang.php index 38076c35e..022265ba2 100644 --- a/application/language/german/filter_lang.php +++ b/application/language/german/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL nicht erforderlich'; $lang['filter_actions_recv_bureau'] = 'Erhalten (Büro)'; $lang['filter_actions_recv_direct'] = 'Erhalten (Direkt)'; $lang['filter_actions_recv_electronic'] = 'Erhalten (Elektronisch)'; +$lang['filter_actions_not_rcvd'] = "Nicht erhalten"; $lang['filter_actions_create_adif'] = 'Erstelle ADIF'; $lang['filter_actions_print_label'] = 'Label drucken'; $lang['filter_actions_start_print_title'] = 'Label Drucken'; diff --git a/application/language/greek/filter_lang.php b/application/language/greek/filter_lang.php index 58dae364b..90b2c1377 100644 --- a/application/language/greek/filter_lang.php +++ b/application/language/greek/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/italian/filter_lang.php b/application/language/italian/filter_lang.php index 58dae364b..90b2c1377 100644 --- a/application/language/italian/filter_lang.php +++ b/application/language/italian/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/polish/filter_lang.php b/application/language/polish/filter_lang.php index 58dae364b..90b2c1377 100644 --- a/application/language/polish/filter_lang.php +++ b/application/language/polish/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/russian/filter_lang.php b/application/language/russian/filter_lang.php index b524f87c7..be69704a2 100644 --- a/application/language/russian/filter_lang.php +++ b/application/language/russian/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_recv_bureau'] = 'Получено (бюро)'; $lang['filter_actions_recv_direct'] = 'Получено (напрямую)'; $lang['filter_actions_recv_electronic'] = 'Получено (электронно)'; $lang['filter_actions_create_adif'] = 'Создать ADIF'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_print_label'] = 'Напечатать наклейки'; $lang['filter_actions_start_print_title'] = 'Печать наклеек'; $lang['filter_actions_print_include_via'] = "Включить через?"; diff --git a/application/language/spanish/filter_lang.php b/application/language/spanish/filter_lang.php index 225ceccd7..2d366b4c4 100644 --- a/application/language/spanish/filter_lang.php +++ b/application/language/spanish/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL no Requerida'; $lang['filter_actions_recv_bureau'] = 'Recibido (Buró)'; $lang['filter_actions_recv_direct'] = 'Recibido (Directa)'; $lang['filter_actions_recv_electronic'] = 'Recibido (Electrónico)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Crear ADIF'; $lang['filter_actions_print_label'] = 'Imprimir Etiqueta'; $lang['filter_actions_start_print_title'] = 'Imprimir Etiquetas'; diff --git a/application/language/swedish/filter_lang.php b/application/language/swedish/filter_lang.php index 58dae364b..90b2c1377 100644 --- a/application/language/swedish/filter_lang.php +++ b/application/language/swedish/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; diff --git a/application/language/turkish/filter_lang.php b/application/language/turkish/filter_lang.php index 58dae364b..90b2c1377 100644 --- a/application/language/turkish/filter_lang.php +++ b/application/language/turkish/filter_lang.php @@ -113,6 +113,7 @@ $lang['filter_actions_qsl_n_required'] = 'QSL Not Required'; $lang['filter_actions_recv_bureau'] = 'Received (Bureau)'; $lang['filter_actions_recv_direct'] = 'Received (Direct)'; $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; +$lang['filter_actions_not_rcvd'] = "Not Received"; $lang['filter_actions_create_adif'] = 'Create ADIF'; $lang['filter_actions_print_label'] = 'Print Label'; $lang['filter_actions_start_print_title'] = 'Print Labels'; From 82ce58bd398fea0b8de50343b38e8adff023c93f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 22 May 2024 12:32:08 +0200 Subject: [PATCH 06/13] added not rcvd action button --- application/views/logbookadvanced/index.php | 1 + assets/js/sections/logbookadvanced.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index f11b7f177..b55eb784f 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -372,6 +372,7 @@ $options = json_decode($options); + diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 170831da1..435ed8f32 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -507,6 +507,9 @@ $(document).ready(function () { $('#notRequired').click(function (event) { handleQsl('I','', 'notRequired'); }); + $('#notReceived').click(function (event) { + handleQslReceived('N','', 'notReceived'); + }); $('#receivedBureau').click(function (event) { handleQslReceived('Y','B', 'receivedBureau'); }); From dd073b0c5eecc76c28b7030fe9db939e181abb25 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 22 May 2024 12:32:27 +0200 Subject: [PATCH 07/13] catch case of orbit is not set in $data array --- src/QSLManager/QSO.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index 60e784e90..11946b63d 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -158,7 +158,7 @@ class QSO $this->rstS = $data['COL_RST_SENT']; $this->propagationMode = $data['COL_PROP_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'] != '' ? ($data['orbit'] != '' ? $data['COL_SAT_NAME']." (".$data['orbit'].") " : $data['COL_SAT_NAME']) : ''; + $this->satelliteName = $data['COL_SAT_NAME'] != '' ? (isset($data['orbit']) && $data['orbit'] != '' ? $data['COL_SAT_NAME']." (".$data['orbit'].") " : $data['COL_SAT_NAME']) : ''; $this->name = $data['COL_NAME'] ?? ''; $this->email = $data['COL_EMAIL'] ?? ''; From b61f4c4cc9b8efaf2bc5f56890cae8a39ad64ef8 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 22 May 2024 12:34:44 +0200 Subject: [PATCH 08/13] seperate "not" buttons by color --- application/views/logbookadvanced/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index b55eb784f..07c9bad8d 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -370,9 +370,9 @@ $options = json_decode($options); - - - + + + From a7c03a9a913f11b638cbaba4c7bfae5452220670 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 22 May 2024 15:37:20 +0200 Subject: [PATCH 09/13] Fix empty DXCC on LBA update functions --- application/models/Logbookadvanced_model.php | 2 +- assets/js/sections/logbookadvanced.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 60a305943..b3331b4e9 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -281,7 +281,7 @@ class Logbookadvanced_model extends CI_Model { $order = $this->getSortorder($sortorder); $sql = " - SELECT qsos.*, d2.*, lotw_users.*, station_profile.*, x.qslcount, dxcc_entities.name AS station_country + SELECT qsos.*, d2.*, lotw_users.*, station_profile.*, x.qslcount, dxcc_entities.name AS station_country, d2.name as dxccname 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_MY_DXCC = dxcc_entities.adif diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 170831da1..86bec4316 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -74,7 +74,7 @@ function updateRow(qso) { cells.eq(c++).text(qso.qslMessage); } if (user_options.dxcc.show == "true"){ - cells.eq(c++).html(qso.dxcc); + cells.eq(c++).html(qso.dxccname); } if (user_options.state.show == "true"){ cells.eq(c++).html(qso.state); From 4bc0d2a707a08ea9f7359f46f9989bf156358026 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 22 May 2024 17:36:33 +0200 Subject: [PATCH 10/13] Catch empty grid and inform user to correct config --- application/controllers/Sattimers.php | 16 ++++++++++++++-- application/views/sattimers/index.php | 10 +++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/application/controllers/Sattimers.php b/application/controllers/Sattimers.php index 66332e392..7de010f91 100644 --- a/application/controllers/Sattimers.php +++ b/application/controllers/Sattimers.php @@ -24,10 +24,22 @@ class Sattimers extends CI_Controller { $this->cache->save('SatTimers'.strtoupper($this->stations->find_gridsquare()), $RawData, (60*1)); } - $json = $RawData; - $data['activations'] = json_decode($json, true)['data']; + $json = $RawData; + $response = json_decode($json, true); + if (array_key_exists('data', $response)) { + $data['activations'] = json_decode($json, true)['data'] ?? []; + } else if (array_key_exists('error', $response)) { + $this->session->set_flashdata('message', 'Error: '.$response['error']); + $data['activations'] = []; + } else { + $data['activations'] = []; + } + $data['gridsquare'] = strtoupper($this->stations->find_gridsquare()); + if ($data['gridsquare'] == "0") { + $this->session->set_flashdata('message', lang('dashboard_locations_warning')); + } $data['page_title'] = "Satellite Timers"; diff --git a/application/views/sattimers/index.php b/application/views/sattimers/index.php index 3a05c895d..344b5db89 100644 --- a/application/views/sattimers/index.php +++ b/application/views/sattimers/index.php @@ -2,10 +2,18 @@ var custom_date_format = "";
+ session->flashdata('message')) { ?> + + +

Satellite Timers

-

This data is from https://www.df2et.de/tevel/ calculated for current station location grid .

+ +

This data is from https://www.df2et.de/tevel/ calculated for current station location grid .

+