Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

use global options for dxwaterfall

Browse Source
This commit is contained in:
HB9HIL
2025-11-11 15:43:24 +01:00
parent 6166d2407c
commit 08626fe094
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/Qso.php
View File

@@ -92,8 +92,14 @@ class QSO extends CI_Controller {
$qkey_opt=$this->user_options_model->get_options('dxwaterfall',array('option_name'=>'enable','option_key'=>'boolean'))->result();
if (count($qkey_opt)>0) {
$data['user_dxwaterfall_enable'] = $qkey_opt[0]->option_value;
$data['dxcluster_default_decont'] = $this->optionslib->get_option('dxcluster_decont') ?? 'EU';
$data['dxcluster_default_maxage'] = $this->optionslib->get_option('dxcluster_maxage') ?? 60;
} else {
$data['user_dxwaterfall_enable'] = 0;
// default but not used, prevent unset variable, without the need of a db call
$data['dxcluster_default_decont'] = 'EU';
$data['dxcluster_default_maxage'] = 60;
}
$data['qso_count'] = $this->session->userdata('qso_page_last_qso_count');

2
application/views/qso/index.php
View File

@@ -37,6 +37,8 @@ switch ($date_format) {
var lang_invalid_ant_el = "<?= __("Invalid value for antenna elevation:"); ?>";
var latlng=[<?php echo $lat.','.$lng;?>];
var user_date_format = "<?php echo $date_format; ?>"; // Pass the user's date format to JavaScript
var dxcluster_default_decont = "<?php echo $dxcluster_default_decont; ?>"; // used in dxwaterfall.js
var dxcluster_default_maxage = "<?php echo $dxcluster_default_maxage; ?>"; // used in dxwaterfall.js
</script>
<!--- DX Waterfall --->

4
assets/js/dxwaterfall.js
View File

@@ -1267,8 +1267,8 @@ var dxWaterfall = {
spotInfoDiv: null,
spotTooltipDiv: null,
lastSpotInfoKey: null,
currentContinent: 'NA',
currentMaxAge: 60,
currentContinent: dxcluster_default_decont,
currentMaxAge: dxcluster_default_maxage,
// ========================================
// SPOT NAVIGATION STATE