From 4ea3e0ff137f156c510cb32b139adfcdb300ea5c Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Sun, 8 Feb 2026 18:41:21 +0100 Subject: [PATCH] [Search] Removed incorrect CQ and ITU zones. Use DBtools instead --- application/controllers/Search.php | 24 ----- application/views/interface_assets/footer.php | 95 ------------------- application/views/search/cqzones.php | 50 ---------- application/views/search/cqzones_result.php | 53 ----------- application/views/search/filter.php | 6 -- application/views/search/ituzones.php | 50 ---------- application/views/search/ituzones_result.php | 53 ----------- application/views/search/lotw_unconfirmed.php | 6 -- application/views/search/main.php | 6 -- 9 files changed, 343 deletions(-) delete mode 100644 application/views/search/cqzones.php delete mode 100644 application/views/search/cqzones_result.php delete mode 100644 application/views/search/ituzones.php delete mode 100644 application/views/search/ituzones_result.php diff --git a/application/controllers/Search.php b/application/controllers/Search.php index 25b1e6263..e13ed4e85 100644 --- a/application/controllers/Search.php +++ b/application/controllers/Search.php @@ -44,30 +44,6 @@ class Search extends CI_Controller { } } - // Searches for incorrect CQ Zones - public function incorrect_cq_zones() { - $this->load->model('stations'); - - $data['station_profile'] = $this->stations->all_of_user(); - $data['page_title'] = __("Incorrectly logged CQ zones"); - - $this->load->view('interface_assets/header', $data); - $this->load->view('search/cqzones'); - $this->load->view('interface_assets/footer'); - } - - // Searches for incorrect ITU Zones - public function incorrect_itu_zones() { - $this->load->model('stations'); - - $data['station_profile'] = $this->stations->all_of_user(); - $data['page_title'] = __("Incorrectly logged ITU zones"); - - $this->load->view('interface_assets/header', $data); - $this->load->view('search/ituzones'); - $this->load->view('interface_assets/footer'); - } - // Searches for unconfirmed Lotw QSOs where QSO partner has uploaded to LoTW after the QSO date public function lotw_unconfirmed() { $this->load->model('stations'); diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 43f846c88..099d3f87a 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -998,100 +998,6 @@ function findlotwunconfirmed(){ }); } -function findincorrectcqzones() { - event.preventDefault(); - $('#partial_view').load(base_url+"index.php/logbook/search_incorrect_cq_zones/"+$("#station_id").val(), function() { - $('.qsolist').DataTable({ - "pageLength": 25, - responsive: false, - ordering: false, - "scrollY": "500px", - "scrollCollapse": true, - "paging": false, - "scrollX": true, - "language": { - url: getDataTablesLanguageUrl(), - }, - dom: 'Bfrtip', - buttons: [ - { - extend: 'csv', - className: 'mb-1 btn-sm btn btn-primary', // Bootstrap classes - init: function(api, node, config) { - $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies - }, - } - ] - }); - // change color of csv-button if dark mode is chosen - if (isDarkModeTheme()) { - $(".buttons-csv").css("color", "white"); - } - $('#btn-lba').removeAttr('hidden'); - $(document).ready(function() { - var target = document.body; - var observer = new MutationObserver(function() { - $('#dt-search-0').on('keyup', function (e) { - tocrappyzero=$(this).val().toUpperCase().replaceAll(/0/g, 'Ø'); - $(this).val(tocrappyzero); - $(this).trigger("input"); - }); - }); - var config = { childList: true, subtree: true}; - // pass in the target node, as well as the observer options - observer.observe(target, config); - }); - }); -} - -function findincorrectituzones() { - event.preventDefault(); - $('#partial_view').load(base_url+"index.php/logbook/search_incorrect_itu_zones/"+$("#station_id").val(), function() { - $('.qsolist').DataTable({ - "pageLength": 25, - responsive: false, - ordering: false, - "scrollY": "500px", - "scrollCollapse": true, - "paging": false, - "scrollX": true, - "language": { - url: getDataTablesLanguageUrl(), - }, - dom: 'Bfrtip', - buttons: [ - { - extend: 'csv', - className: 'mb-1 btn btn-sm btn-primary', // Bootstrap classes - init: function(api, node, config) { - $(node).removeClass('dt-button').addClass('btn btn-primary'); // Ensure Bootstrap class applies - }, - } -] - }); - // change color of csv-button if dark mode is chosen - if (isDarkModeTheme()) { - $(".buttons-csv").css("color", "white"); - } - $('#btn-lba').removeAttr('hidden'); - - $(document).ready(function() { - var target = document.body; - var observer = new MutationObserver(function() { - $('#dt-search-0').on('keyup', function (e) { - tocrappyzero=$(this).val().toUpperCase().replaceAll(/0/g, 'Ø'); - $(this).val(tocrappyzero); - $(this).trigger("input"); - }); - }); - var config = { childList: true, subtree: true}; - // pass in the target node, as well as the observer options - observer.observe(target, config); - }); - - }); -} - function searchButtonPress() { if (event) { event.preventDefault(); } if ($('#callsign').val()) { @@ -1120,7 +1026,6 @@ $($('#callsign')).on('keypress',function(e) { } }); - }); diff --git a/application/views/search/cqzones.php b/application/views/search/cqzones.php deleted file mode 100644 index f6e25f6c2..000000000 --- a/application/views/search/cqzones.php +++ /dev/null @@ -1,50 +0,0 @@ -
- -

- - -

