From a9b8d9d8e785b8ab7d3a88282d3d30b9fad8d571 Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Thu, 5 Mar 2026 12:10:04 +0100 Subject: [PATCH 1/2] [Advanced Logbook] Adjusted some queries and functions to speed up page load --- application/models/Logbookadvanced_model.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 70b28d9f6..9b1cdf026 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -983,12 +983,10 @@ class Logbookadvanced_model extends CI_Model { $modes = array(); - $this->db->select('distinct col_mode, coalesce(col_submode, "") col_submode', FALSE); - $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); - $this->db->where('station_profile.user_id', $this->session->userdata('user_id')); - $this->db->order_by('col_mode, col_submode', 'ASC'); + $sql = "SELECT distinct col_mode, col_submode FROM " . $this->config->item('table_name') . " thcv + JOIN station_profile on thcv.station_id = station_profile.station_id WHERE station_profile.user_id = ? ORDER BY col_mode, col_submode"; - $query = $this->db->get($this->config->item('table_name')); + $query = $this->db->query($sql, array($this->session->userdata('user_id'))); foreach($query->result() as $mode){ if ($mode->col_submode == null || $mode->col_submode == "") { @@ -1003,23 +1001,23 @@ class Logbookadvanced_model extends CI_Model { function get_worked_bands() { // get all worked slots from database - $sql = "SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `".$this->config->item('table_name')."` thcv + $sql = "SELECT distinct `COL_BAND` as `COL_BAND` FROM `".$this->config->item('table_name')."` thcv JOIN station_profile on thcv.station_id = station_profile.station_id WHERE station_profile.user_id = ? AND COL_PROP_MODE != \"SAT\" ORDER BY col_band"; $data = $this->db->query($sql, array($this->session->userdata('user_id'))); $worked_slots = array(); foreach($data->result() as $row){ - array_push($worked_slots, $row->COL_BAND); + array_push($worked_slots, strtolower($row->COL_BAND)); } - $sql = "SELECT distinct LOWER(`COL_PROP_MODE`) as `COL_PROP_MODE` FROM `".$this->config->item('table_name')."` thcv + $sql = "SELECT count(*) as count FROM `".$this->config->item('table_name')."` thcv JOIN station_profile on thcv.station_id = station_profile.station_id WHERE station_profile.user_id = ? AND COL_PROP_MODE = \"SAT\""; $SAT_data = $this->db->query($sql, array($this->session->userdata('user_id'))); foreach($SAT_data->result() as $row){ - array_push($worked_slots, strtoupper($row->COL_PROP_MODE)); + array_push($worked_slots, 'SAT'); } usort( @@ -1040,7 +1038,7 @@ class Logbookadvanced_model extends CI_Model { function get_worked_sats() { // get all worked sats from database $sql = "SELECT distinct col_sat_name FROM ".$this->config->item('table_name')." thcv - JOIN station_profile on thcv.station_id = station_profile.station_id WHERE station_profile.user_id = ? and coalesce(col_sat_name, '') <> '' ORDER BY col_sat_name"; + JOIN station_profile on thcv.station_id = station_profile.station_id WHERE station_profile.user_id = ? AND col_sat_name IS NOT NULL AND col_sat_name != '' ORDER BY col_sat_name"; $data = $this->db->query($sql, array($this->session->userdata('user_id'))); From 1083e34089861bb34658385a7e47799f9327d45d Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 5 Mar 2026 15:20:12 +0000 Subject: [PATCH 2/2] po/mo updates --- application/locale/bg_BG/LC_MESSAGES/messages.po | 4 ++-- application/locale/bs/LC_MESSAGES/messages.po | 4 ++-- application/locale/cnr/LC_MESSAGES/messages.po | 4 ++-- application/locale/cs_CZ/LC_MESSAGES/messages.po | 4 ++-- application/locale/de_DE/LC_MESSAGES/messages.po | 4 ++-- application/locale/el_GR/LC_MESSAGES/messages.po | 4 ++-- application/locale/es_ES/LC_MESSAGES/messages.po | 4 ++-- application/locale/et/LC_MESSAGES/messages.po | 4 ++-- application/locale/fi_FI/LC_MESSAGES/messages.po | 4 ++-- application/locale/fr_FR/LC_MESSAGES/messages.po | 4 ++-- application/locale/hr/LC_MESSAGES/messages.po | 4 ++-- application/locale/hu/LC_MESSAGES/messages.po | 4 ++-- application/locale/hy/LC_MESSAGES/messages.po | 4 ++-- application/locale/it_IT/LC_MESSAGES/messages.po | 4 ++-- application/locale/ja/LC_MESSAGES/messages.po | 4 ++-- application/locale/lt/LC_MESSAGES/messages.po | 4 ++-- application/locale/lv/LC_MESSAGES/messages.po | 4 ++-- application/locale/nl_NL/LC_MESSAGES/messages.po | 4 ++-- application/locale/pl_PL/LC_MESSAGES/messages.po | 4 ++-- application/locale/pt_PT/LC_MESSAGES/messages.po | 4 ++-- application/locale/ru_RU/LC_MESSAGES/messages.po | 4 ++-- application/locale/sk/LC_MESSAGES/messages.po | 4 ++-- application/locale/sl/LC_MESSAGES/messages.po | 4 ++-- application/locale/sq/LC_MESSAGES/messages.po | 4 ++-- application/locale/sr/LC_MESSAGES/messages.po | 4 ++-- application/locale/sv_SE/LC_MESSAGES/messages.po | 4 ++-- application/locale/tr_TR/LC_MESSAGES/messages.po | 4 ++-- application/locale/zh_CN/LC_MESSAGES/messages.po | 4 ++-- assets/lang_src/messages.pot | 4 ++-- 29 files changed, 58 insertions(+), 58 deletions(-) diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 92063f92f..65295c9db 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2026-03-05 11:41+0000\n" +"POT-Creation-Date: 2026-03-05 15:20+0000\n" "PO-Revision-Date: 2024-11-01 08:53+0000\n" "Last-Translator: Plamen Panteleev \n" "Language-Team: Bulgarian \n" "Language-Team: Bosnian \n" "Language-Team: Montenegrin \n" "Language-Team: Czech \n" "Language-Team: German \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Estonian \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Croatian \n" "Language-Team: Hungarian \n" "Language-Team: Armenian \n" "Language-Team: Italian \n" "Language-Team: Japanese \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" "Language-Team: Russian \n" "Language-Team: Slovak \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" "Language-Team: Chinese (Simplified Han script) \n" "Language-Team: LANGUAGE \n" @@ -3624,7 +3624,7 @@ msgstr "" msgid "Bearing" msgstr "" -#: application/models/Logbookadvanced_model.php:1732 +#: application/models/Logbookadvanced_model.php:1730 msgid "VuccGrids table is empty. Please import the VUCC grids data first." msgstr ""