From ed02b0b6c7148e9492603ce46bf39de7b70f24c8 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 23 Dec 2023 04:27:00 +0000 Subject: [PATCH 1/8] Fix: Show "blue" bar for new spots at BS5 --- application/views/bandmap/list.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php index 1c2a115e..4fbebb89 100644 --- a/application/views/bandmap/list.php +++ b/application/views/bandmap/list.php @@ -18,6 +18,8 @@ -moz-transition: all 15s ease; -o-transition: all 15s ease; transition: all 15s ease; + --bs-table-bg: #5dade2; + --bs-table-accent-bg: #5dade2; } From 53e69594fef16edc98ad327217a9dd96aab3fb6b Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 26 Dec 2023 21:58:52 +0100 Subject: [PATCH 2/8] fix search field --- application/views/oqrs/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/oqrs/index.php b/application/views/oqrs/index.php index 5d0ed50a..d4e20564 100644 --- a/application/views/oqrs/index.php +++ b/application/views/oqrs/index.php @@ -19,7 +19,7 @@ } if ($groupedSearch == 'on') { echo 'This search will search in all station locations where OQRS is active.

- +
'; echo '
'; From 250d160b2efea6dacc8025f1d45f618e55781e7f Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 26 Dec 2023 21:59:03 +0100 Subject: [PATCH 3/8] remove station name --- application/views/oqrs/request_grouped.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/application/views/oqrs/request_grouped.php b/application/views/oqrs/request_grouped.php index b110706f..b0bd4a67 100644 --- a/application/views/oqrs/request_grouped.php +++ b/application/views/oqrs/request_grouped.php @@ -10,7 +10,6 @@ The following QSO(s) were found. Please fill out the date and time and submit yo Band Mode Callsign - Name @@ -24,7 +23,6 @@ The following QSO(s) were found. Please fill out the date and time and submit yo echo ''. $qso->col_band .''; echo ''; echo $qso->col_submode == null ? strtoupper($qso->col_mode) : strtoupper($qso->col_submode); echo ''; echo ''. $qso->station_callsign .''; - echo ''. $qso->station_profile_name .''; echo ''; } ?> From 4cedaf3d55205f9601a3a6e49bcc7f436da90ef2 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 27 Dec 2023 11:55:01 +0100 Subject: [PATCH 4/8] set default value for additional OQRS Option --- application/config/migration.php | 2 +- .../166_set_oqrs_stationname_option.php | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 application/migrations/166_set_oqrs_stationname_option.php diff --git a/application/config/migration.php b/application/config/migration.php index 82b16eba..a6519c61 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 165; +$config['migration_version'] = 166; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/166_set_oqrs_stationname_option.php b/application/migrations/166_set_oqrs_stationname_option.php new file mode 100644 index 00000000..0a798fe7 --- /dev/null +++ b/application/migrations/166_set_oqrs_stationname_option.php @@ -0,0 +1,20 @@ +db->query("INSERT INTO options (option_name, option_value, autoload) SELECT DISTINCT 'groupedSearchShowStationName', 'on', NULL FROM options WHERE NOT EXISTS (SELECT 1 FROM options WHERE option_name = 'groupedSearchShowStationName');"); + } + + public function down() + { + $this->db->query("DELETE FROM options WHERE option_name = 'groupedSearchShowStationName';"); + } +} From 76c2198cd153e4362e737014e99396875cfe12e6 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 27 Dec 2023 11:56:14 +0100 Subject: [PATCH 5/8] Station Name Column is optional --- application/controllers/Options.php | 2 ++ application/views/options/oqrs.php | 9 +++++++++ application/views/oqrs/request_grouped.php | 9 +++++++++ 3 files changed, 20 insertions(+) diff --git a/application/controllers/Options.php b/application/controllers/Options.php index 4a9ea734..a81a8865 100644 --- a/application/controllers/Options.php +++ b/application/controllers/Options.php @@ -338,6 +338,8 @@ class Options extends CI_Controller { $global_oqrs_text = $this->optionslib->update('groupedSearch', $this->input->post('groupedSearch'), null); + $global_oqrs_text = $this->optionslib->update('groupedSearchShowStationName', $this->input->post('groupedSearchShowStationName'), null); + if($global_oqrs_text == TRUE) { $this->session->set_flashdata('success', $this->lang->line('options_oqrs_options_have_been_saved')); } diff --git a/application/views/options/oqrs.php b/application/views/options/oqrs.php index 4499c207..82664daa 100644 --- a/application/views/options/oqrs.php +++ b/application/views/options/oqrs.php @@ -49,6 +49,15 @@ +
+ + + +
+ diff --git a/application/views/oqrs/request_grouped.php b/application/views/oqrs/request_grouped.php index b0bd4a67..62330269 100644 --- a/application/views/oqrs/request_grouped.php +++ b/application/views/oqrs/request_grouped.php @@ -10,6 +10,11 @@ The following QSO(s) were found. Please fill out the date and time and submit yo Band Mode Callsign + optionslib->get_option('groupedSearchShowStationName'); + if ($showStationName == 'on'): ?> + Station Name + @@ -23,6 +28,10 @@ The following QSO(s) were found. Please fill out the date and time and submit yo echo ''. $qso->col_band .''; echo ''; echo $qso->col_submode == null ? strtoupper($qso->col_mode) : strtoupper($qso->col_submode); echo ''; echo ''. $qso->station_callsign .''; + $showStationName = $this->optionslib->get_option('groupedSearchShowStationName'); + if ($showStationName == 'on'): + echo ''. $qso->station_profile_name .''; + endif; echo ''; } ?> From 0b687ad1ba73ecdf7eaa0e181d0ff26c68402934 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Wed, 27 Dec 2023 11:56:29 +0100 Subject: [PATCH 6/8] OQRS Language --- application/language/bulgarian/options_lang.php | 2 ++ application/language/chinese_simplified/options_lang.php | 2 ++ application/language/czech/options_lang.php | 2 ++ application/language/dutch/options_lang.php | 2 ++ application/language/english/options_lang.php | 2 ++ application/language/finnish/options_lang.php | 2 ++ application/language/french/options_lang.php | 2 ++ application/language/german/options_lang.php | 2 ++ application/language/greek/options_lang.php | 2 ++ application/language/italian/options_lang.php | 2 ++ application/language/polish/options_lang.php | 2 ++ application/language/russian/options_lang.php | 2 ++ application/language/spanish/options_lang.php | 2 ++ application/language/swedish/options_lang.php | 2 ++ application/language/turkish/options_lang.php | 2 ++ 15 files changed, 30 insertions(+) diff --git a/application/language/bulgarian/options_lang.php b/application/language/bulgarian/options_lang.php index adcb9bbb..837fe329 100644 --- a/application/language/bulgarian/options_lang.php +++ b/application/language/bulgarian/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; $lang['options_grouped_search'] = 'Grouped search'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/chinese_simplified/options_lang.php b/application/language/chinese_simplified/options_lang.php index 0cd60bda..76be657d 100644 --- a/application/language/chinese_simplified/options_lang.php +++ b/application/language/chinese_simplified/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = '全局文本'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = '该文本是一个可选文本，可以显示在OQRS页面的顶部。'; $lang['options_grouped_search'] = '分组搜索'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = '当此选项打开时，所有具有OQRS活动的电台位置将同时搜索。'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS选项已保存'; $lang['options_save'] = '保存'; diff --git a/application/language/czech/options_lang.php b/application/language/czech/options_lang.php index d0ab2fc0..b1bde503 100644 --- a/application/language/czech/options_lang.php +++ b/application/language/czech/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Globální text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Tento text je nepovinný text, který lze zobrazit na horní části stránky OQRS.'; $lang['options_grouped_search'] = 'Seskupené vyhledávání'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Když je tato možnost zapnutá, budou všechny stanice s aktivním OQRS vyhledávány najednou.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'Možnosti OQRS byly uloženy.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/dutch/options_lang.php b/application/language/dutch/options_lang.php index fa5c9b6d..c26ac382 100644 --- a/application/language/dutch/options_lang.php +++ b/application/language/dutch/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; $lang['options_grouped_search'] = 'Grouped search'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/english/options_lang.php b/application/language/english/options_lang.php index 4f05c772..a4f8b3cd 100644 --- a/application/language/english/options_lang.php +++ b/application/language/english/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; $lang['options_grouped_search'] = 'Grouped search'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/finnish/options_lang.php b/application/language/finnish/options_lang.php index 4e026c4f..ce1763c6 100644 --- a/application/language/finnish/options_lang.php +++ b/application/language/finnish/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; $lang['options_grouped_search'] = 'Grouped search'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/french/options_lang.php b/application/language/french/options_lang.php index 4f05c772..a4f8b3cd 100644 --- a/application/language/french/options_lang.php +++ b/application/language/french/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; $lang['options_grouped_search'] = 'Grouped search'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/german/options_lang.php b/application/language/german/options_lang.php index 3360d963..c6055f53 100644 --- a/application/language/german/options_lang.php +++ b/application/language/german/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Globaler Text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Dies ist ein optionaler Text, der auf oben auf der OQRS Seite angezeigt werden kann.'; $lang['options_grouped_search'] = 'Gruppierte Suche'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Wenn aktiviert, werden alle Stationsstandorte auf einmal durchsucht.'; +$lang['options_grouped_search_show_station_name'] = "Zeige den Name des Stationsstandorts in der gruppierten Suche"; +$lang['options_grouped_search_show_station_name_hint'] = "Wenn die gruppierte Suche eingeschaltet ist, kannst du hier entscheiden, ob der Name des Stationsstandortes in der Ergebnistabelle gezeigt werden soll oder nicht."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS Einstellungen wurden gespeichert.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/greek/options_lang.php b/application/language/greek/options_lang.php index 4f05c772..a4f8b3cd 100644 --- a/application/language/greek/options_lang.php +++ b/application/language/greek/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; $lang['options_grouped_search'] = 'Grouped search'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/italian/options_lang.php b/application/language/italian/options_lang.php index 4f05c772..a4f8b3cd 100644 --- a/application/language/italian/options_lang.php +++ b/application/language/italian/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; $lang['options_grouped_search'] = 'Grouped search'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/polish/options_lang.php b/application/language/polish/options_lang.php index 4f05c772..a4f8b3cd 100644 --- a/application/language/polish/options_lang.php +++ b/application/language/polish/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; $lang['options_grouped_search'] = 'Grouped search'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/russian/options_lang.php b/application/language/russian/options_lang.php index e2469959..9c881978 100644 --- a/application/language/russian/options_lang.php +++ b/application/language/russian/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Сообщение на странице OQRS'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Необязательный текст, который может быть отображён в верхней части страницы OQRS.'; $lang['options_grouped_search'] = 'Объединённый поиск'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'Если включено, то поиск будет осуществляться во всех местоположениях станций, где активен OQRS.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'Настройки OQRS сохранены.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/spanish/options_lang.php b/application/language/spanish/options_lang.php index 4f05c772..a4f8b3cd 100644 --- a/application/language/spanish/options_lang.php +++ b/application/language/spanish/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; $lang['options_grouped_search'] = 'Grouped search'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/swedish/options_lang.php b/application/language/swedish/options_lang.php index 0190786f..4003275f 100644 --- a/application/language/swedish/options_lang.php +++ b/application/language/swedish/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'Denna text är en valfri text som kan visas överst på OQRS-sidan.'; $lang['options_grouped_search'] = 'Grupperad sökning'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'När detta är på kommer alla stationsplatser med OQRS aktiv att sökas på en gång.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS-alternativ har sparats.'; $lang['options_dxcluster'] = 'DXCluster'; diff --git a/application/language/turkish/options_lang.php b/application/language/turkish/options_lang.php index 4f05c772..a4f8b3cd 100644 --- a/application/language/turkish/options_lang.php +++ b/application/language/turkish/options_lang.php @@ -58,6 +58,8 @@ $lang['options_global_text'] = 'Global text'; $lang['options_this_text_is_an_optional_text_that_can_be_displayed_on_top_of_the_oqrs_page'] = 'This text is an optional text that can be displayed on top of the OQRS page.'; $lang['options_grouped_search'] = 'Grouped search'; $lang['options_when_this_is_on_all_station_locations_with_oqrs_active_will_be_searched_at_once'] = 'When this is on, all station locations with OQRS active, will be searched at once.'; +$lang['options_grouped_search_show_station_name'] = "Show station location name in grouped search results"; +$lang['options_grouped_search_show_station_name_hint'] = "If grouped search is ON, you can decide if the name of the station location shall be shown in the results table."; $lang['options_oqrs_options_have_been_saved'] = 'OQRS options have been saved.'; $lang['options_dxcluster'] = 'DXCluster'; From be329157e6c1fd254834063d3835e30880175218 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Wed, 27 Dec 2023 17:02:19 +0100 Subject: [PATCH 7/8] Fixes query so that only qsos from your station_id is shown --- application/controllers/Logbook.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index b515fdb8..5ea9e40f 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -209,7 +209,7 @@ class Logbook extends CI_Controller { if(!empty($logbooks_locations_array)) { $extrawhere=''; if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) { - $extrawhere="COL_QSL_RCVD='Y'"; + $extrawhere="COL_QSL_RCVD='Y'"; } if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { @@ -336,10 +336,10 @@ class Logbook extends CI_Controller { $return['workedBefore'] = true; } - + $extrawhere=''; if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) { - $extrawhere="COL_QSL_RCVD='Y'"; + $extrawhere="COL_QSL_RCVD='Y'"; } if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { @@ -427,7 +427,7 @@ class Logbook extends CI_Controller { $extrawhere=''; if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) { - $extrawhere="COL_QSL_RCVD='Y'"; + $extrawhere="COL_QSL_RCVD='Y'"; } if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { @@ -528,7 +528,7 @@ class Logbook extends CI_Controller { $extrawhere=''; if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) { - $extrawhere="COL_QSL_RCVD='Y'"; + $extrawhere="COL_QSL_RCVD='Y'"; } if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { @@ -683,7 +683,7 @@ class Logbook extends CI_Controller { } echo "]"; - + // [MAP Custom] ADD Station // $this->load->model('Stations'); $station_json = $this->Stations->get_station_json_for_map(); @@ -737,16 +737,19 @@ class Logbook extends CI_Controller { $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); $this->db->where_in('station_profile.station_id', $logbooks_locations_array); - $this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', "desc"); + $this->db->group_start(); $this->db->where($this->config->item('table_name').'.COL_CALL', $id); $this->db->or_like($this->config->item('table_name').'.COL_CALL', '/'.$id,'before'); $this->db->or_like($this->config->item('table_name').'.COL_CALL', $id.'/','after'); $this->db->or_like($this->config->item('table_name').'.COL_CALL', '/'.$id.'/'); + $this->db->group_end(); $this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "desc"); $this->db->limit(5); + $c = $this->db->get_compiled_select(); + $query = $this->db->get(); } From f7729ed23c42ab0d5833f38b541f4ee491c610aa Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Wed, 27 Dec 2023 17:04:45 +0100 Subject: [PATCH 8/8] Removed debugging statement --- application/controllers/Logbook.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 5ea9e40f..3bf881aa 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -748,8 +748,6 @@ class Logbook extends CI_Controller { $this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "desc"); $this->db->limit(5); - $c = $this->db->get_compiled_select(); - $query = $this->db->get(); }