From 89ebcfc5f2d302679af2b0c4c634fc4cfadd2a34 Mon Sep 17 00:00:00 2001 From: Szymon Porwolik Date: Thu, 27 Nov 2025 00:55:52 +0100 Subject: [PATCH 01/20] Favorities added --- application/controllers/User_options.php | 67 ++++++- application/views/bandmap/list.php | 38 +++- assets/js/sections/bandmap_list.js | 214 +++++++++++++++++++++-- 3 files changed, 295 insertions(+), 24 deletions(-) diff --git a/application/controllers/User_options.php b/application/controllers/User_options.php index 6e89a13c9..04ff09d76 100644 --- a/application/controllers/User_options.php +++ b/application/controllers/User_options.php @@ -40,7 +40,7 @@ class User_Options extends CI_Controller { $obj = json_decode(file_get_contents("php://input"), true); if ($obj['option_name'] ?? '' != '') { $option_name=$this->security->xss_clean($obj['option_name']); - $this->user_options_model->del_option('Favourite',$option_name); + $this->user_options_model->del_option('Favourite',$option_name); } $jsonout['success']=1; header('Content-Type: application/json'); @@ -51,6 +51,71 @@ class User_Options extends CI_Controller { $this->user_options_model->set_option('version_dialog', 'confirmed', array('boolean' => 'true')); } + /** + * DX Cluster Filter Favorites + */ + public function add_edit_dxcluster_fav() { + $obj = json_decode(file_get_contents("php://input"), true); + if (!$obj || !isset($obj['fav_name']) || trim($obj['fav_name']) === '') { + header('Content-Type: application/json'); + echo json_encode(['success' => 0, 'error' => 'Invalid data']); + return; + } + + // Sanitize all input + foreach($obj as $option_key => $option_value) { + if (is_array($option_value)) { + $obj[$option_key] = array_map([$this->security, 'xss_clean'], $option_value); + } else { + $obj[$option_key] = $this->security->xss_clean($option_value); + } + } + + $option_name = $obj['fav_name']; + unset($obj['fav_name']); // Don't store the name as a value + + // Convert arrays to JSON for storage + foreach($obj as $key => $value) { + if (is_array($value)) { + $obj[$key] = json_encode($value); + } + } + + $this->user_options_model->set_option('DXClusterFavourite', $option_name, $obj); + $jsonout['success'] = 1; + header('Content-Type: application/json'); + echo json_encode($jsonout); + } + + public function get_dxcluster_fav() { + $result = $this->user_options_model->get_options('DXClusterFavourite'); + $jsonout = []; + foreach($result->result() as $options) { + $value = $options->option_value; + // Try to decode JSON arrays - check if it looks like JSON first + if (is_string($value) && (strpos($value, '[') === 0 || strpos($value, '{') === 0)) { + $decoded = json_decode($value, true); + if (json_last_error() === JSON_ERROR_NONE) { + $value = $decoded; + } + } + $jsonout[$options->option_name][$options->option_key] = $value; + } + header('Content-Type: application/json'); + echo json_encode($jsonout); + } + + public function del_dxcluster_fav() { + $obj = json_decode(file_get_contents("php://input"), true); + if ($obj['option_name'] ?? '' != '') { + $option_name = $this->security->xss_clean($obj['option_name']); + $this->user_options_model->del_option('DXClusterFavourite', $option_name); + } + $jsonout['success'] = 1; + header('Content-Type: application/json'); + echo json_encode($jsonout); + } + public function get_qrg_units() { $qrg_units = []; diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php index bb88466ab..794f68a23 100644 --- a/application/views/bandmap/list.php +++ b/application/views/bandmap/list.php @@ -40,6 +40,17 @@ var lang_bandmap_modes_applied = ""; var lang_bandmap_favorites_applied = ""; + // DX Cluster Filter Favorites translations + var lang_bandmap_filter_favorites = ""; + var lang_bandmap_save_filters = ""; + var lang_bandmap_filter_preset_name = ""; + var lang_bandmap_filter_preset_saved = ""; + var lang_bandmap_filter_preset_loaded = ""; + var lang_bandmap_filter_preset_deleted = ""; + var lang_bandmap_delete_filter_confirm = ""; + var lang_bandmap_no_filter_presets = ""; + var lang_bandmap_preset_limit_reached = ""; + // Bandmap filter status messages var lang_bandmap_loading_data = ""; var lang_bandmap_last_fetched = ""; @@ -378,15 +389,26 @@ - - - - + +
+ +
+ +
+
+
+
+ + + +
diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js index 24f2bdebf..36a25618e 100644 --- a/assets/js/sections/bandmap_list.js +++ b/assets/js/sections/bandmap_list.js @@ -382,9 +382,67 @@ $(function() { }); } + // List of all filter select IDs + const FILTER_SELECT_IDS = ['cwnSelect', 'decontSelect', 'continentSelect', 'band', 'mode', 'additionalFlags', 'requiredFlags']; + + // Map of storage keys to select IDs + const FILTER_KEY_TO_SELECT = { + cwn: 'cwnSelect', + deCont: 'decontSelect', + continent: 'continentSelect', + band: 'band', + mode: 'mode', + additionalFlags: 'additionalFlags', + requiredFlags: 'requiredFlags' + }; + + // Map currentFilters keys to storage keys + const CURRENT_TO_STORAGE_KEY = { + cwn: 'cwn', + deContinent: 'deCont', + spottedContinent: 'continent', + band: 'band', + mode: 'mode', + additionalFlags: 'additionalFlags', + requiredFlags: 'requiredFlags' + }; + + /** + * Build filter data object from currentFilters for storage + * @param {string} [favName] - Optional favorite name to include + * @returns {Object} Filter data with storage keys + */ + function buildFilterDataFromCurrent(favName) { + let filterData = {}; + if (favName) filterData.fav_name = favName; + Object.entries(CURRENT_TO_STORAGE_KEY).forEach(([currentKey, storageKey]) => { + filterData[storageKey] = currentFilters[currentKey]; + }); + return filterData; + } + + /** + * Set all filter values from an object + * @param {Object} filterData - Object with filter keys (cwn, deCont, continent, band, mode, additionalFlags, requiredFlags) + */ + function setAllFilterValues(filterData) { + Object.entries(FILTER_KEY_TO_SELECT).forEach(([key, selectId]) => { + if (filterData[key] !== undefined) { + $('#' + selectId).val(filterData[key]); + } + }); + } + + /** + * Update checkbox indicators for all filter selects + */ + function updateAllSelectCheckboxes() { + FILTER_SELECT_IDS.forEach(selectId => updateSelectCheckboxes(selectId)); + } + // Initialize checkbox indicators for all filter selects function initFilterCheckboxes() { - ['cwnSelect', 'decontSelect', 'continentSelect', 'band', 'mode', 'additionalFlags', 'requiredFlags'].forEach(selectId => { + FILTER_SELECT_IDS.forEach(selectId => { updateSelectCheckboxes(selectId); $(`#${selectId}`).on('change', () => updateSelectCheckboxes(selectId)); }); @@ -1901,22 +1959,18 @@ $(function() { // Preserve current band selection if CAT Control is enabled let currentBand = isCatTrackingEnabled ? $('#band').val() : null; - $('#cwnSelect').val(['All']); - $('#decontSelect').val(['Any']); - $('#continentSelect').val(['Any']); - $('#band').val(currentBand || ['All']); // Preserve band if CAT is enabled - $('#mode').val(['All']); - $('#additionalFlags').val(['All']); - $('#requiredFlags').val([]); + setAllFilterValues({ + cwn: ['All'], + deCont: ['Any'], + continent: ['Any'], + band: currentBand || ['All'], + mode: ['All'], + additionalFlags: ['All'], + requiredFlags: [] + }); // Update checkbox indicators for all selects - updateSelectCheckboxes('cwnSelect'); - updateSelectCheckboxes('decontSelect'); - updateSelectCheckboxes('continentSelect'); - updateSelectCheckboxes('band'); - updateSelectCheckboxes('mode'); - updateSelectCheckboxes('additionalFlags'); - updateSelectCheckboxes('requiredFlags'); + updateAllSelectCheckboxes(); // Clear text search $('#spotSearchInput').val(''); @@ -1965,6 +2019,136 @@ $(function() { } }); + // ======================================== + // DX CLUSTER FILTER FAVORITES + // ======================================== + + let dxclusterFavs = {}; + + /** + * Apply saved filter values to UI and trigger filter application + */ + function applyDxClusterFilterValues(filterData) { + setAllFilterValues(filterData); + updateAllSelectCheckboxes(); + syncQuickFilterButtons(); + updateFilterIcon(); + applyFilters(true); + } + + function saveDxClusterFav() { + // Check preset limit (max 20) + if (Object.keys(dxclusterFavs).length >= 20) { + showToast && showToast(lang_bandmap_filter_favorites, lang_bandmap_preset_limit_reached, 'bg-warning text-dark', 4000); + return; + } + + let favName = prompt(lang_bandmap_filter_preset_name); + if (!favName || favName.trim() === '') return; + + // Build filter data from currentFilters using helper + let filterData = buildFilterDataFromCurrent(favName.trim()); + + $.ajax({ + url: base_url + 'index.php/user_options/add_edit_dxcluster_fav', + method: 'POST', + dataType: 'json', + contentType: 'application/json; charset=utf-8', + data: JSON.stringify(filterData), + success: function(result) { + if (result.success) { + getDxClusterFavs(); + showToast && showToast(lang_bandmap_filter_favorites, lang_bandmap_filter_preset_saved, 'bg-success text-white', 2000); + } + }, + error: function() { + showToast && showToast(lang_bandmap_filter_favorites, lang_bandmap_favorites_failed, 'bg-danger text-white', 3000); + } + }); + } + + function getDxClusterFavs() { + $.ajax({ + url: base_url + 'index.php/user_options/get_dxcluster_fav', + method: 'GET', + dataType: 'json', + success: function(result) { + dxclusterFavs = result; + renderDxClusterFavMenu(); + } + }); + } + + function renderDxClusterFavMenu() { + let $menu = $('#dxcluster_fav_menu').empty(); + + let keys = Object.keys(dxclusterFavs); + if (keys.length === 0) { + $menu.append('' + lang_bandmap_no_filter_presets + ''); + return; + } + + keys.forEach(function(key) { + // Build the menu item with data attribute on the parent div for easier click handling + let $item = $('
').attr('data-fav-name', key); + let $nameSpan = $('').text(key); + let $deleteBtn = $('').attr('data-fav-name', key); + $menu.append($item.append($nameSpan).append($deleteBtn)); + }); + } + + function delDxClusterFav(name) { + if (!confirm(lang_bandmap_delete_filter_confirm)) return; + + $.ajax({ + url: base_url + 'index.php/user_options/del_dxcluster_fav', + method: 'POST', + dataType: 'json', + contentType: 'application/json; charset=utf-8', + data: JSON.stringify({ option_name: name }), + success: function(result) { + if (result.success) { + getDxClusterFavs(); + showToast && showToast(lang_bandmap_filter_favorites, lang_bandmap_filter_preset_deleted, 'bg-info text-white', 2000); + } + } + }); + } + + // Event handlers + $('#dxcluster_fav_add').on('click', function(e) { + e.preventDefault(); + saveDxClusterFav(); + }); + + $(document).on('click', '.dxcluster_fav_del', function(e) { + e.preventDefault(); + e.stopPropagation(); + delDxClusterFav($(this).data('fav-name')); + }); + + // Click on the entire favorite item row (but not the delete button) + $(document).on('click', '.dxcluster_fav_item', function(e) { + // Don't trigger if clicking the delete button + if ($(e.target).closest('.dxcluster_fav_del').length) return; + + e.preventDefault(); + let name = $(this).data('fav-name'); + if (dxclusterFavs[name]) { + applyDxClusterFilterValues(dxclusterFavs[name]); + // Escape name for toast display (showToast uses innerHTML) + let safeName = $('
').text(name).html(); + showToast && showToast(lang_bandmap_filter_favorites, lang_bandmap_filter_preset_loaded + ': ' + safeName, 'bg-success text-white', 2000); + } + }); + + // Load favorites on page load + getDxClusterFavs(); + + // ======================================== + // END DX CLUSTER FILTER FAVORITES + // ======================================== + // Sync button states when dropdown is shown $('#filterDropdown').on('show.bs.dropdown', function() { syncQuickFilterButtons(); From c36e123866481f880a406e7e6e192371e40dbd7c Mon Sep 17 00:00:00 2001 From: Szymon Porwolik Date: Thu, 27 Nov 2025 01:29:52 +0100 Subject: [PATCH 02/20] Reworked CAT button --- application/views/bandmap/list.php | 24 +- assets/js/sections/bandmap_list.js | 419 ++++++++++++++++------------- 2 files changed, 248 insertions(+), 195 deletions(-) diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php index 794f68a23..5e3caa4b2 100644 --- a/application/views/bandmap/list.php +++ b/application/views/bandmap/list.php @@ -16,7 +16,7 @@ var lang_bandmap_cat_required = ""; var lang_bandmap_enable_cat = ""; var lang_bandmap_clear_filters = ""; - var lang_bandmap_band_preserved = ""; + var lang_bandmap_band_preserved = ""; var lang_bandmap_radio = ""; var lang_bandmap_radio_none = ""; var lang_bandmap_radio_tuned = ""; @@ -28,9 +28,12 @@ var lang_bandmap_sent_to_form = ""; var lang_bandmap_cat_control = ""; var lang_bandmap_cat_off = ""; - var lang_bandmap_cat_on = ""; - var lang_bandmap_cat_marker = ""; - var lang_bandmap_freq_changed = ""; + var lang_bandmap_cat_on = ""; + var lang_bandmap_cat_lock_off = ""; + var lang_bandmap_cat_lock_on = ""; + var lang_bandmap_band_lock = ""; + var lang_bandmap_band_lock_enabled = ""; + var lang_bandmap_freq_changed = ""; var lang_bandmap_by_transceiver = ""; var lang_bandmap_freq_filter_set = ""; var lang_bandmap_freq_outside = ""; @@ -204,10 +207,15 @@
- - + +
+ + +
diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js index 36a25618e..7428d2bef 100644 --- a/assets/js/sections/bandmap_list.js +++ b/assets/js/sections/bandmap_list.js @@ -1956,8 +1956,8 @@ $(function() { }); $("#clearFiltersButton").on("click", function() { - // Preserve current band selection if CAT Control is enabled - let currentBand = isCatTrackingEnabled ? $('#band').val() : null; + // Preserve current band selection only if band lock (purple mode) is active + let currentBand = window.isFrequencyMarkerEnabled === true ? $('#band').val() : null; setAllFilterValues({ cwn: ['All'], @@ -1982,8 +1982,8 @@ $(function() { applyFilters(true); $('#filterDropdown').dropdown('hide'); - if (isCatTrackingEnabled && typeof showToast === 'function') { - showToast(lang_bandmap_clear_filters, lang_bandmap_band_preserved, 'bg-info text-white', 2000); + if (window.isFrequencyMarkerEnabled === true && typeof showToast === 'function') { + showToast(lang_bandmap_clear_filters, lang_bandmap_band_preserved, 'bg-info text-white', 5000); } }); @@ -1991,13 +1991,13 @@ $(function() { $("#clearFiltersButtonQuick").on("click", function() { // Preserve current De Continent selection let currentDecont = $('#decontSelect').val(); - // Preserve current band selection if CAT Control is enabled - let currentBand = isCatTrackingEnabled ? $('#band').val() : null; + // Preserve current band selection only if band lock (purple mode) is active + let currentBand = window.isFrequencyMarkerEnabled === true ? $('#band').val() : null; // Reset all other filters $('#cwnSelect').val(['All']).trigger('change'); $('#continentSelect').val(['Any']).trigger('change'); - $('#band').val(currentBand || ['All']).trigger('change'); // Preserve band if CAT is enabled + $('#band').val(currentBand || ['All']).trigger('change'); // Preserve band if band lock is active $('#mode').val(['All']).trigger('change'); $('#additionalFlags').val(['All']).trigger('change'); $('#requiredFlags').val([]).trigger('change'); @@ -2014,8 +2014,8 @@ $(function() { updateFilterIcon(); applyFilters(false); // Don't refetch from server since De Continent is preserved - if (isCatTrackingEnabled && typeof showToast === 'function') { - showToast(lang_bandmap_clear_filters, lang_bandmap_band_preserved, 'bg-info text-white', 2000); + if (window.isFrequencyMarkerEnabled === true && typeof showToast === 'function') { + showToast(lang_bandmap_clear_filters, lang_bandmap_band_preserved, 'bg-info text-white', 5000); } }); @@ -2027,9 +2027,23 @@ $(function() { /** * Apply saved filter values to UI and trigger filter application + * When band lock is active, band filter is preserved (not restored from favorites) */ function applyDxClusterFilterValues(filterData) { - setAllFilterValues(filterData); + // If band lock is active, preserve current band filter + // window.isFrequencyMarkerEnabled is set to true when lock mode is enabled + if (window.isFrequencyMarkerEnabled === true) { + // Create a copy without the band filter + let filteredData = Object.assign({}, filterData); + delete filteredData.band; + setAllFilterValues(filteredData); + // Show toast that band filter was preserved + if (typeof showToast === 'function') { + showToast(lang_bandmap_filter_favorites, lang_bandmap_band_preserved, 'bg-info text-white', 5000); + } + } else { + setAllFilterValues(filterData); + } updateAllSelectCheckboxes(); syncQuickFilterButtons(); updateFilterIcon(); @@ -2198,17 +2212,21 @@ $(function() { // If "None" (value "0") is selected, automatically disable CAT Control if (selectedRadio === "0") { - - // If CAT Control is currently enabled, turn it off if (isCatTrackingEnabled) { - let btn = $('#toggleCatTracking'); - btn.removeClass('btn-success').addClass('btn-secondary'); isCatTrackingEnabled = false; window.isCatTrackingEnabled = false; - window.isFrequencyMarkerEnabled = false; catState = 'off'; + // Also disable lock mode if enabled + if (window.isFrequencyMarkerEnabled) { + window.isFrequencyMarkerEnabled = false; + enableBandFilterControls(); + unlockTableSorting(); + clearFrequencyGradientColors(); + updateLockButtonVisual(false); + } + // Show offline status instead of just hiding if (typeof window.displayOfflineStatus === 'function') { window.displayOfflineStatus('no_radio'); @@ -2216,28 +2234,18 @@ $(function() { $('#radio_cat_state').remove(); } - // Re-enable band filter controls - enableBandFilterControls(); - - // Unlock table sorting - unlockTableSorting(); - - // Clear frequency gradient colors and purple mode indicators - clearFrequencyGradientColors(); - - // Reset button visual to OFF state - updateButtonVisual('off'); - // Reset band filter to 'All' and fetch all bands const currentBands = $("#band").val() || []; if (currentBands.length !== 1 || currentBands[0] !== 'All') { - $("#band").val(['All']); updateSelectCheckboxes('band'); syncQuickFilterButtons(); - applyFilters(true); // Force reload to fetch all bands + applyFilters(true); } + updateCatButtonVisual(false); + updateLockButtonState(false); + if (typeof showToast === 'function') { showToast(lang_bandmap_radio, lang_bandmap_radio_none, 'bg-info text-white', 3000); } @@ -2486,13 +2494,9 @@ $(function() { var lastGradientFrequency = null; // Track last frequency used for gradient update var lastRadioBand = null; // Store last valid band from radio frequency updates - // Three-state CAT control: 'off', 'on', 'on+marker' + // Two-state CAT control: 'off', 'on', with separate 'on+marker' for lock mode var catState = 'off'; - window.isFrequencyMarkerEnabled = false; // Purple mode indicator - - // Click detection for single/double-click - var catClickTimer = null; - var catClickPreventSingle = false; + window.isFrequencyMarkerEnabled = false; // Lock mode (purple mode) indicator /** * Calculate frequency gradient color based on distance from radio frequency @@ -3351,190 +3355,228 @@ $(function() { } /** - * Update button visual appearance based on CAT state + * Update CAT connection button visual appearance */ - function updateButtonVisual(state) { + function updateCatButtonVisual(enabled) { let btn = $('#toggleCatTracking'); - let radioIcon = btn.find('i.fa-radio'); - btn.removeClass('btn-secondary btn-success'); - radioIcon.removeClass('fa-podcast fa-crosshairs').css('color', ''); - btn.css('box-shadow', ''); - if (state === 'off') { - btn.addClass('btn-secondary').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_off)); - radioIcon.addClass('fa-radio'); - } else if (state === 'on') { + if (enabled) { btn.addClass('btn-success').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_on)); - radioIcon.addClass('fa-radio'); - } else if (state === 'on+marker') { - btn.addClass('btn-success').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_marker)); - radioIcon.addClass('fa-radio').css('color', '#8a2be2'); - btn.css('box-shadow', '0 0 8px rgba(138, 43, 226, 0.6)'); + } else { + btn.addClass('btn-secondary').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_off)); } // Update tooltip if it exists if (typeof bootstrap !== 'undefined' && bootstrap.Tooltip) { let tooltip = bootstrap.Tooltip.getInstance(btn[0]); - if (tooltip) { - tooltip.hide(); + if (tooltip) tooltip.hide(); + } + } + + /** + * Update Lock button visual appearance and apply purple styling to button group when locked + */ + function updateLockButtonVisual(enabled) { + let btn = $('#toggleCatLock'); + let lockIcon = btn.find('i'); + let btnGroup = btn.closest('.btn-group'); + + btn.removeClass('btn-secondary btn-success'); + lockIcon.removeClass('fa-lock fa-lock-open'); + + if (enabled) { + btn.addClass('btn-success').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_lock_on)); + lockIcon.addClass('fa-lock').css('color', '#8a2be2'); + // Purple border around the entire button group + btnGroup.css({ + 'box-shadow': '0 0 8px rgba(138, 43, 226, 0.6)', + 'border': '2px solid #8a2be2', + 'border-radius': '0.375rem' + }); + } else { + btn.addClass('btn-secondary').attr('data-bs-original-title', decodeHtml(lang_bandmap_cat_lock_off)); + lockIcon.addClass('fa-lock-open').css('color', ''); + // Remove purple border from button group + btnGroup.css({ + 'box-shadow': '', + 'border': '', + 'border-radius': '' + }); + } + + // Update tooltip if it exists + if (typeof bootstrap !== 'undefined' && bootstrap.Tooltip) { + let tooltip = bootstrap.Tooltip.getInstance(btn[0]); + if (tooltip) tooltip.hide(); + } + } + + /** + * Enable or disable the lock button based on CAT connection state + */ + function updateLockButtonState(catEnabled) { + let lockBtn = $('#toggleCatLock'); + if (catEnabled) { + lockBtn.prop('disabled', false).removeClass('disabled'); + } else { + lockBtn.prop('disabled', true).addClass('disabled'); + // Also disable lock mode if CAT is disabled + if (window.isFrequencyMarkerEnabled) { + disableLockMode(); } } } - // Toggle CAT Control with state machine - $('#toggleCatTracking').on('click', function() { - catClickTimer = setTimeout(function() { - if (!catClickPreventSingle) { - handleCatSingleClick(); - } - catClickPreventSingle = false; - }, 300); - }); + /** + * Enable lock mode (purple mode) + */ + function enableLockMode() { + window.isFrequencyMarkerEnabled = true; + catState = 'on+marker'; + disableBandFilterControls(); - $('#toggleCatTracking').on('dblclick', function() { - clearTimeout(catClickTimer); - catClickPreventSingle = true; - handleCatDoubleClick(); - }); + // Always ensure single band filter in lock mode + const currentBands = $("#band").val() || []; + let targetBand = null; - // Initialize tooltip on page load - set initial title only - $('#toggleCatTracking').attr('data-bs-original-title', lang_bandmap_cat_off); - - function handleCatSingleClick() { - const selectedRadio = $('.radios option:selected').val(); - - switch(catState) { - case 'off': - // OFF → ON - if (!selectedRadio || selectedRadio === '0') { - if (typeof showToast === 'function') { - showToast(lang_bandmap_cat_control, lang_bandmap_select_radio_first, 'bg-warning text-dark', 3000); - } - return; - } - - isCatTrackingEnabled = true; - window.isCatTrackingEnabled = true; - catState = 'on'; - - // Display last known data if available - if (window.lastCATData && typeof window.displayRadioStatus === 'function') { - window.displayRadioStatus('success', window.lastCATData); - } - - // Trigger immediate polling update if using polling radio - if (selectedRadio !== 'ws' && typeof updateFromCAT === 'function') { - updateFromCAT(); - } - - // In normal mode: only show gradient, don't change filters or disable controls - if (window.lastCATData && window.lastCATData.frequency) { - updateFrequencyGradientColors(); - } - - updateButtonVisual('on'); - break; - - case 'on': - // ON → ON+MARKER (Purple Mode) - window.isFrequencyMarkerEnabled = true; - catState = 'on+marker'; - disableBandFilterControls(); - - // Always ensure single band filter in purple mode - const currentBands = $("#band").val() || []; - let targetBand = null; - - // Priority 1: Use current radio band (already calculated and stored from radio updates) - if (lastRadioBand && lastRadioBand !== '') { - targetBand = lastRadioBand; - } else if (currentRadioFrequency) { - // Priority 2: Calculate from current radio frequency - targetBand = frequencyToBand(currentRadioFrequency * 1000); // Convert kHz back to Hz - } else if (currentBands.length === 1 && !currentBands.includes('All')) { - // Priority 3: Keep current selection if single - targetBand = currentBands[0]; - } else { - // Priority 4: Default to 20m as last resort fallback - targetBand = '20m'; - } - - // Set to single band - $("#band").val([targetBand]); - updateSelectCheckboxes('band'); - syncQuickFilterButtons(); - // Force reload to fetch only the active band from backend - applyFilters(true); - - if (window.lastCATData && window.lastCATData.frequency) { - updateFrequencyGradientColors(); - } - lockTableSortingToFrequency(); - - updateButtonVisual('on+marker'); - break; - - case 'on+marker': - // ON+MARKER → ON (Exit Purple Mode) - window.isFrequencyMarkerEnabled = false; - catState = 'on'; - - // Re-enable band filter controls - enableBandFilterControls(); - - // Reset band filter to 'All' and force reload to fetch all bands - $("#band").val(['All']); - updateSelectCheckboxes('band'); - syncQuickFilterButtons(); - applyFilters(true); // Force reload to fetch all bands - - unlockTableSorting(); - clearFrequencyGradientColors(); - - updateButtonVisual('on'); - break; + // Priority 1: Use current radio band + if (lastRadioBand && lastRadioBand !== '') { + targetBand = lastRadioBand; + } else if (currentRadioFrequency) { + // Priority 2: Calculate from current radio frequency + targetBand = frequencyToBand(currentRadioFrequency * 1000); + } else if (currentBands.length === 1 && !currentBands.includes('All')) { + // Priority 3: Keep current selection if single + targetBand = currentBands[0]; + } else { + // Priority 4: Default to 20m + targetBand = '20m'; } - } - function handleCatDoubleClick() { - // Double-click: Force disable from any state - if (catState === 'off') return; - - isCatTrackingEnabled = false; - window.isCatTrackingEnabled = false; - window.isFrequencyMarkerEnabled = false; - catState = 'off'; - - // Reset band filter to 'All' when disabling CAT - $("#band").val(['All']); + // Set to single band + $("#band").val([targetBand]); updateSelectCheckboxes('band'); syncQuickFilterButtons(); - applyFilters(true); // Force reload to fetch all bands + applyFilters(true); - const selectedRadio = $('.radios option:selected').val(); - if (selectedRadio && selectedRadio !== '0' && typeof window.displayOfflineStatus === 'function') { - window.displayOfflineStatus('cat_disabled'); - } else if (selectedRadio === '0' && typeof window.displayOfflineStatus === 'function') { - window.displayOfflineStatus('no_radio'); + if (window.lastCATData && window.lastCATData.frequency) { + updateFrequencyGradientColors(); + } + lockTableSortingToFrequency(); + updateLockButtonVisual(true); + + // Show toast notifications + if (typeof showToast === 'function') { + showToast(lang_bandmap_band_lock, lang_bandmap_band_lock_enabled, 'bg-info text-white', 3000); + setTimeout(function() { + showToast(lang_bandmap_band_lock, lang_bandmap_freq_changed + ' ' + targetBand + ' ' + lang_bandmap_by_transceiver, 'bg-info text-white', 3000); + }, 500); + } + } + + /** + * Disable lock mode (exit purple mode) + */ + function disableLockMode() { + window.isFrequencyMarkerEnabled = false; + if (isCatTrackingEnabled) { + catState = 'on'; } else { - $('#radio_cat_state').remove(); + catState = 'off'; } enableBandFilterControls(); + $("#band").val(['All']); + updateSelectCheckboxes('band'); + syncQuickFilterButtons(); + applyFilters(true); + unlockTableSorting(); clearFrequencyGradientColors(); + updateLockButtonVisual(false); + } - const currentBands = $("#band").val() || []; - if (currentBands.length !== 1 || currentBands[0] !== 'All') { + // CAT Connection button click handler + $('#toggleCatTracking').on('click', function() { + const selectedRadio = $('.radios option:selected').val(); + + if (!isCatTrackingEnabled) { + // Enable CAT + if (!selectedRadio || selectedRadio === '0') { + if (typeof showToast === 'function') { + showToast(lang_bandmap_cat_control, lang_bandmap_select_radio_first, 'bg-warning text-dark', 3000); + } + return; + } + + isCatTrackingEnabled = true; + window.isCatTrackingEnabled = true; + catState = 'on'; + + // Display last known data if available + if (window.lastCATData && typeof window.displayRadioStatus === 'function') { + window.displayRadioStatus('success', window.lastCATData); + } + + // Trigger immediate polling update if using polling radio + if (selectedRadio !== 'ws' && typeof updateFromCAT === 'function') { + updateFromCAT(); + } + + // Show gradient if we have frequency data + if (window.lastCATData && window.lastCATData.frequency) { + updateFrequencyGradientColors(); + } + + updateCatButtonVisual(true); + updateLockButtonState(true); + } else { + // Disable CAT + isCatTrackingEnabled = false; + window.isCatTrackingEnabled = false; + catState = 'off'; + + // Also disable lock mode if enabled + if (window.isFrequencyMarkerEnabled) { + disableLockMode(); + } + + // Reset band filter to 'All' $("#band").val(['All']); updateSelectCheckboxes('band'); syncQuickFilterButtons(); applyFilters(true); - } - updateButtonVisual('off'); - } + if (selectedRadio && selectedRadio !== '0' && typeof window.displayOfflineStatus === 'function') { + window.displayOfflineStatus('cat_disabled'); + } else if (typeof window.displayOfflineStatus === 'function') { + window.displayOfflineStatus('no_radio'); + } + + enableBandFilterControls(); + unlockTableSorting(); + clearFrequencyGradientColors(); + + updateCatButtonVisual(false); + updateLockButtonState(false); + } + }); + + // Lock button click handler + $('#toggleCatLock').on('click', function() { + if (!isCatTrackingEnabled) return; // Should not happen if button is properly disabled + + if (!window.isFrequencyMarkerEnabled) { + enableLockMode(); + } else { + disableLockMode(); + } + }); + + // Initialize tooltips on page load + $('#toggleCatTracking').attr('data-bs-original-title', lang_bandmap_cat_off); + $('#toggleCatLock').attr('data-bs-original-title', lang_bandmap_cat_lock_off); // ======================================== // RESPONSIVE COLUMN VISIBILITY @@ -4659,20 +4701,23 @@ $(function() { setTimeout(function() { const selectedRadio = $('.radios option:selected').val(); if (selectedRadio === '0') { - // No radio selected - disable CAT Control button + // No radio selected - disable CAT Control and Lock buttons $('#toggleCatTracking').prop('disabled', true).addClass('disabled'); + $('#toggleCatLock').prop('disabled', true).addClass('disabled'); if (typeof window.displayOfflineStatus === 'function') { window.displayOfflineStatus('no_radio'); } } else if (selectedRadio && selectedRadio !== '0' && !isCatTrackingEnabled) { // Radio is selected but CAT Control is disabled on page load $('#toggleCatTracking').prop('disabled', false).removeClass('disabled'); + $('#toggleCatLock').prop('disabled', true).addClass('disabled'); // Lock requires CAT if (typeof window.displayOfflineStatus === 'function') { window.displayOfflineStatus('cat_disabled'); } } else if (selectedRadio && selectedRadio !== '0') { // Radio is selected and CAT Control is enabled $('#toggleCatTracking').prop('disabled', false).removeClass('disabled'); + $('#toggleCatLock').prop('disabled', false).removeClass('disabled'); } }, 100); // Small delay to ensure cat.js has loaded and exposed the function }); From c4e3cb5cc31923ce135193c4fdcf6548ee2d22d2 Mon Sep 17 00:00:00 2001 From: Szymon Porwolik Date: Thu, 27 Nov 2025 01:38:48 +0100 Subject: [PATCH 03/20] Added a few more icons --- application/views/bandmap/list.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php index 5e3caa4b2..a14ea9aa0 100644 --- a/application/views/bandmap/list.php +++ b/application/views/bandmap/list.php @@ -234,7 +234,7 @@
- + @@ -448,9 +448,9 @@
- - - + + +
From 4ba3a4d8e08686848b8ec3d03c606f8b55f8b395 Mon Sep 17 00:00:00 2001 From: Szymon Porwolik Date: Thu, 27 Nov 2025 02:26:57 +0100 Subject: [PATCH 04/20] Submodes filter --- application/controllers/Bandmap.php | 14 +- application/views/bandmap/list.php | 26 ++- assets/js/sections/bandmap_list.js | 257 +++++++++++++++++++++------- 3 files changed, 229 insertions(+), 68 deletions(-) diff --git a/application/controllers/Bandmap.php b/application/controllers/Bandmap.php index d50bf1c66..5dcfc9c6b 100644 --- a/application/controllers/Bandmap.php +++ b/application/controllers/Bandmap.php @@ -78,8 +78,8 @@ class Bandmap extends CI_Controller { $this->load->view('interface_assets/footer', $footerData); } - // Get user's favorite bands and modes (active ones) - function get_user_favorites() { + // Get user's active bands and modes/submodes + function get_user_bands_and_modes() { session_write_close(); $this->load->model('bands'); @@ -106,6 +106,7 @@ class Bandmap extends CI_Controller { 'phone' => false, 'digi' => false ]; + $submodes = []; // List of all enabled submodes if ($activeModes) { foreach ($activeModes as $mode) { @@ -117,13 +118,20 @@ class Bandmap extends CI_Controller { } elseif ($qrgmode === 'DATA') { $modeCategories['digi'] = true; } + + // Build submode identifier - use submode if available, otherwise just mode + $submode = !empty($mode->submode) ? $mode->submode : $mode->mode; + if (!empty($submode) && !in_array($submode, $submodes)) { + $submodes[] = $submode; + } } } header('Content-Type: application/json'); echo json_encode([ 'bands' => $bandList, - 'modes' => $modeCategories + 'modes' => $modeCategories, + 'submodes' => $submodes ]); } } diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php index a14ea9aa0..e84b3f293 100644 --- a/application/views/bandmap/list.php +++ b/application/views/bandmap/list.php @@ -43,6 +43,19 @@ var lang_bandmap_modes_applied = ""; var lang_bandmap_favorites_applied = ""; + // My Submodes filter translations + var lang_bandmap_my_submodes = ""; + var lang_bandmap_submodes_filter_enabled = ""; + var lang_bandmap_submodes_filter_disabled = ""; + var lang_bandmap_required_submodes = ""; + var lang_bandmap_submodes_settings_hint = ""; + var lang_bandmap_no_submodes_configured = ""; + var lang_bandmap_no_submodes_warning = ""; + var lang_bandmap_mode_disabled_no_submode = ""; + var lang_bandmap_toggle_cw = ""; + var lang_bandmap_toggle_digi = ""; + var lang_bandmap_toggle_phone = ""; + // DX Cluster Filter Favorites translations var lang_bandmap_filter_favorites = ""; var lang_bandmap_save_filters = ""; @@ -209,10 +222,10 @@
- -
@@ -295,6 +308,7 @@ +