- -
-
-
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
-
- - -
- -
-
- -
diff --git a/application/views/search/cqzones_result.php b/application/views/search/cqzones_result.php deleted file mode 100644 index b01b39d10..000000000 --- a/application/views/search/cqzones_result.php +++ /dev/null @@ -1,53 +0,0 @@ -result() != NULL) { - echo __("The following QSOs were found to have an incorrect CQ zone that this DXCC normally has (a maximum of 5000 QSOs are shown):"); - echo ' - - - - - - - - - - - - - - '; - - // Get Date format - if($this->session->userdata('user_date_format')) { - // If Logged in and session exists - $custom_date_format = $this->session->userdata('user_date_format'); - } else { - // Get Default date format from /config/wavelog.php - $custom_date_format = $this->config->item('qso_date_format'); - } - - $i = 0; - - foreach ($qsos->result() as $qso) { - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - } - - echo '
' . __("Date") . '' . __("Time") . '' . __("Callsign") . '' . __("Mode") . '' . __("Band") . '' . __("Gridsquare") . '' . __("CQ Zone") . '' . __("DXCC CQ Zone") . '' . __("DXCC") . '' . __("Station") . '
'; $timestamp = strtotime($qso->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo ''; $timestamp = strtotime($qso->COL_TIME_ON); echo date('H:i', $timestamp); echo '' . str_replace("0","Ø",strtoupper($qso->COL_CALL)) . ''; echo $qso->COL_SUBMODE==null?$qso->COL_MODE:$qso->COL_SUBMODE; echo ''; if($qso->COL_SAT_NAME != null) { echo $qso->COL_SAT_NAME; } else { echo strtolower($qso->COL_BAND); }; echo ''; echo strlen($qso->COL_GRIDSQUARE ?? '')==0?$qso->COL_VUCC_GRIDS:$qso->COL_GRIDSQUARE; echo '' . $qso->COL_CQZ . '' . $qso->correctcqzone . '' . ucwords(strtolower($qso->COL_COUNTRY), "- (/") . '' . $qso->station_callsign . '
'; - ?> - - ' . __("No incorrect CQ Zones were found.") . ''; -} -?> diff --git a/application/views/search/filter.php b/application/views/search/filter.php index 1bb8e727d..b577c012c 100644 --- a/application/views/search/filter.php +++ b/application/views/search/filter.php @@ -21,12 +21,6 @@
  • -
    • -
  • - -
    • -
  • -
  • diff --git a/application/views/search/ituzones.php b/application/views/search/ituzones.php deleted file mode 100644 index ab3015122..000000000 --- a/application/views/search/ituzones.php +++ /dev/null @@ -1,50 +0,0 @@ -
    - -

    - - -

    - -
    -
    -
      -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    -
    -
    - - -
    - -
    -
    - -
    diff --git a/application/views/search/ituzones_result.php b/application/views/search/ituzones_result.php deleted file mode 100644 index a44f5e99c..000000000 --- a/application/views/search/ituzones_result.php +++ /dev/null @@ -1,53 +0,0 @@ -result() != NULL) { - echo __("The following QSOs were found to have an incorrect ITU zone that this DXCC normally has (a maximum of 5000 QSOs are shown):"); - echo ' - - - - - - - - - - - - - - '; - - // Get Date format - if($this->session->userdata('user_date_format')) { - // If Logged in and session exists - $custom_date_format = $this->session->userdata('user_date_format'); - } else { - // Get Default date format from /config/wavelog.php - $custom_date_format = $this->config->item('qso_date_format'); - } - - $i = 0; - - foreach ($qsos->result() as $qso) { - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - } - - echo '
    ' . __("Date") . '' . __("Time") . '' . __("Callsign") . '' . __("Mode") . '' . __("Band") . '' . __("Gridsquare") . '' . __("ITU Zone") . '' . __("DXCC ITU Zone") . '' . __("DXCC") . '' . __("Station") . '
    '; $timestamp = strtotime($qso->COL_TIME_ON); echo date($custom_date_format, $timestamp); echo ''; $timestamp = strtotime($qso->COL_TIME_ON); echo date('H:i', $timestamp); echo '' . str_replace("0","Ø",strtoupper($qso->COL_CALL)) . ''; echo $qso->COL_SUBMODE==null?$qso->COL_MODE:$qso->COL_SUBMODE; echo ''; if($qso->COL_SAT_NAME != null) { echo $qso->COL_SAT_NAME; } else { echo strtolower($qso->COL_BAND); }; echo ''; echo strlen($qso->COL_GRIDSQUARE ?? '')==0?$qso->COL_VUCC_GRIDS:$qso->COL_GRIDSQUARE; echo '' . $qso->COL_ITUZ . '' . $qso->correctituzone . '' . ucwords(strtolower($qso->COL_COUNTRY), "- (/") . '' . $qso->station_callsign . '
    '; - ?> - - ' . __("No incorrect CQ Zones were found.") . ''; -} -?> diff --git a/application/views/search/lotw_unconfirmed.php b/application/views/search/lotw_unconfirmed.php index 3b84ac583..9edbf6e68 100644 --- a/application/views/search/lotw_unconfirmed.php +++ b/application/views/search/lotw_unconfirmed.php @@ -13,12 +13,6 @@
  • -
    • -
  • - -
    • -
  • -
  • diff --git a/application/views/search/main.php b/application/views/search/main.php index d22864c8f..511d18b14 100644 --- a/application/views/search/main.php +++ b/application/views/search/main.php @@ -13,12 +13,6 @@
  • -
    • -
  • - -
    • -
  • -