diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php index ca7ebe963..ba85628f4 100644 --- a/application/views/bandmap/list.php +++ b/application/views/bandmap/list.php @@ -103,12 +103,12 @@ /* Column widths - consolidated selectors */ .spottable th:nth-child(1), .spottable td:nth-child(1) { width: 50px; } /* Age (minutes) */ - .spottable th:nth-child(2), .spottable td:nth-child(2) { width: 50px; } /* Band */ + .spottable th:nth-child(2), .spottable td:nth-child(2) { width: 53px; } /* Band */ .spottable th:nth-child(3), .spottable td:nth-child(3) { width: 90px; } /* Frequency */ .spottable th:nth-child(4), .spottable td:nth-child(4) { width: 60px; } /* Mode */ .spottable th:nth-child(5), .spottable td:nth-child(5) { width: 120px; } /* Callsign */ .spottable th:nth-child(6), .spottable td:nth-child(6) { width: 40px; } /* Continent */ - .spottable th:nth-child(7), .spottable td:nth-child(7) { width: 45px; } /* CQ Zone */ + .spottable th:nth-child(7), .spottable td:nth-child(7) { width: 50px; } /* CQ Zone */ .spottable th:nth-child(8), .spottable td:nth-child(8) { width: 50px; } /* Flag */ .spottable th:nth-child(9), .spottable td:nth-child(9) { width: 150px; } /* Entity (DXCC name) */ .spottable th:nth-child(10), .spottable td:nth-child(10) { width: 60px; } /* DXCC Number */ @@ -162,6 +162,17 @@ white-space: nowrap; } + /* Center alignment for specific columns */ + .spottable th:nth-child(6), .spottable td:nth-child(6), /* Continent (spotted) */ + .spottable th:nth-child(7), .spottable td:nth-child(7), /* CQ Zone (spotted) */ + .spottable th:nth-child(8), .spottable td:nth-child(8), /* Flag */ + .spottable th:nth-child(10), .spottable td:nth-child(10), /* DXCC Number */ + .spottable th:nth-child(12), .spottable td:nth-child(12), /* de Cont (spotter) */ + .spottable th:nth-child(13), .spottable td:nth-child(13) /* de CQZ (spotter) */ + { + text-align: center; + } + /* Responsive: On smallest screens, Entity column fills remaining space */ @media (max-width: 500px) { .spottable { @@ -308,6 +319,11 @@ margin-bottom: 5px; } + /* Ensure CAT tracking and search box stay right-aligned when wrapping */ + .menu-bar > div:last-child { + justify-content: flex-end; + } + .card-body.pt-1 { padding-left: 15px; padding-right: 15px; @@ -480,15 +496,14 @@
-
- -
- - -
- -
- +
+ +
+ +
+ +
+
@@ -518,16 +533,15 @@
- -
- -
- - - -
-
+ +
+
+ + + +
+
@@ -662,17 +676,16 @@ + - - -
- - + +
+ + @@ -685,12 +698,23 @@ -
-
- " aria-label=""> - -
+
+ + +
+ + + + +
+ " aria-label=""> + +
+
+
@@ -712,11 +736,11 @@ "> "> [MHz]"> - "> - "> - "> - "> - "> + "> + "> + "> + "> + "> "> "> "> diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js index 0a3f8bab4..b980a9b2f 100644 --- a/assets/js/sections/bandmap_list.js +++ b/assets/js/sections/bandmap_list.js @@ -324,6 +324,10 @@ $(function() { 'createdCell': function (td, cellData, rowData, row, col) { $(td).addClass("mode"); } + }, + { + 'targets': [5, 6, 7, 11, 12, 13, 14], // Cont, CQZ, Flag, de Cont, de CQZ, Special, Message - disable sorting + 'orderable': false } ], search: { smart: true }, @@ -481,10 +485,10 @@ $(function() { } let tooltipLines = ['Last fetched for:']; - tooltipLines.push('Band: ' + lastFetchParams.band); - tooltipLines.push('Continent: ' + lastFetchParams.continent); - tooltipLines.push('Mode: ' + lastFetchParams.mode); - tooltipLines.push('Max Age: ' + lastFetchParams.maxAge + ' min'); + tooltipLines.push('Band: ' + (lastFetchParams.band || 'All')); + tooltipLines.push('Continent: ' + (lastFetchParams.continent || 'All')); + tooltipLines.push('Mode: ' + (lastFetchParams.mode || 'All')); + tooltipLines.push('Max Age: ' + (lastFetchParams.maxAge || '120') + ' min'); if (lastFetchParams.timestamp) { let fetchTime = new Date(lastFetchParams.timestamp); let fetchTimeStr = fetchTime.getHours().toString().padStart(2, '0') + ':' + @@ -1281,6 +1285,7 @@ $(function() { let bc2qso = new BroadcastChannel('qso_wish'); var CatCallbackURL = "http://127.0.0.1:54321"; + var isCatTrackingEnabled = false; // Track CAT tracking button state let wait4pong = 2000; let check_intv = 100; @@ -1422,7 +1427,7 @@ $(function() { websocketEnabled = false; } if ($("#radio option:selected").val() == '0') { - $(".radio_cat_state" ).remove(); + $('#radio_status').html(''); } else if ($("#radio option:selected").val() == 'ws') { initializeWebSocketConnection(); } else { @@ -1434,23 +1439,31 @@ $(function() { function updateCATui(data) { const band = frequencyToBand(data.frequency); CatCallbackURL=data.cat_url; - if (band !== $("#band").val()) { - $("#band").val(band); - $("#band").trigger("change"); + + console.log('CAT Update - Frequency:', data.frequency, 'Band:', band, 'Tracking enabled:', isCatTrackingEnabled, 'Current band filter:', $("#band").val()); + + // Only update band filter if CAT tracking is enabled + if (isCatTrackingEnabled) { + const currentBands = $("#band").val() || []; + // Check if current selection is not just this band + if (currentBands.length !== 1 || currentBands[0] !== band) { + console.log('Updating band filter to:', band); + $("#band").val([band]); + updateSelectCheckboxes('band'); + syncQuickFilterButtons(); + applyFilters(false); + } } const minutes = Math.floor(cat_timeout_interval / 60); if(data.updated_minutes_ago > minutes) { - $(".radio_cat_state" ).remove(); - if($('.radio_timeout_error').length == 0) { - $('.messages').prepend(''); - } else { - $('.radio_timeout_error').html('Radio connection timed-out: ' + $('select.radios option:selected').text() + ' data is ' + data.updated_minutes_ago + ' minutes old.'); + if ($('#radio_status').length) { + $('#radio_status').html(''); } } else { $(".radio_timeout_error" ).remove(); - text = 'TX: '+(Math.round(parseInt(data.frequency)/100)/10000).toFixed(4)+' MHz'; + var text = 'TX: '+(Math.round(parseInt(data.frequency)/100)/10000).toFixed(4)+' MHz'; highlight_current_qrg((parseInt(data.frequency))/1000); if(data.mode != null) { text = text+''+data.mode; @@ -1458,17 +1471,15 @@ $(function() { if(data.power != null && data.power != 0) { text = text+''+data.power+' W'; } - if (! $('#radio_cat_state').length) { - $('.messages').prepend(''); - } else { - $('#radio_cat_state').html(text); + if ($('#radio_status').length) { + $('#radio_status').html(''); } } } var updateFromCAT = function() { if($('select.radios option:selected').val() != '0') { - radioID = $('select.radios option:selected').val(); + var radioID = $('select.radios option:selected').val(); $.getJSON( base_url+"index.php/radio/json/" + radioID, function( data ) { if (data.error) { @@ -2069,6 +2080,25 @@ $(function() { applyFilters(false); }); + // Toggle CAT tracking + $('#toggleCatTracking').on('click', function() { + let btn = $(this); + + if (btn.hasClass('btn-warning')) { + // Disable CAT tracking + btn.removeClass('btn-warning').addClass('btn-primary'); + btn.find('i').removeClass('fa-check-circle').addClass('fa-radio'); + isCatTrackingEnabled = false; + console.log('CAT Tracking disabled'); + } else { + // Enable CAT tracking + btn.removeClass('btn-primary').addClass('btn-warning'); + btn.find('i').removeClass('fa-radio').addClass('fa-check-circle'); + isCatTrackingEnabled = true; + console.log('CAT Tracking enabled'); + } + }); + // ======================================== // RESPONSIVE COLUMN VISIBILITY // ========================================