From cfb498408dda0562b90724c4823cfc5f6936512f Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Sun, 15 Feb 2026 11:26:43 +0100
Subject: [PATCH] [DXCluster] Choose which column to filter

---
 application/views/bandmap/list.php | 24 ++++++++++++++++-
 assets/js/sections/bandmap_list.js | 42 ++++++++++++++++++++++++++----
 2 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php
index e30fa7e81..f7633d326 100644
--- a/application/views/bandmap/list.php
+++ b/application/views/bandmap/list.php
@@ -540,7 +540,29 @@
 		</div>
 
 		<!-- Search Input - 30% -->
-		<div class="input-group input-group-sm" style="flex: 0 0 auto; min-width: 200px; max-width: 400px; position: relative;">
+		<div class="input-group input-group-sm" style="flex: 0 0 auto; min-width: 300px; max-width: 450px; position: relative;">
+			<select class="form-select" id="spotSearchColumn" style="max-width: 150px;" aria-label="<?= __("Search Column"); ?>">
+				<option value="all" selected><?= __("All Columns"); ?></option>
+				<optgroup label="<?= __("Spot Info"); ?>">
+					<option value="0"><?= __("Age"); ?></option>
+					<option value="1"><?= __("Band"); ?></option>
+					<option value="2"><?= __("Frequency"); ?></option>
+					<option value="3"><?= __("Mode"); ?></option>
+					<option value="4"><?= __("Submode"); ?></option>
+				</optgroup>
+				<optgroup label="<?= __("DX Station"); ?>">
+					<option value="5"><?= __("Callsign"); ?></option>
+					<option value="6"><?= __("Continent"); ?></option>
+					<option value="7"><?= __("CQ Zone"); ?></option>
+					<option value="9"><?= __("Entity"); ?></option>
+					<option value="15"><?= __("Message"); ?></option>
+				</optgroup>
+				<optgroup label="<?= __("Spotter"); ?>">
+					<option value="10"><?= __("Spotter"); ?></option>
+					<option value="11"><?= __("Spotter Continent"); ?></option>
+					<option value="12"><?= __("Spotter CQ Zone"); ?></option>
+				</optgroup>
+			</select>
 			<input type="text" class="form-control" id="spotSearchInput" placeholder="<?= __("Search spots..."); ?>" aria-label="<?= __("Search"); ?>">
 			<button class="btn btn-sm" id="clearSearchBtn" style="position: absolute; right: 40px; top: 50%; transform: translateY(-50%); z-index: 10; background: transparent; border: none; padding: 0 5px; display: none; cursor: pointer;">
 				<i class="fas fa-times" style="color: #6c757d;"></i>
diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js
index 590a989fc..17440381c 100644
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -2086,7 +2086,9 @@ $(function() {
 
 		// Clear text search
 		$('#spotSearchInput').val('');
-		table.search('').draw();
+		table.search('');
+		table.columns().search('');
+		table.draw();
 		$('#clearSearchBtn').hide();
 
 		syncQuickFilterButtons();
@@ -2119,7 +2121,9 @@ $(function() {
 
 		// Clear text search
 		$('#spotSearchInput').val('');
-		table.search('').draw();
+		table.search('');
+		table.columns().search('');
+		table.draw();
 		$('#clearSearchBtn').hide();
 
 		syncQuickFilterButtons();
@@ -2299,8 +2303,25 @@ $(function() {
 		syncQuickFilterButtons();
 	});
 
+	// Helper function to apply search based on selected column
+	function applySearch(searchValue) {
+		const selectedColumn = $('#spotSearchColumn').val();
+
+		// Clear all column-specific searches first
+		table.columns().search('');
+
+		if (selectedColumn === 'all') {
+			// Search all columns
+			table.search(searchValue).draw();
+		} else {
+			// Search specific column (convert to integer)
+			const colIndex = parseInt(selectedColumn);
+			table.column(colIndex).search(searchValue).draw();
+		}
+	}
+
 	$("#spotSearchInput").on("keyup", function() {
-		table.search(this.value).draw();
+		applySearch(this.value);
 		// Show/hide clear button based on input value
 		if (this.value.length > 0) {
 			$('#clearSearchBtn').show();
@@ -2318,10 +2339,21 @@ $(function() {
 		}
 	});
 
+	// Column dropdown change handler - clear search when column changes
+	$("#spotSearchColumn").on("change", function() {
+		const searchValue = $('#spotSearchInput').val();
+		if (searchValue) {
+			applySearch(searchValue);
+		}
+	});
+
 	// Clear search button handler
 	$("#clearSearchBtn").on("click", function() {
 		$('#spotSearchInput').val('');
-		table.search('').draw();
+		// Clear both global and all column-specific searches
+		table.search('');
+		table.columns().search('');
+		table.draw();
 		$('#clearSearchBtn').hide();
 		$('#spotSearchInput').focus();
 	});
@@ -2329,7 +2361,7 @@ $(function() {
 	$("#searchIcon").on("click", function() {
 		const searchValue = $("#spotSearchInput").val();
 		if (searchValue.length > 2) {
-			table.search(searchValue).draw();
+			applySearch(searchValue);
 		}
 	});