From 6a6221bba504009600848673beb132b0b1b27c3c Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 29 May 2024 15:56:46 +0100 Subject: [PATCH 01/26] Forgot to add Alaska to USA --- assets/js/sections/station_locations.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index 07c890cfd..a233c7d42 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -22,7 +22,8 @@ $(document).ready( function () { '132': 'paraguay_state', '137': 'korea_state', '144': 'uruguay_state', - '291': 'us_state' + '291': 'us_state', + '6': 'us_state' // Alaska }; // Hide all states initially From 7d5ff634176e1a3b3c2fcebf51241e28252cca34 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 30 May 2024 14:21:48 +0100 Subject: [PATCH 02/26] Readme updated --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 82ba8a9c5..a9359ec03 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ -# Cloudlog +[![Cypress Tests](https://github.com/magicbug/Cloudlog/actions/workflows/cypress-tests.yml/badge.svg)](https://github.com/magicbug/Cloudlog/actions/workflows/cypress-tests.yml) +# Cloudlog > Important: Only accepting PRs on the "dev" branch. Cloudlog is a self-hosted PHP application that allows you to log your amateur radio contacts anywhere. All you need is a web browser and active internet connection. -While Cloudlog as started by Peter Goodhall, 2M0SQL, it is has gained a core group of contributors these are listed below. If you would like to contribute to Cloudlog please see the [Contributing](#contributing) section below. - -Core Contributors: 2M0SQL ([@magicbug](https://github.com/magicbug)), LA8AJA ([@AndreasK79](https://github.com/AndreasK79)), DF2ET ([@phl0](https://github.com/phl0)), HB9HIL ([@HB9HIL](https://github.com/HB9HIL)), DJ7NT ([@int2001](https://github.com/int2001)) +While Cloudlog as started by Peter Goodhall, 2M0SQL, although since has received a lot of community code contributions. If you would like to contribute to Cloudlog please see the [Contributing](#contributing) section below. Website: [http://www.cloudlog.co.uk](http://www.cloudlog.co.uk) @@ -114,7 +113,11 @@ If you would prefer not to setup Cloudlog yourself [magicbug](https://magicbug.c If you would like to contribute in any way to Cloudlog, it is most appreciated. This has been developed in free time, help coding new features or writing documentation is always useful. -Please note that Cloudlog was built using [Codeigniter](https://www.codeigniter.com/docs) version 3 and uses Bootstrap 4 for the user CSS framework documentation is available for this when building components. +Please note that Cloudlog was built using [Codeigniter](https://www.codeigniter.com/userguide3/) version 3 and uses [Bootstrap 5](https://getbootstrap.com/docs/5.3/getting-started/introduction/) as the frontend toolkit. + +We also [HTMX](https://htmx.org/) for AJAX requests and [jQuery](https://jquery.com/) for some of the frontend functionality. We use [Font Awesome](https://fontawesome.com/) for icons. + +At the moment we use [Cypress](https://www.cypress.io/) for end-to-end testing. When submitting PRs please make sure code is commented and includes one feature only, multiple features or bug fixes will not be accepted. Please include a description of what your PR does and why it is needed. From b3db31aa05220ef971399dc55cc826f17a8fbae1 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 30 May 2024 14:26:18 +0100 Subject: [PATCH 03/26] Old comment --- assets/js/sections/station_locations.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index a233c7d42..cc6c9c27a 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -1,7 +1,5 @@ $(document).ready( function () { - // Use Jquery to hide div ca_state - $('#station_locations_table').DataTable({ "stateSave": true, "language": { From 7741c3830521e8d48e4f2fd86ce4ed2c7cb89b38 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 30 May 2024 14:28:01 +0100 Subject: [PATCH 04/26] Add better comments --- assets/js/sections/station_locations.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index cc6c9c27a..7510a2be1 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -1,5 +1,13 @@ +/** + * Initializes the DataTable and handles the logic for showing/hiding states based on the selected DXCC ID. + */ $(document).ready( function () { + /** + * Initializes the DataTable with state saving enabled and custom language settings. + * + * @type {DataTable} + */ $('#station_locations_table').DataTable({ "stateSave": true, "language": { @@ -7,6 +15,11 @@ $(document).ready( function () { } }); + /** + * Maps DXCC IDs to their corresponding state IDs. + * + * @type {Object} + */ var stateMap = { '1': 'canada_state', '5': 'aland_state', @@ -27,6 +40,9 @@ $(document).ready( function () { // Hide all states initially $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state").hide(); + /** + * Gets the selected DXCC ID and shows the corresponding state. + */ var selectedDXCCID = $('#dxcc_select').find(":selected").val(); var stateToShow = stateMap[selectedDXCCID]; @@ -38,6 +54,10 @@ $(document).ready( function () { $("#us_state").show(); } + /** + * Handles the change event of the DXCC select element. + * Shows the corresponding state based on the selected DXCC ID. + */ $('#dxcc_select').change(function(){ var selectedValue = $(this).val(); var stateToShow = stateMap[selectedValue] || stateMap['default']; From afb567c9c36002d88ffd09786450a2ad244dd4b0 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 30 May 2024 21:14:28 +0100 Subject: [PATCH 05/26] [Dashboard] Update the QSO Today every few seconds --- application/views/dashboard/index.php | 198 +++++++++++++------------- 1 file changed, 100 insertions(+), 98 deletions(-) diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 3b3711d5e..1742d2e8c 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -143,7 +143,7 @@ function echo_table_col($row, $name) case 'Flag': $ci->load->library('DxccFlag'); $flag = strtolower($ci->dxccflag->getISO($row->COL_DXCC)); - echo 'name))) . '">'; + echo 'name))) . '">'; break; } } @@ -185,15 +185,17 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) optionslib->get_option('dashboard_banner') != "false") { ?> - = 1) { ?> - - - - +
+ = 1) { ?> + + + + +
@@ -294,80 +296,80 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) - - - config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_rcvd != 0 || $total_qsl_requested != 0)) { ?> - - - - - - - - - - - - - - - - - - - - - - -
- + + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_qsl_sent != 0 || $total_qsl_rcvd != 0 || $total_qsl_requested != 0)) { ?> + + + + + + + + + + + + + + + + + + + + + + + +
+ - config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_rcvd != 0)) { ?> - - - - - - - - - - - - - - - - - -
- + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) && ($total_eqsl_sent != 0 || $total_eqsl_rcvd != 0)) { ?> + + + + + + + + + + + + + + + + + +
+ - config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === false) && ($total_lotw_sent != 0 || $total_lotw_rcvd != 0)) { ?> - - - - - - - - - - - - - - - - - -
- + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === false) && ($total_lotw_sent != 0 || $total_lotw_rcvd != 0)) { ?> + + + + + + + + + + + + + + + + + +
+ config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === false) && ($total_qrz_sent != 0 || $total_qrz_rcvd != 0)) { ?> @@ -392,27 +394,27 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) - config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE)) { ?> - - - - - - - - - - - - - - - - - - -
VUCC-GridsSAT
- + config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE)) { ?> + + + + + + + + + + + + + + + + + + +
VUCC-GridsSAT
+ From d1360ed3aa9bdb264d7ad616b6dd4a1d3b355d5e Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 5 Jun 2024 15:03:39 +0100 Subject: [PATCH 06/26] [Station Locations] Added venezuela states --- application/views/station_profile/edit.php | 31 ++++++++++++++++++++++ assets/js/sections/station_locations.js | 5 ++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 3687406c2..3e5f59334 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -529,6 +529,37 @@ +
+ + + +
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index 7510a2be1..18e9dd863 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -34,11 +34,12 @@ $(document).ready( function () { '137': 'korea_state', '144': 'uruguay_state', '291': 'us_state', + '148': 'venezuela_state', '6': 'us_state' // Alaska }; // Hide all states initially - $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state").hide(); + $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state").hide(); /** * Gets the selected DXCC ID and shows the corresponding state. @@ -63,7 +64,7 @@ $(document).ready( function () { var stateToShow = stateMap[selectedValue] || stateMap['default']; // Hide all states - $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state").hide(); + $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state").hide(); // Show the selected state $("#" + stateToShow).show(); From 83ce05642a5ae7319d6be9442f763ec92a079710 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 5 Jun 2024 15:05:28 +0100 Subject: [PATCH 07/26] [Station Locations] Added australia states --- application/views/station_profile/edit.php | 15 +++++++++++++++ assets/js/sections/station_locations.js | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 3e5f59334..a6bb4db74 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -561,6 +561,21 @@ +
+ + + +
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index 18e9dd863..8278eff73 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -35,11 +35,12 @@ $(document).ready( function () { '144': 'uruguay_state', '291': 'us_state', '148': 'venezuela_state', + '150': 'australia_state', '6': 'us_state' // Alaska }; // Hide all states initially - $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state").hide(); + $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state").hide(); /** * Gets the selected DXCC ID and shows the corresponding state. @@ -64,7 +65,7 @@ $(document).ready( function () { var stateToShow = stateMap[selectedValue] || stateMap['default']; // Hide all states - $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state").hide(); + $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state").hide(); // Show the selected state $("#" + stateToShow).show(); From 51886c73188f476247f4c54b5f05535b23b3cc53 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 5 Jun 2024 15:08:34 +0100 Subject: [PATCH 08/26] [Station Location] Added Papua New Guinea States --- application/views/station_profile/edit.php | 28 ++++++++++++++++++++++ assets/js/sections/station_locations.js | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index a6bb4db74..9709055cf 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -577,6 +577,34 @@ +
+ + + +
+
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index 8278eff73..0c9becf35 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -36,11 +36,12 @@ $(document).ready( function () { '291': 'us_state', '148': 'venezuela_state', '150': 'australia_state', + '163': 'png_state', '6': 'us_state' // Alaska }; // Hide all states initially - $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state").hide(); + $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state").hide(); /** * Gets the selected DXCC ID and shows the corresponding state. @@ -65,7 +66,7 @@ $(document).ready( function () { var stateToShow = stateMap[selectedValue] || stateMap['default']; // Hide all states - $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state").hide(); + $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state").hide(); // Show the selected state $("#" + stateToShow).show(); From d76896edd8083d86710b4ec0af33ed05d2c76cbb Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 5 Jun 2024 15:11:02 +0100 Subject: [PATCH 09/26] [Station Locations] Added New Zealand States --- application/views/station_profile/edit.php | 25 ++++++++++++++++++++++ assets/js/sections/station_locations.js | 6 +++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 9709055cf..2baa1c284 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -605,6 +605,31 @@
+
+ + + +
+ +
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index 0c9becf35..b9acbf05f 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -37,12 +37,12 @@ $(document).ready( function () { '148': 'venezuela_state', '150': 'australia_state', '163': 'png_state', + '170': 'nz_state', '6': 'us_state' // Alaska }; // Hide all states initially - $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state").hide(); - + $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state").hide(); /** * Gets the selected DXCC ID and shows the corresponding state. */ @@ -66,7 +66,7 @@ $(document).ready( function () { var stateToShow = stateMap[selectedValue] || stateMap['default']; // Hide all states - $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state").hide(); + $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state").hide(); // Show the selected state $("#" + stateToShow).show(); From f40b244f737ae7e10a7f3dd8f9f65ba75ddd94ea Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 5 Jun 2024 15:13:37 +0100 Subject: [PATCH 10/26] [Station Location] Added Belgium States --- application/views/station_profile/edit.php | 18 ++++++++++++++++++ assets/js/sections/station_locations.js | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 2baa1c284..4c4f4a42a 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -629,6 +629,24 @@
+
+ + + +
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index b9acbf05f..4d28ed9ef 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -38,11 +38,12 @@ $(document).ready( function () { '150': 'australia_state', '163': 'png_state', '170': 'nz_state', + '209': 'belgium_state', '6': 'us_state' // Alaska }; // Hide all states initially - $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state").hide(); + $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state").hide(); /** * Gets the selected DXCC ID and shows the corresponding state. */ @@ -66,7 +67,7 @@ $(document).ready( function () { var stateToShow = stateMap[selectedValue] || stateMap['default']; // Hide all states - $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state").hide(); + $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state").hide(); // Show the selected state $("#" + stateToShow).show(); From f1f1817901f383edf340a28905c56a03b4f3ae7a Mon Sep 17 00:00:00 2001 From: Emiliano Macedonio Date: Tue, 11 Jun 2024 12:57:02 +0200 Subject: [PATCH 11/26] Added Flag to Maps Popups --- application/models/Logbook_model.php | 22 +++++++++++-------- application/views/interface_assets/footer.php | 6 +++-- assets/js/leaflet/leafembed.js | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 570f5063e..61f3129b4 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -4764,19 +4764,23 @@ public function check_qso_is_accessible($id) // [JSON PLOT] return array for plot qso for map // public function get_plot_array_for_map($qsos_result, $isVisitor = false) - { +{ $this->load->library('qra'); - + $CI = &get_instance(); + $CI->load->library('DxccFlag'); + $json["markers"] = array(); - + foreach ($qsos_result as $row) { - $plot = array('lat' => 0, 'lng' => 0, 'html' => '', 'label' => '', 'confirmed' => 'N'); - + $plot = array('lat' => 0, 'lng' => 0, 'html' => '', 'label' => '', 'flag' => '', 'confirmed' => 'N'); + $plot['label'] = $row->COL_CALL; - - $plot['html'] = "Callsign: " . $row->COL_CALL . "
Date/Time: " . $row->COL_TIME_ON . "
"; - $plot['html'] .= ($row->COL_SAT_NAME != null) ? ("SAT: " . $row->COL_SAT_NAME . "
") : ("Band: " . $row->COL_BAND . "
"); - $plot['html'] .= "Mode: " . ($row->COL_SUBMODE == null ? $row->COL_MODE : $row->COL_SUBMODE) . "
"; + $flag = strtolower($CI->dxccflag->getISO($row->COL_DXCC)); + $plot['flag'] = 'name))) . '"> '; + $plot['html'] = ($row->COL_GRIDSQUARE != null ? "Grid: " . $row->COL_GRIDSQUARE . "
" : ""); + $plot['html'] .= "Date/Time: " . $row->COL_TIME_ON . "
"; + $plot['html'] .= ($row->COL_SAT_NAME != null) ? ("SAT: " . $row->COL_SAT_NAME . "
") : ("Band: " . $row->COL_BAND . " "); + $plot['html'] .= "Mode: " . ($row->COL_SUBMODE == null ? $row->COL_MODE : $row->COL_SUBMODE) . "
"; // check if qso is confirmed // if (!$isVisitor) { diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index ce10ab4a9..846d61673 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -898,17 +898,19 @@ function loadMarkers() { var newMarkers = {}; data.markers.forEach(marker => { var key = `${marker.lat},${marker.lng}`; + var html = `

${marker.flag}${marker.label}

${marker.html}`; newMarkers[key] = marker; if (!markers[key]) { var icon = L.divIcon({ className: 'custom-icon', html: `` - }); + }); + L.marker([marker.lat, marker.lng], { icon: icon }) .addTo(map) - .bindPopup(marker.html); + .bindPopup(html); } }); Object.keys(markers).forEach(key => { diff --git a/assets/js/leaflet/leafembed.js b/assets/js/leaflet/leafembed.js index ff6c908f7..b2a59bf95 100644 --- a/assets/js/leaflet/leafembed.js +++ b/assets/js/leaflet/leafembed.js @@ -92,7 +92,7 @@ function createPlots(_plot) { plotmark.data=_plot; map.addLayer(plotmark); if ((typeof _plot.label!=="undefined")&&(typeof _plot.html!=="undefined")) { - _plot.label = (_plot.label!="")?("

"+_plot.label+"

"):""; + _plot.label = (_plot.label!="")?("

"+ _plot.flag + _plot.label+"

"):""; if ((_plot.label+_plot.html)!="") { plotmark.bindPopup(_plot.label+_plot.html); } } plotlayers.push(plotmark); From 7940ffcde983c0e9859b24daf5cba373b65f660f Mon Sep 17 00:00:00 2001 From: Emiliano Macedonio Date: Tue, 11 Jun 2024 14:33:51 +0200 Subject: [PATCH 12/26] Added Italian States --- application/views/station_profile/edit.php | 111 +++++++++++++++++++++ assets/js/sections/station_locations.js | 7 +- 2 files changed, 115 insertions(+), 3 deletions(-) diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index 4c4f4a42a..48223a043 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -648,6 +648,117 @@ +
+ + + +
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index 4d28ed9ef..ba2061a57 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -38,12 +38,13 @@ $(document).ready( function () { '150': 'australia_state', '163': 'png_state', '170': 'nz_state', - '209': 'belgium_state', + '209': 'belgium_state', + '248': 'italy_state', '6': 'us_state' // Alaska }; // Hide all states initially - $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state").hide(); + $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state"").hide(); /** * Gets the selected DXCC ID and shows the corresponding state. */ @@ -67,7 +68,7 @@ $(document).ready( function () { var stateToShow = stateMap[selectedValue] || stateMap['default']; // Hide all states - $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state").hide(); + $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state"").hide(); // Show the selected state $("#" + stateToShow).show(); From f2f872f2df7148d1ed7f91dd4e5a0e70738d1677 Mon Sep 17 00:00:00 2001 From: Emiliano Macedonio Date: Tue, 11 Jun 2024 15:09:02 +0200 Subject: [PATCH 13/26] small translation error --- application/language/italian/general_words_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index 3e3fe9ffb..baaf37008 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -56,7 +56,7 @@ $lang['general_word_light'] = "Luce/Laser"; $lang['general_word_worked'] = 'Lavorato'; $lang['general_word_worked_not_confirmed'] = "Lavorato non confermato"; -$lang['general_word_not_worked'] = "Non ha funzionato"; +$lang['general_word_not_worked'] = "Non Lavorato"; $lang['general_word_confirmed'] = 'Confermato'; $lang['general_word_confirmation'] = "Conferma"; $lang['general_word_needed'] = 'Necessario'; From 54dea657ec8e556600ea89c48d13bd16d5675a0f Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 11 Jun 2024 14:50:27 +0100 Subject: [PATCH 14/26] Start of the new Setup Welcome code --- application/controllers/Dashboard.php | 10 +++++++ application/controllers/Information.php | 37 +++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 application/controllers/Information.php diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index f20a2874c..4cdc91d20 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -34,6 +34,16 @@ public function index() $this->load->model('logbooks_model'); $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); + /* + Setup Code + // Check if the user has any logbook locations if not its setup time + if (empty($logbooks_locations_array)) { + // user has no locations + $this->session->set_flashdata('notice', 'You have no locations, please add one to continue.'); + redirect('information/welcome'); + } + */ + // Calculate Lat/Lng from Locator to use on Maps if ($this->session->userdata('user_locator')) { $this->load->library('qra'); diff --git a/application/controllers/Information.php b/application/controllers/Information.php new file mode 100644 index 000000000..42d4701c0 --- /dev/null +++ b/application/controllers/Information.php @@ -0,0 +1,37 @@ +load->model('user_model'); + // Make sure users logged in + if ($this->user_model->validate_session() == 0) { + // user is not logged in + redirect('user/login'); + } + $this->load->model('logbooks_model'); + $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); + + echo "welcome to cloudlog"; + + // check if user has any station logbooks + + // if user has no logbooks create a General Logbook + + // If logbooks_locations_array is empty + if (empty($logbooks_locations_array)) { + // user has no locations + echo "You have no locations, please add one to continue."; + } + + // Check if they have provided a valid grid locator + + // Check if Callbook information is provided + + // Check country files are present + + // If all is present welcome the user and redirect to the dashboard + } +} \ No newline at end of file From f5ba31df30be3364fefc8830f02c519bb54256cb Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 11 Jun 2024 15:00:32 +0100 Subject: [PATCH 15/26] Update Information.php --- application/controllers/Information.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/controllers/Information.php b/application/controllers/Information.php index 42d4701c0..061f825e2 100644 --- a/application/controllers/Information.php +++ b/application/controllers/Information.php @@ -32,6 +32,8 @@ public function welcome() // Check country files are present + // Information about Cloudlog Aurora + // If all is present welcome the user and redirect to the dashboard } } \ No newline at end of file From d99fc35a3bd91d3b6a936bc4a3a09b5f51e6bbed Mon Sep 17 00:00:00 2001 From: Emiliano Macedonio Date: Tue, 11 Jun 2024 17:35:15 +0200 Subject: [PATCH 16/26] Font correction Map Popup in Advanced Logbook --- assets/js/sections/logbookadvanced.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 984440024..b13acf1e3 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -1012,11 +1012,11 @@ function loadMap(data) { var table = '' + '' + '" + '' + '"; return (table += "
' + - 'Station callsign: ' + qso.mycallsign + + '

' + qso.mycallsign + '

' + "
' + - 'Gridsquare: ' + qso.mygridsquare + + 'Gridsquare ' + qso.mygridsquare + "
"); } @@ -1024,41 +1024,41 @@ function loadMap(data) { function createContentMessageDx(qso) { var table = '' + '' + - '' + + '' + '' + '' + '' + - '' + + '' + '' + '' + ''; if (qso.satname != "") { - table += '' + + table += '' + '' + '' + ''; } else { - table += '' + + table += '' + '' + '' + ''; } - table += '' + + table += '' + '' + '' + ''; if (qso.gridsquare != undefined) { - table += '' + + table += '' + '' + ''; } if (qso.distance != undefined) { - table += '' + + table += '' + '' + ''; } if (qso.bearing != undefined) { - table += '' + + table += '' + '' + ''; } From a685b233c6a3a1ec706fbb01146c7b874d3da45c Mon Sep 17 00:00:00 2001 From: Danny Date: Sun, 16 Jun 2024 19:40:24 +0200 Subject: [PATCH 17/26] Distances worked analytics: bugfix and average distance --- application/language/bulgarian/statistics_lang.php | 4 +++- .../language/chinese_simplified/statistics_lang.php | 2 ++ application/language/czech/statistics_lang.php | 4 +++- application/language/dutch/statistics_lang.php | 4 +++- application/language/english/statistics_lang.php | 4 +++- application/language/finnish/statistics_lang.php | 4 +++- application/language/french/statistics_lang.php | 10 ++++++---- application/language/german/statistics_lang.php | 2 ++ application/language/greek/statistics_lang.php | 4 +++- application/language/italian/statistics_lang.php | 4 +++- application/language/polish/statistics_lang.php | 4 +++- application/language/russian/statistics_lang.php | 2 ++ application/language/spanish/statistics_lang.php | 4 +++- application/language/swedish/statistics_lang.php | 4 +++- application/language/turkish/statistics_lang.php | 4 +++- application/models/Distances_model.php | 12 +++++++++--- application/views/distances/index.php | 4 +++- assets/js/sections/distances.js | 3 ++- 18 files changed, 59 insertions(+), 20 deletions(-) diff --git a/application/language/bulgarian/statistics_lang.php b/application/language/bulgarian/statistics_lang.php index 97a2f0b93..70bb61035 100644 --- a/application/language/bulgarian/statistics_lang.php +++ b/application/language/bulgarian/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "All"; $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is"; $lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; $lang['statistics_distances_qsos_with'] = "QSOs with"; diff --git a/application/language/chinese_simplified/statistics_lang.php b/application/language/chinese_simplified/statistics_lang.php index 6e8acf079..76c298c37 100644 --- a/application/language/chinese_simplified/statistics_lang.php +++ b/application/language/chinese_simplified/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "全部"; $lang['statistics_distances_worked'] = "通联距离"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "次通联
您最远的通联是与"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "在网格"; $lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "距离是"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "平均距离是"; $lang['statistics_distances_number_of_qsos'] = "QSO 数量"; $lang['statistics_distances_callsigns_worked'] = "通联的呼号（最多显示5个）："; $lang['statistics_distances_qsos_with'] = "QSO 与"; diff --git a/application/language/czech/statistics_lang.php b/application/language/czech/statistics_lang.php index f636a7d14..8ccc495d3 100644 --- a/application/language/czech/statistics_lang.php +++ b/application/language/czech/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "All"; $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is"; $lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; $lang['statistics_distances_qsos_with'] = "QSOs with"; diff --git a/application/language/dutch/statistics_lang.php b/application/language/dutch/statistics_lang.php index 62bfe00dd..90d55860f 100644 --- a/application/language/dutch/statistics_lang.php +++ b/application/language/dutch/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "All"; $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is"; $lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; $lang['statistics_distances_qsos_with'] = "QSOs with"; diff --git a/application/language/english/statistics_lang.php b/application/language/english/statistics_lang.php index c995c0f2a..a3576bf21 100644 --- a/application/language/english/statistics_lang.php +++ b/application/language/english/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "All"; $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is"; $lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; $lang['statistics_distances_qsos_with'] = "QSOs with"; diff --git a/application/language/finnish/statistics_lang.php b/application/language/finnish/statistics_lang.php index c5b611023..c7811d6b8 100644 --- a/application/language/finnish/statistics_lang.php +++ b/application/language/finnish/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "All"; $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is"; $lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; $lang['statistics_distances_qsos_with'] = "QSOs with"; diff --git a/application/language/french/statistics_lang.php b/application/language/french/statistics_lang.php index c9631523d..930bee8a7 100644 --- a/application/language/french/statistics_lang.php +++ b/application/language/french/statistics_lang.php @@ -25,10 +25,12 @@ * */ -$lang['statistics_distances_worked'] = "Nombre de QSOs par plage de distances réalisées"; -$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts utilisés pour le graphique.
Le dernier contact réalisé est : "; -$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = ", avec le locator : "; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = ", pour une distance de : "; +$lang['statistics_distances_bands_all'] = "Toutes"; +$lang['statistics_distances_worked'] = "Nombre de QSOs réalisés par plage de distance"; +$lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts utilisés pour le graphique.
Le contact le plus lointain réalisé est "; +$lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "avec le locator"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "La distance maximale est de"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "La distance moyenne est de"; $lang['statistics_distances_number_of_qsos'] = "Nombre de QSOs"; $lang['statistics_distances_callsigns_worked'] = "Indicatif(s) contacté(s) (liste de 5 max)"; $lang['statistics_distances_qsos_with'] = "QSOs avec"; diff --git a/application/language/german/statistics_lang.php b/application/language/german/statistics_lang.php index f91e0d988..aa0071b1e 100644 --- a/application/language/german/statistics_lang.php +++ b/application/language/german/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "Alle"; $lang['statistics_distances_worked'] = "Gearbeitete Entfernungen"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "Kontakte wurden dargestellt.
Der weiteste Kontakt war"; // make sure'
' stays there $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "im Planquadrat"; $lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "Die Distanz betrug"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "Die durchschnittliche Distanz ist"; $lang['statistics_distances_number_of_qsos'] = "Anzahl der QSOs"; $lang['statistics_distances_callsigns_worked'] = "Gearbeitete(s) Rufzeichen (max 5 werden gezeigt)"; $lang['statistics_distances_qsos_with'] = "QSOs mit"; diff --git a/application/language/greek/statistics_lang.php b/application/language/greek/statistics_lang.php index c995c0f2a..a3576bf21 100644 --- a/application/language/greek/statistics_lang.php +++ b/application/language/greek/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "All"; $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is"; $lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; $lang['statistics_distances_qsos_with'] = "QSOs with"; diff --git a/application/language/italian/statistics_lang.php b/application/language/italian/statistics_lang.php index a38b91289..8c412c23a 100644 --- a/application/language/italian/statistics_lang.php +++ b/application/language/italian/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "Tutte"; $lang['statistics_distances_worked'] = "Distanze percorse"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "i contatti sono stati tracciati.
Il tuo contatto più lontano era con"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "nella griglia"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "la distanza era"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "La distanza era"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "La distanza media è"; $lang['statistics_distances_number_of_qsos'] = "Numero di QSO"; $lang['statistics_distances_callsigns_worked'] = "Nominativo(i) funzionante(i max 5 mostrati)"; $lang['statistics_distances_qsos_with'] = "QSO con"; diff --git a/application/language/polish/statistics_lang.php b/application/language/polish/statistics_lang.php index c995c0f2a..a3576bf21 100644 --- a/application/language/polish/statistics_lang.php +++ b/application/language/polish/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "All"; $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is"; $lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; $lang['statistics_distances_qsos_with'] = "QSOs with"; diff --git a/application/language/russian/statistics_lang.php b/application/language/russian/statistics_lang.php index ba34b9fda..127d9f178 100644 --- a/application/language/russian/statistics_lang.php +++ b/application/language/russian/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "все"; $lang['statistics_distances_worked'] = "Сработанные дистанции"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "контакты отображены.
Наиболее дальний контакт с"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "в квадрате"; $lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "на дистанции"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "Среднее расстояние составляет"; $lang['statistics_distances_number_of_qsos'] = "Количество QSO"; $lang['statistics_distances_callsigns_worked'] = "Сработанные позывные(ной) (максимально 5 показано)"; $lang['statistics_distances_qsos_with'] = "QSOs с"; diff --git a/application/language/spanish/statistics_lang.php b/application/language/spanish/statistics_lang.php index d09283824..719734ddd 100644 --- a/application/language/spanish/statistics_lang.php +++ b/application/language/spanish/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "Todas"; $lang['statistics_distances_worked'] = "Distancias Logradas"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contactos fueron dibujados.
Su contacto más lejano fue con"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "en gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "la distancia fue"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "La distancia fue"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "La distancia promedio es"; $lang['statistics_distances_number_of_qsos'] = "Número de QSOs"; $lang['statistics_distances_callsigns_worked'] = "Indicativo(s) trabajados (se muestran máximo 5)"; $lang['statistics_distances_qsos_with'] = "QSOs con"; diff --git a/application/language/swedish/statistics_lang.php b/application/language/swedish/statistics_lang.php index 054191326..66b5fc30e 100644 --- a/application/language/swedish/statistics_lang.php +++ b/application/language/swedish/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "All"; $lang['statistics_distances_worked'] = "Distances Worked"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "contacts were plotted.
Your furthest contact was with"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "in gridsquare"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "the distance was"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "The distance was"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "The average distance is"; $lang['statistics_distances_number_of_qsos'] = "Number of QSOs"; $lang['statistics_distances_callsigns_worked'] = "Callsign(s) worked (max 5 shown)"; $lang['statistics_distances_qsos_with'] = "QSOs with"; diff --git a/application/language/turkish/statistics_lang.php b/application/language/turkish/statistics_lang.php index 845318ed8..6f0681692 100644 --- a/application/language/turkish/statistics_lang.php +++ b/application/language/turkish/statistics_lang.php @@ -25,10 +25,12 @@ * */ +$lang['statistics_distances_bands_all'] = "Tüm"; $lang['statistics_distances_worked'] = "Çalışılan Mesafeler"; $lang['statistics_distances_part1_contacts_were_plotted_furthest'] = "kişiler planlandı.
En uzak bağlantınız şununlaydı"; $lang['statistics_distances_part2_contacts_were_plotted_furthest'] = "gridsquare'de"; -$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "mesafe şuydu"; +$lang['statistics_distances_part3_contacts_were_plotted_furthest'] = "Mesafe şuydu"; +$lang['statistics_distances_part4_contacts_were_plotted_furthest'] = "Ortalama mesafe"; $lang['statistics_distances_number_of_qsos'] = "QSO sayısı"; $lang['statistics_distances_callsigns_worked'] = "Çağrı işaretleri çalıştı (en fazla 5 tane gösterildi)"; $lang['statistics_distances_qsos_with'] = "QSO'lar ile"; diff --git a/application/models/Distances_model.php b/application/models/Distances_model.php index 3aa17c0c0..d895a0197 100644 --- a/application/models/Distances_model.php +++ b/application/models/Distances_model.php @@ -33,7 +33,7 @@ function get_distances($postdata, $measurement_base) { $this->db->where('col_sat_name', $postdata['sat']); } } - else { + elseif ($postdata['band'] != 'all') { $this->db->where('col_band', $postdata['band']); } @@ -143,7 +143,7 @@ function plot($qsoArray, $gridsquare, $measurement_base) { $dist = '20000'; } - if (!$this->valid_locator($stationgrid)) { + if (!$this->valid_locator(substr($stationgrid, 0, 6))) { header('Content-Type: application/json'); echo json_encode(array('Error' => 'Error. There is a problem with the gridsquare set in your profile!')); exit; @@ -163,12 +163,16 @@ function plot($qsoArray, $gridsquare, $measurement_base) { 'Grid' => '', 'Distance' => '', 'Qsos' => '', - 'Grids' => '' + 'Grids' => '', + 'Avg_distance' => '' ); + $avg_distance = 0; + foreach ($qsoArray as $qso) { $qrb['Qsos']++; // Counts up number of qsos $bearingdistance = $this->qra->distance($stationgrid, $qso['grid'], $measurement_base); + $avg_distance += ($bearingdistance - $avg_distance) / $qrb['Qsos']; // Calculates running average of distance if ($bearingdistance != $qso['COL_DISTANCE']) { $data = array('COL_DISTANCE' => $bearingdistance); $this->db->where('COL_PRIMARY_KEY', $qso['COL_PRIMARY_KEY']); @@ -190,6 +194,8 @@ function plot($qsoArray, $gridsquare, $measurement_base) { } } + $qrb['Avg_distance'] = round($avg_distance, 1); + $data['ok'] = 'OK'; $data['qrb'] = $qrb; $data['qsodata'] = $dataarray; diff --git a/application/views/distances/index.php b/application/views/distances/index.php index ad1f7e9c8..3313c6498 100644 --- a/application/views/distances/index.php +++ b/application/views/distances/index.php @@ -9,6 +9,7 @@ var lang_statistics_distances_part1_contacts_were_plotted_furthest = ''; var lang_statistics_distances_part2_contacts_were_plotted_furthest = ''; var lang_statistics_distances_part3_contacts_were_plotted_furthest = ''; + var lang_statistics_distances_part4_contacts_were_plotted_furthest = ''; var lang_statistics_distances_number_of_qsos = ''; var lang_gen_hamradio_distance = ''; var lang_statistics_distances_callsigns_worked = ''; @@ -18,6 +19,7 @@
- ' . $sat . ''."\n"; diff --git a/assets/js/sections/distances.js b/assets/js/sections/distances.js index 56cf1e031..961bb6cb3 100644 --- a/assets/js/sections/distances.js +++ b/assets/js/sections/distances.js @@ -117,7 +117,8 @@ function distPlot(form) { $('#information').html(tmp.qrb.Qsos + " " + lang_statistics_distances_part1_contacts_were_plotted_furthest + " " + tmp.qrb.Callsign + " " + lang_statistics_distances_part2_contacts_were_plotted_furthest + " " + tmp.qrb.Grid +". " + lang_statistics_distances_part3_contacts_were_plotted_furthest + " " - + tmp.qrb.Distance + tmp.unit + "."); + + tmp.qrb.Distance + " " + tmp.unit + ". " + lang_statistics_distances_part4_contacts_were_plotted_furthest + " " + + tmp.qrb.Avg_distance + " " + tmp.unit + "."); var chart = new Highcharts.Chart(options); } From 6c76a47a7d752adb1e0cb5c9b7d15c7af3bc439b Mon Sep 17 00:00:00 2001 From: PA8S Date: Sun, 16 Jun 2024 22:32:36 +0200 Subject: [PATCH 18/26] Corrected labels for awards_wab_description_ln1 and awards_wab_description_ln4 for WAB in language files --- application/language/bulgarian/awards_lang.php | 6 +++--- application/language/chinese_simplified/awards_lang.php | 6 +++--- application/language/czech/awards_lang.php | 6 +++--- application/language/dutch/awards_lang.php | 6 +++--- application/language/english/awards_lang.php | 6 +++--- application/language/finnish/awards_lang.php | 6 +++--- application/language/french/awards_lang.php | 6 +++--- application/language/german/awards_lang.php | 6 +++--- application/language/greek/awards_lang.php | 6 +++--- application/language/italian/awards_lang.php | 6 +++--- application/language/polish/awards_lang.php | 6 +++--- application/language/russian/awards_lang.php | 6 +++--- application/language/spanish/awards_lang.php | 6 +++--- application/language/swedish/awards_lang.php | 6 +++--- application/language/turkish/awards_lang.php | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/application/language/bulgarian/awards_lang.php b/application/language/bulgarian/awards_lang.php index 035cce791..23dfe8e4c 100644 --- a/application/language/bulgarian/awards_lang.php +++ b/application/language/bulgarian/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/chinese_simplified/awards_lang.php b/application/language/chinese_simplified/awards_lang.php index 1e117ddf1..77222622b 100644 --- a/application/language/chinese_simplified/awards_lang.php +++ b/application/language/chinese_simplified/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/czech/awards_lang.php b/application/language/czech/awards_lang.php index fe7fe689b..b77ede943 100644 --- a/application/language/czech/awards_lang.php +++ b/application/language/czech/awards_lang.php @@ -195,10 +195,10 @@ $lang['awards_waja_description_ln4'] = "For more information, please visit: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/dutch/awards_lang.php b/application/language/dutch/awards_lang.php index 502ff4978..6115045cf 100644 --- a/application/language/dutch/awards_lang.php +++ b/application/language/dutch/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/english/awards_lang.php b/application/language/english/awards_lang.php index 035cce791..23dfe8e4c 100644 --- a/application/language/english/awards_lang.php +++ b/application/language/english/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/finnish/awards_lang.php b/application/language/finnish/awards_lang.php index e57fe3588..05c6071be 100644 --- a/application/language/finnish/awards_lang.php +++ b/application/language/finnish/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/french/awards_lang.php b/application/language/french/awards_lang.php index 9d6598934..9faef5f7f 100644 --- a/application/language/french/awards_lang.php +++ b/application/language/french/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/german/awards_lang.php b/application/language/german/awards_lang.php index f9e0ba148..4368e4da9 100644 --- a/application/language/german/awards_lang.php +++ b/application/language/german/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/greek/awards_lang.php b/application/language/greek/awards_lang.php index 035cce791..23dfe8e4c 100644 --- a/application/language/greek/awards_lang.php +++ b/application/language/greek/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/italian/awards_lang.php b/application/language/italian/awards_lang.php index 9415093c0..04a250898 100644 --- a/application/language/italian/awards_lang.php +++ b/application/language/italian/awards_lang.php @@ -180,10 +180,10 @@ $lang['awards_waja_description_ln4'] = "Per ulteriori informazioni, visitare: https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm."; /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "Il Worked All Britain Award (WAB) è un prestigioso programma di riconoscimento all\'interno della comunità dei radioamatori che celebra i risultati ottenuti nella comunicazione in tutto il Regno Unito. Il programma del premio WAB incoraggia gli operatori radio a stabilire un contatto con le stazioni situati in diverse regioni della Gran Bretagna, favorendo il cameratismo e promuovendo le capacità di comunicazione radiofonica. Per ottenere il premio WAB, i partecipanti devono stabilire contatti radio con successo con stazioni situate in aree WAB specifiche, definite dai quadrati della griglia dell\'Ordnance Survey. Questi quadrati della griglia coprono l\'intero della Gran Bretagna, tra cui Inghilterra, Scozia, Galles e alcune isole al largo."; $lang['awards_wab_description_ln3'] = "I partecipanti al programma WAB Award si scambiano informazioni come la loro posizione, la potenza del segnale e il riferimento quadrato WAB durante i contatti radio. I punti vengono assegnati in base alla posizione della stazione contattata, con diversi valori in punti assegnati ai contatti effettuati all\'interno di diverse aree WAB Accumulando punti dai contatti riusciti, gli operatori radiofonici possono progredire attraverso vari livelli di premio, ognuno dei quali rappresenta una pietra miliare significativa nel loro viaggio radioamatoriale. Il Premio WAB non solo riconosce la dedizione e l\'abilità degli operatori radiofonici, ma anche promuove la diversità geografica e incoraggia l\'esplorazione del ricco mosaico di luoghi in tutta la Gran Bretagna attraverso il mezzo della radio amatoriale."; -$lang['awards_waja_description_ln4'] = "Per ulteriori informazioni, visitare: https://wab.intermip.net /default.php."; +$lang['awards_wab_description_ln4'] = "Per ulteriori informazioni, visitare: https://wab.intermip.net /default.php."; diff --git a/application/language/polish/awards_lang.php b/application/language/polish/awards_lang.php index 502ff4978..6115045cf 100644 --- a/application/language/polish/awards_lang.php +++ b/application/language/polish/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/russian/awards_lang.php b/application/language/russian/awards_lang.php index f5c7d7635..1809c45ad 100644 --- a/application/language/russian/awards_lang.php +++ b/application/language/russian/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/spanish/awards_lang.php b/application/language/spanish/awards_lang.php index 249c970ec..783afe02b 100644 --- a/application/language/spanish/awards_lang.php +++ b/application/language/spanish/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/swedish/awards_lang.php b/application/language/swedish/awards_lang.php index 502ff4978..6115045cf 100644 --- a/application/language/swedish/awards_lang.php +++ b/application/language/swedish/awards_lang.php @@ -196,10 +196,10 @@ /* ___________________________________________________________________________________________ -WAB -- Use all 3 Lines of Text +WAB -- Use all 4 Lines of Text ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Worked All Britain Award"; +$lang['awards_wab_description_ln1'] = "WAB - Worked All Britain Award"; $lang['awards_wab_description_ln2'] = "The Amateur Radio Worked All Britain (WAB) Award is a prestigious recognition program within the amateur radio community that celebrates communication achievements across the United Kingdom. The WAB Award scheme encourages radio operators to establish contact with stations located in different regions of Britain, fostering camaraderie and promoting radio communication skills. To earn the WAB Award, participants must make successful radio contacts with stations located in specific WAB areas, which are defined by Ordnance Survey grid squares. These grid squares cover the entirety of Great Britain, including England, Scotland, Wales, and some offshore islands."; $lang['awards_wab_description_ln3'] = "Participants in the WAB Award program exchange information such as their location, signal strength, and WAB square reference during radio contacts. Points are awarded based on the location of the contacted station, with different point values assigned to contacts made within different WAB areas. By accumulating points from successful contacts, radio operators can progress through various award levels, each representing a significant milestone in their amateur radio journey. The WAB Award not only recognizes the dedication and skill of radio operators but also promotes geographic diversity and encourages exploration of the rich tapestry of locations across Britain through the medium of amateur radio."; -$lang['awards_waja_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; +$lang['awards_wab_description_ln4'] = "For more information, please visit: https://wab.intermip.net/default.php."; diff --git a/application/language/turkish/awards_lang.php b/application/language/turkish/awards_lang.php index 98ed39f6b..9d0901819 100644 --- a/application/language/turkish/awards_lang.php +++ b/application/language/turkish/awards_lang.php @@ -190,10 +190,10 @@ /* ___________________________________________________________________________________________ -WAB - Metnin 3 Satırının Tümünü Kullan +WAB - Metnin 4 Satırının Tümünü Kullan ___________________________________________________________________________________________ */ -$lang['awards_waja_description_ln1'] = "WAB - Tüm Britanya'da Çalıştı Ödülü"; +$lang['awards_wab_description_ln1'] = "WAB - Tüm Britanya'da Çalıştı Ödülü"; $lang['awards_wab_description_ln2'] = "Amatör Radyo Tüm Britanya'da Çalıştı (WAB) Ödülü, amatör radyo topluluğu içinde Birleşik Krallık genelindeki iletişim başarılarını kutlayan prestijli bir tanınma programıdır. WAB Ödülü programı radyo operatörlerini istasyonlarla iletişim kurmaya teşvik eder Britanya'nın farklı bölgelerinde bulunan, dostluğu teşvik eden ve radyo iletişim becerilerini destekleyen WAB Ödülünü kazanmak için, katılımcıların Ordnance Survey Kılavuz kareleri tarafından tanımlanan belirli WAB alanlarında bulunan istasyonlarla başarılı radyo bağlantıları kurmaları gerekir. İngiltere, İskoçya, Galler ve bazı açık deniz adaları da dahil olmak üzere Büyük Britanya'nın."; $lang['awards_wab_description_ln3'] = "WAB Ödülü programındaki katılımcılar, radyo bağlantıları sırasında konumları, sinyal güçleri ve WAB kare referansı gibi bilgileri paylaşırlar. Puanlar, atanmış farklı puan değerleri ile, iletişim kurulan istasyonun konumuna göre verilir. Başarılı bağlantılardan puan toplayarak, telsiz operatörleri, her biri amatör telsiz yolculuklarında önemli bir dönüm noktasını temsil eden çeşitli ödül seviyelerinde ilerleyebilirler. WAB Ödülü, yalnızca telsiz operatörlerinin özveri ve becerilerini ödüllendirmektedir. coğrafi çeşitliliği teşvik eder ve amatör radyo aracılığıyla Britanya'nın her yerindeki zengin dokuların keşfedilmesini teşvik eder."; -$lang['awards_waja_description_ln4'] = "Daha fazla bilgi için lütfen şu adresi ziyaret edin: https://wab.intermip.net /default.php."; +$lang['awards_wab_description_ln4'] = "Daha fazla bilgi için lütfen şu adresi ziyaret edin: https://wab.intermip.net /default.php."; From c050a42b35511460931a783d7d8884db8468fc2b Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 19 Jun 2024 13:46:31 +0100 Subject: [PATCH 19/26] [Dashboard] Fixes JS errors when loading map when theres no qsos --- application/controllers/Map.php | 26 +++++++--- application/views/interface_assets/footer.php | 50 ++++++++++--------- 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/application/controllers/Map.php b/application/controllers/Map.php index 456b23cb9..d26fe4376 100644 --- a/application/controllers/Map.php +++ b/application/controllers/Map.php @@ -80,13 +80,23 @@ public function map_plot_json() { $offset = (intval($this->input->post('offset'))>0)?xss_clean($this->input->post('offset')):null; $qsos = $this->logbook_model->get_qsos($nb_qso, $offset); } - // [PLOT] ADD plot // - $plot_array = $this->logbook_model->get_plot_array_for_map($qsos->result()); - // [MAP Custom] ADD Station // - $station_array = $this->Stations->get_station_array_for_map(); - header('Content-Type: application/json; charset=utf-8'); - echo json_encode(array_merge($plot_array, $station_array)); - } + if(empty($qsos)) { + // Handle the case where $qsos is empty -} + // return json with error "No QSOs found" + header('Content-Type: application/json; charset=utf-8'); + echo json_encode(array('error' => 'No QSOs found')); + } else { + // Handle the case where $qsos is not empty + // [PLOT] ADD plot // + $plot_array = $this->logbook_model->get_plot_array_for_map($qsos->result()); + // [MAP Custom] ADD Station // + $station_array = $this->Stations->get_station_array_for_map(); + + header('Content-Type: application/json; charset=utf-8'); + echo json_encode(array_merge($plot_array, $station_array)); + } + + } +} \ No newline at end of file diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 846d61673..e355472be 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -895,30 +895,34 @@ function loadMarkers() { fetch(qso_loc) .then(response => response.json()) .then(data => { - var newMarkers = {}; - data.markers.forEach(marker => { - var key = `${marker.lat},${marker.lng}`; - var html = `

${marker.flag}${marker.label}

${marker.html}`; - newMarkers[key] = marker; - if (!markers[key]) { - var icon = L.divIcon({ - className: 'custom-icon', - html: `` - }); - - L.marker([marker.lat, marker.lng], { - icon: icon - }) - .addTo(map) - .bindPopup(html); - } - }); - Object.keys(markers).forEach(key => { - if (!newMarkers[key]) { - map.removeLayer(markers[key]); + if (data.error !== "No QSOs found") { + var newMarkers = {}; + data.markers.forEach(marker => { + var key = `${marker.lat},${marker.lng}`; + var html = `

${marker.flag}${marker.label}

${marker.html}`; + newMarkers[key] = marker; + if (!markers[key]) { + var icon = L.divIcon({ + className: 'custom-icon', + html: `` + }); + + L.marker([marker.lat, marker.lng], { + icon: icon + }) + .addTo(map) + .bindPopup(html); + } + }); + Object.keys(markers).forEach(key => { + if (!newMarkers[key]) { + map.removeLayer(markers[key]); + } + }); + markers = newMarkers; + } else { + console.log("No QSOs found to populate dashboard map."); } - }); - markers = newMarkers; }); } From 4ca9268bf86834c5199cfc0835395cb617e05de8 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 19 Jun 2024 13:57:31 +0100 Subject: [PATCH 20/26] Update cypress-tests.yml --- .github/workflows/cypress-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress-tests.yml index a8a2c9e70..85d00363a 100644 --- a/.github/workflows/cypress-tests.yml +++ b/.github/workflows/cypress-tests.yml @@ -1,5 +1,5 @@ name: Cypress Tests -on: [pull_request] +on: [pull_request, workflow_dispatch] jobs: cypress-e2e-tests: runs-on: ubuntu-latest From df6538afa37b6a3f70109039f0ef82a51a9faf71 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 19 Jun 2024 14:03:41 +0100 Subject: [PATCH 21/26] [Station Locations] Fixed JS error extra " --- assets/js/sections/station_locations.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index ba2061a57..7e67e16c6 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -44,7 +44,7 @@ $(document).ready( function () { }; // Hide all states initially - $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state"").hide(); + $("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state").hide(); /** * Gets the selected DXCC ID and shows the corresponding state. */ @@ -68,7 +68,7 @@ $(document).ready( function () { var stateToShow = stateMap[selectedValue] || stateMap['default']; // Hide all states - $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state"").hide(); + $("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state, #nz_state, #belgium_state, #italy_state").hide(); // Show the selected state $("#" + stateToShow).show(); From ccb9f592b3fcd5be0eb5fcb44c5fbbd24ec996a1 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 19 Jun 2024 14:29:01 +0100 Subject: [PATCH 22/26] [Gridsquare Map] Shows 2,4,6 grids Fixes #3136 --- application/controllers/Gridmap.php | 21 +++++++-------------- assets/js/sections/gridmap.js | 1 + 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php index 075906269..b726bd00d 100644 --- a/application/controllers/Gridmap.php +++ b/application/controllers/Gridmap.php @@ -76,9 +76,7 @@ public function getGridsjs() { foreach ($query->result() as $row) { $grid_2char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,2)); $grid_4char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,4)); - if ($this->config->item('map_6digit_grids')) { - $grid_6char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,6)); - } + $grid_6char_confirmed = strtoupper(substr($row->GRID_SQUARES,0,6)); // Check if 2 Char is in array if(!in_array($grid_2char_confirmed, $array_grid_2char_confirmed)){ @@ -89,10 +87,8 @@ public function getGridsjs() { array_push($array_grid_4char_confirmed, $grid_4char_confirmed); } - if ($this->config->item('map_6digit_grids')) { - if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){ + if(!in_array($grid_6char_confirmed, $array_grid_6char_confirmed)){ array_push($array_grid_6char_confirmed, $grid_6char_confirmed); - } } } } @@ -104,9 +100,7 @@ public function getGridsjs() { $grid_two = strtoupper(substr($row->GRID_SQUARES,0,2)); $grid_four = strtoupper(substr($row->GRID_SQUARES,0,4)); - if ($this->config->item('map_6digit_grids')) { - $grid_six = strtoupper(substr($row->GRID_SQUARES,0,6)); - } + $grid_six = strtoupper(substr($row->GRID_SQUARES,0,6)); // Check if 2 Char is in array if(!in_array($grid_two, $array_grid_2char)){ @@ -116,12 +110,11 @@ public function getGridsjs() { if(!in_array($grid_four, $array_grid_4char)){ array_push($array_grid_4char, $grid_four); } - - if ($this->config->item('map_6digit_grids')) { - if(!in_array($grid_six, $array_grid_6char)){ - array_push($array_grid_6char, $grid_six); - } + + if(!in_array($grid_six, $array_grid_6char)){ + array_push($array_grid_6char, $grid_six); } + } } $query_vucc = $this->gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat); diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index 3335d4440..55d096a2c 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -55,6 +55,7 @@ function gridPlot(form, visitor=true) { sat: $("#sats").val(), }, success: function (data) { + console.log(data); $('.cohidden').show(); $(".ld-ext-right-plot").removeClass('running'); $(".ld-ext-right-plot").prop('disabled', false); From 24f3b3397c206f53b6995377d776ee01e0d92b72 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 19 Jun 2024 14:34:31 +0100 Subject: [PATCH 23/26] [API] When looking up a grid only do first 4 chars --- application/models/Logbook_model.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 61f3129b4..b365038b2 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2037,6 +2037,9 @@ function check_if_grid_worked_in_logbook($grid, $StationLocationsArray = null, $ $logbooks_locations_array = $StationLocationsArray; } + // Only take the first 4 characters of the grid + $grid = substr($grid, 0, 4); + $this->db->select('COL_GRIDSQUARE'); $this->db->where_in('station_id', $logbooks_locations_array); $this->db->group_start(); From 05f4f4ea925dc110f1da81f144cc140cb6092525 Mon Sep 17 00:00:00 2001 From: Emiliano Macedonio Date: Wed, 19 Jun 2024 16:13:22 +0200 Subject: [PATCH 24/26] Add Message alert in Advanced Logbook --- assets/js/sections/logbookadvanced.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index b13acf1e3..0c8a6fa5f 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -616,7 +616,15 @@ $(document).ready(function () { var elements = $('#qsoList tbody input:checked'); var nElements = elements.length; if (nElements == 0) { - return; + BootstrapDialog.alert({ + title: 'INFO', + message: 'Select a row from the list for Quickfilter search.', + type: BootstrapDialog.TYPE_INFO, + closable: false, + draggable: false, + callback: function (result) { + } + }); } if (nElements > 1) { BootstrapDialog.alert({ From 12c271f5b9237370ceef54290c383e5aabeb1e8d Mon Sep 17 00:00:00 2001 From: Emiliano Macedonio Date: Thu, 20 Jun 2024 12:37:40 +0200 Subject: [PATCH 25/26] New menu item for Third Party Logbooks Realign submenu popup for correct visualization in Portrait screen Review some wrong icon in dropdown menu --- application/views/interface_assets/header.php | 85 ++++++++++--------- assets/css/general.css | 4 +- 2 files changed, 46 insertions(+), 43 deletions(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 86eb46cc7..4f6744469 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -77,11 +77,11 @@
  • - +
    - +
    @@ -94,15 +94,15 @@
  • - +
    - +
    - +
    - +
    • @@ -113,15 +113,15 @@
  • - +
    - +
    - +
    - +
    - +
    @@ -129,9 +129,9 @@
    - +
    - +
    @@ -196,7 +196,7 @@ Hams.at optionslib->get_option('dxcache_url') != '') { ?>
    - +
    SAT Timers @@ -210,7 +210,7 @@
    - +
    @@ -222,11 +222,11 @@
    - +
    - +
    @@ -234,15 +234,15 @@
    - +
    - +
    - +
    • @@ -326,23 +326,37 @@ function handleKeyPress(event) { - + - +
    - + -
    Other Export Options +
    Other Export Options +
    + +
    Third Party Logbooks +
    @@ -361,24 +375,13 @@ function handleKeyPress(event) { $oqrs_requests = $CI->oqrs_model->oqrs_requests($location_list); ?> - 0) { + 0) { echo "" . $oqrs_requests . ""; } ?> - - -
    - - - - - - - - - +
    diff --git a/assets/css/general.css b/assets/css/general.css index b33f89d7f..b3efbcb62 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -729,8 +729,8 @@ table.dataTable tfoot td { } .dropdown-submenu>.dropdown-menu { top:0; - left:100%; - margin-top:-9px; + left:50%; + margin-top:30px; } .dropdown-menu > li > a:hover:after { transform: rotate(-90deg); From a0e5d0c41cfd8431412bce4e2155def6e5a86e59 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 26 Jun 2024 15:31:18 +0100 Subject: [PATCH 26/26] tag 2.6.15 --- application/config/migration.php | 2 +- application/migrations/186_tag_2_6_15.php | 30 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 application/migrations/186_tag_2_6_15.php diff --git a/application/config/migration.php b/application/config/migration.php index c52d5d72d..574240d66 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ | */ -$config['migration_version'] = 185; +$config['migration_version'] = 186; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/186_tag_2_6_15.php b/application/migrations/186_tag_2_6_15.php new file mode 100644 index 000000000..2e4b4df52 --- /dev/null +++ b/application/migrations/186_tag_2_6_15.php @@ -0,0 +1,30 @@ +db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.6.15')); + + // Trigger Version Info Dialog + $this->db->where('option_type', 'version_dialog'); + $this->db->where('option_name', 'confirmed'); + $this->db->update('user_options', array('option_value' => 'false')); + + } + + public function down() + { + $this->db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.6.14')); + } +} \ No newline at end of file
    CallsignCallsign' + qso.callsign + '
    Date/timeDate/time' + qso.datetime + '
    BandBand' + qso.satname + '
    BandBand' + qso.band + '
    ModeMode' + qso.mode + '
    GridsquareGridsquare' + qso.gridsquare + '
    DistanceDistance' + qso.distance + '
    BearingBearing' + qso.bearing + '