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/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'; diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 60a305943..67d25a610 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -281,17 +281,13 @@ 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.*, lotw_users.*, station_profile.*, dxcc_entities.name AS station_country, d2.name as dxccname, exists(select 1 from qsl_images where qsoid = qsos.COL_PRIMARY_KEY) as qslcount, contest.name as contestname 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 LEFT OUTER JOIN dxcc_entities d2 ON qsos.COL_DXCC = d2.adif LEFT OUTER JOIN lotw_users ON qsos.col_call=lotw_users.callsign - LEFT OUTER JOIN ( - select count(*) as qslcount, qsoid - from qsl_images - group by qsoid - ) x on qsos.COL_PRIMARY_KEY = x.qsoid + LEFT OUTER JOIN contest ON qsos.col_contest_id = contest.adifname WHERE station_profile.user_id = ? $where $order @@ -412,10 +408,10 @@ class Logbookadvanced_model extends CI_Model { $updatedData['COL_QTH'] = $callbook['city']; } if (!empty($callbook['lat']) && empty($qso['COL_LAT'])) { - $updatedData['COL_LAT'] = $callbook['lat']; + $updatedData['COL_LAT'] = substr(($callbook['lat'] ?? ''),0,11); } if (!empty($callbook['long']) && empty($qso['COL_LON'])) { - $updatedData['COL_LON'] = $callbook['long']; + $updatedData['COL_LON'] = substr(($callbook['long'] ?? ''),0,11); } if (!empty($callbook['iota']) && empty($qso['COL_IOTA'])) { $updatedData['COL_IOTA'] = $callbook['iota']; 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; ?> diff --git a/application/views/eqsl/import.php b/application/views/eqsl/import.php index fe7fe69b3..c9a74087e 100644 --- a/application/views/eqsl/import.php +++ b/application/views/eqsl/import.php @@ -58,8 +58,8 @@
-
+
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 9d92fdeb0..8997bd031 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -394,8 +394,9 @@ $options = json_decode($options); - - + + + 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 .

+