Added "All" to Bandchooser at List

application/models/Dxcluster_model.php

@@ -13,7 +13,11 @@ class Dxcluster_model extends CI_Model {
 				$custom_date_format = $CI->config->item('qso_date_format');
 			}
 
+			if ($band == "All") {
+				$dxcache_url = $this->optionslib->get_option('dxcache_url').'/spots/';
+			} else {
 				$dxcache_url = $this->optionslib->get_option('dxcache_url').'/spots/'.$band;
+			}
 			$CI->load->model('logbooks_model');
 			$CI->load->model('logbook_model');
 			$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@@ -37,7 +41,7 @@ class Dxcluster_model extends CI_Model {
 				foreach($json as $singlespot){
 					$spotband = $CI->frequency->GetBand($singlespot->frequency*1000);
 					$singlespot->band=$spotband;
-				    if ($band != $spotband) { continue; }
+					if (($band != 'All') && ($band != $spotband)) { continue; }
 					$datetimecurrent = new DateTime("now", new DateTimeZone('UTC')); // Today's Date/Time
 					$datetimespot = new DateTime($singlespot->when, new DateTimeZone('UTC'));
 					$spotage = $datetimecurrent->diff($datetimespot);

application/views/bandmap/list.php

@@ -6,6 +6,9 @@
 </script>
 
 <style>
+.kHz::after {
+	content: " kHz";
+}
 .fresh{
     -webkit-transition: all 15s ease;
     -moz-transition: all 15s ease;
@@ -56,6 +59,7 @@
 
 		<label class="my-1 mr-2" for="band"><?php echo lang('gen_hamradio_band'); ?></label>
 		<select id="band" class="form-control-sm my-1 mr-sm-2" name="band">
+			<option value="All">All</option>
 			<?php foreach($bands as $key=>$bandgroup) {
 					echo '<optgroup label="' . strtoupper($key) . '">';
 					foreach($bandgroup as $band) {

assets/js/sections/bandmap_list.js

@@ -6,9 +6,24 @@ $(function() {
 		return ((a< b) ? -1 : ((a> b) ? 1 : 0));
 	}
 
+	function get_dtable () {
+		var table = $('.spottable').DataTable({
+			"retrieve":true,
+			'columnDefs': [
+				{
+					'targets': 1, "type":"num",
+					'createdCell':  function (td, cellData, rowData, row, col) {
+						$(td).addClass("kHz"); 
+					}
+				}
+			]
+		});
+		return table;
+	}
 
 	function fill_list(band,de,maxAgeMinutes) {
-		var table = $('.spottable').DataTable();
+		// var table = $('.spottable').DataTable();
+		var table = get_dtable();
 		if ((band != '') && (band !== undefined)) {
 			let dxurl = dxcluster_provider + "/spots/" + band + "/" +maxAgeMinutes + "/" + de;
 			$.ajax({
@@ -25,7 +40,7 @@ $(function() {
 						var data=[];
 						data[0]=[];
 						data[0].push(single.when_pretty);
-						data[0].push(single.frequency + " kHz");
+						data[0].push(single.frequency*1);
 						data[0].push((single.worked_call ?'<span class="text-success">' : '')+single.spotted+(single.worked_call ? '</span>' : ''));
 						data[0].push(single.dxcc_spotted.entity);
 						data[0].push(single.spotter);
@@ -57,7 +72,8 @@ $(function() {
 	}
 
 	function highlight_current_qrg(qrg) {
-		var table=$('.spottable').DataTable();
+		var table=get_dtable();
+		// var table=$('.spottable').DataTable();
 		table.rows().every(function() {
 			var d=this.data();
 			var distance=Math.abs(parseInt(d[1].substring(0,d[1].length-4))-qrg);
@@ -71,27 +87,28 @@ $(function() {
 		});
 	}
 
-	$('.spottable').DataTable().order([1, 'asc']);
+	var table=get_dtable();
-	$('.spottable').DataTable().clear();
+	table.order([1, 'asc']);
+	table.clear();
 	fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage);
 	setInterval(function () { fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage); },60000);
 
 	$("#decontSelect").on("change",function() {
-		$('.spottable').DataTable().clear();
+		table.clear();
 		fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage);
 	});
 
 	$("#band").on("change",function() {
-		$('.spottable').DataTable().order([1, 'asc']);
+		table.order([1, 'asc']);
-		$('.spottable').DataTable().clear();
+		table.clear();
 		fill_list($('#band option:selected').val(), $('#decontSelect option:selected').val(),dxcluster_maxage);
 	});
 
 	$("#spottertoggle").on("click", function() {
-		if ($('.spottable').DataTable().column(4).visible()) {
+		if (table.column(4).visible()) {
-			$('.spottable').DataTable().column(4).visible(false);
+			table.column(4).visible(false);
 		} else {
-			$('.spottable').DataTable().column(4).visible(true);
+			table.column(4).visible(true);
 		}
 	});