From 1e6e36836225c9c83f11a057eb2e3592bfc7488d Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Wed, 26 Jul 2023 16:38:38 +0000
Subject: [PATCH 1/8] Bandmap2QSO Basics

---
 assets/js/sections/bandmap_list.js | 12 ++++++++++++
 assets/js/sections/qso.js          |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js
index 28e104aa..54732520 100644
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -15,6 +15,12 @@ $(function() {
 					'createdCell':  function (td, cellData, rowData, row, col) {
 						$(td).addClass("kHz"); 
 					}
+				},
+				{
+					'targets': 2,
+					'createdCell':  function (td, cellData, rowData, row, col) {
+						$(td).addClass("spotted_call"); 
+					}
 				}
 			]
 		});
@@ -112,6 +118,12 @@ $(function() {
 		}
 	});
 
+	$(document).on('click','.spotted_call', function() {
+		var bc = new BroadcastChannel('qso_wish');
+		bc.postMessage(this.innerText);
+		console.log(this.innerText);
+	});
+
 	$("#menutoggle").on("click", function() {
 		if ($('.navbar').is(":hidden")) {
 			$('.navbar').show();
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 6351c118..9d2fe535 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -1,5 +1,8 @@
 $( document ).ready(function() {
 
+	var bc = new BroadcastChannel('qso_wish');
+	bc.onmessage = function (ev) { console.log(ev); } /* receive */
+
 	$("#locator")
 		.popover({ placement: 'top', title: 'Gridsquare Formatting', content: "Enter multiple (4-digit) grids separated with commas. For example: IO77,IO78" })
 		.focus(function () {

From 7455ee6f468d796a257433ea9ee3a4241253eb78 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Wed, 26 Jul 2023 17:55:35 +0000
Subject: [PATCH 2/8] QSO-Windowdetection / basics

---
 assets/js/sections/bandmap_list.js | 21 ++++++++++++++++++---
 assets/js/sections/qso.js          | 20 +++++++++++++++++++-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js
index 54732520..59ecb8aa 100644
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -118,10 +118,25 @@ $(function() {
 		}
 	});
 
+	var qso_window_last_seen=Date.now()-3600;
+
+	var bc_qsowin = new BroadcastChannel('qso_window');
+	bc_qsowin.onmessage = function (ev) {
+		// console.log(ev.data);
+		if (ev.data == 'pong') {
+			qso_window_last_seen=Date.now();
+		}
+	};
+
+	setInterval(function () { bc_qsowin.postMessage('ping') },500);
+	var bc2qso = new BroadcastChannel('qso_wish');
+
 	$(document).on('click','.spotted_call', function() {
-		var bc = new BroadcastChannel('qso_wish');
-		bc.postMessage(this.innerText);
-		console.log(this.innerText);
+		if (Date.now()-qso_window_last_seen < 2000) {
+			bc2qso.postMessage({ call: this.innerText });
+		} else {
+			window.open('https://log.dj7nt.de/index.php/qso?manual=0','_blank');
+		}
 	});
 
 	$("#menutoggle").on("click", function() {
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 9d2fe535..23087aab 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -1,7 +1,25 @@
 $( document ).ready(function() {
 
+
+	var bc_bandmap = new BroadcastChannel('qso_window');
+	bc_bandmap.onmessage = function (ev) {
+		console.log(ev.data);
+		if (ev.data == 'ping') {
+			bc_bandmap.postMessage('pong');
+		}
+	}
+
 	var bc = new BroadcastChannel('qso_wish');
-	bc.onmessage = function (ev) { console.log(ev); } /* receive */
+	bc.onmessage = function (ev) { 
+		if (ev.data.ping) {
+			let message={};
+			message.pong=true;
+			bc.postMessage(message);	
+		} else {
+			$("#callsign").val(ev.data.call);
+			$("#callsign").blur();
+		}
+	} /* receive */
 
 	$("#locator")
 		.popover({ placement: 'top', title: 'Gridsquare Formatting', content: "Enter multiple (4-digit) grids separated with commas. For example: IO77,IO78" })

From 17703e16d3c9675877dea53ba914a17a50cccf96 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Wed, 26 Jul 2023 19:50:52 +0000
Subject: [PATCH 3/8] click on call -> copy call and qrg to add_qso

---
 assets/js/sections/bandmap_list.js | 11 ++++++++---
 assets/js/sections/qso.js          |  6 ++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js
index 59ecb8aa..91824082 100644
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -122,7 +122,6 @@ $(function() {
 
 	var bc_qsowin = new BroadcastChannel('qso_window');
 	bc_qsowin.onmessage = function (ev) {
-		// console.log(ev.data);
 		if (ev.data == 'pong') {
 			qso_window_last_seen=Date.now();
 		}
@@ -133,9 +132,15 @@ $(function() {
 
 	$(document).on('click','.spotted_call', function() {
 		if (Date.now()-qso_window_last_seen < 2000) {
-			bc2qso.postMessage({ call: this.innerText });
+			bc2qso.postMessage({ frequency: this.parentNode.cells[1].textContent*1000, call: this.innerText });
 		} else {
-			window.open('https://log.dj7nt.de/index.php/qso?manual=0','_blank');
+			let cl={};
+			cl.qrg=this.parentNode.cells[1].textContent*1000;
+			cl.call=this.innerText;
+			window.open(base_url + 'qso?manual=0','_blank');
+			setTimeout(function () { 
+				bc2qso.postMessage({ frequency: cl.qrg, call: cl.call }) 
+			},2500);	// Wait at least 2500ms for new-Window to appear, before posting data to it
 		}
 	});
 
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 23087aab..9dd906f6 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -16,6 +16,12 @@ $( document ).ready(function() {
 			message.pong=true;
 			bc.postMessage(message);	
 		} else {
+			$('#frequency').val(ev.data.frequency);
+			$("#band").val(frequencyToBand(ev.data.frequency));
+			if (ev.data.frequency_rx != "") {
+				$('#frequency_rx').val(ev.data.frequency_rx);
+				$("#band_rx").val(frequencyToBand(ev.data.frequency_rx));
+			}
 			$("#callsign").val(ev.data.call);
 			$("#callsign").blur();
 		}

From b7fccc6aec0b4ade4fbacdc6221d41e8b0753a39 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Thu, 27 Jul 2023 03:28:41 +0000
Subject: [PATCH 4/8] Removed debug output

---
 assets/js/sections/qso.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 9dd906f6..48288180 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -3,7 +3,6 @@ $( document ).ready(function() {
 
 	var bc_bandmap = new BroadcastChannel('qso_window');
 	bc_bandmap.onmessage = function (ev) {
-		console.log(ev.data);
 		if (ev.data == 'ping') {
 			bc_bandmap.postMessage('pong');
 		}

From 36fca28f1be72ed7a939c2a2f2bfb81c54b3a3d0 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Thu, 27 Jul 2023 11:17:00 +0000
Subject: [PATCH 5/8] Made List default, added tooltip to call-column

---
 application/views/bandmap/list.php            | 4 ++++
 application/views/interface_assets/header.php | 2 +-
 assets/js/sections/bandmap_list.js            | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php
index bee0d258..9b24f2d9 100644
--- a/application/views/bandmap/list.php
+++ b/application/views/bandmap/list.php
@@ -6,6 +6,10 @@
 </script>
 
 <style>
+.spotted_call {
+	cursor: alias;
+}
+
 .kHz::after {
 	content: " kHz";
 }
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index ad7ab2e1..c2adedfc 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -82,7 +82,7 @@
 							<a class="dropdown-item" href="<?php echo site_url('contesting?manual=1');?>" title="Post contest QSOs"><i class="fas fa-list"></i> <?php echo lang('menu_post_contest_logging'); ?></a>
 <?php if ($this->optionslib->get_option('dxcache_url') != '') { ?>
 							<div class="dropdown-divider"></div>
-							<a class="dropdown-item" href="<?php echo site_url('bandmap/index');?>" title="Bandmap"><i class="fa fa-id-card"></i> <?php echo lang('menu_bandmap'); ?></a>
+							<a class="dropdown-item" href="<?php echo site_url('bandmap/list');?>" title="Bandmap"><i class="fa fa-id-card"></i> <?php echo lang('menu_bandmap'); ?></a>
 <?php } ?>
 							<div class="dropdown-divider"></div>
 							<a class="dropdown-item" href="<?php echo site_url('qsl');?>" title="QSL"><i class="fa fa-id-card"></i> <?php echo lang('menu_view_qsl'); ?></a>
diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js
index 91824082..36fc6245 100644
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -20,6 +20,7 @@ $(function() {
 					'targets': 2,
 					'createdCell':  function (td, cellData, rowData, row, col) {
 						$(td).addClass("spotted_call"); 
+						$(td).attr( "title", "Click to prepare logging" );
 					}
 				}
 			]

From 6e05c8ac51c0bcd805bf5b0b4466b90d6bce0741 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Thu, 27 Jul 2023 17:13:16 +0200
Subject: [PATCH 6/8] Fix links (add index.php)

---
 assets/js/sections/bandmap.js      | 2 +-
 assets/js/sections/bandmap_list.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/js/sections/bandmap.js b/assets/js/sections/bandmap.js
index 096c11b7..7f9fa43c 100644
--- a/assets/js/sections/bandmap.js
+++ b/assets/js/sections/bandmap.js
@@ -197,7 +197,7 @@ $(function() {
 var updateFromCAT = function() {
 	if($('select.radios option:selected').val() != '0') {
 		radioID = $('select.radios option:selected').val();
-		$.getJSON( base_url + "radio/json/" + radioID, function( data ) {
+		$.getJSON( base_url + "index.php/radio/json/" + radioID, function( data ) {
 
 			if (data.error) {
 				if (data.error == 'not_logged_in') {
diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js
index 36fc6245..f11fab99 100644
--- a/assets/js/sections/bandmap_list.js
+++ b/assets/js/sections/bandmap_list.js
@@ -138,7 +138,7 @@ $(function() {
 			let cl={};
 			cl.qrg=this.parentNode.cells[1].textContent*1000;
 			cl.call=this.innerText;
-			window.open(base_url + 'qso?manual=0','_blank');
+			window.open(base_url + 'index.php/qso?manual=0','_blank');
 			setTimeout(function () { 
 				bc2qso.postMessage({ frequency: cl.qrg, call: cl.call }) 
 			},2500);	// Wait at least 2500ms for new-Window to appear, before posting data to it
@@ -164,7 +164,7 @@ $(function() {
 	var updateFromCAT = function() {
 	if($('select.radios option:selected').val() != '0') {
 		radioID = $('select.radios option:selected').val();
-		$.getJSON( base_url+"radio/json/" + radioID, function( data ) {
+		$.getJSON( base_url+"index.php/radio/json/" + radioID, function( data ) {
 
 			if (data.error) {
 				if (data.error == 'not_logged_in') {

From cdd8fc4d7c4680b49b3b54519e84e9a6e9a08f51 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Thu, 27 Jul 2023 15:27:47 +0000
Subject: [PATCH 7/8] focusout instead of blur

---
 assets/js/sections/qso.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 48288180..9f1efcb0 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -22,7 +22,7 @@ $( document ).ready(function() {
 				$("#band_rx").val(frequencyToBand(ev.data.frequency_rx));
 			}
 			$("#callsign").val(ev.data.call);
-			$("#callsign").blur();
+			$("#callsign").focusout();
 		}
 	} /* receive */
 

From 14c924e612d7d09b4d029b86dced7cedfc6fd1a2 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Thu, 27 Jul 2023 19:57:43 +0200
Subject: [PATCH 8/8] Fixing extra lookup when clicking in QSO entry window

---
 assets/js/sections/qso.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 9f1efcb0..48d90ffe 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -9,11 +9,11 @@ $( document ).ready(function() {
 	}
 
 	var bc = new BroadcastChannel('qso_wish');
-	bc.onmessage = function (ev) { 
+	bc.onmessage = function (ev) {
 		if (ev.data.ping) {
 			let message={};
 			message.pong=true;
-			bc.postMessage(message);	
+			bc.postMessage(message);
 		} else {
 			$('#frequency').val(ev.data.frequency);
 			$("#band").val(frequencyToBand(ev.data.frequency));
@@ -23,6 +23,7 @@ $( document ).ready(function() {
 			}
 			$("#callsign").val(ev.data.call);
 			$("#callsign").focusout();
+			$("#callsign").blur();
 		}
 	} /* receive */
 
@@ -115,7 +116,7 @@ $( document ).ready(function() {
 	});
 
 	$('#sota_ref').change(function(){
-		$('#sota_info').html('<a target="_blank" href="https://summits.sota.org.uk/summit/'+$('#sota_ref').val()+'"><img width="32" height="32" src="'+base_url+'images/icons/sota.org.uk.png"></a>'); 
+		$('#sota_info').html('<a target="_blank" href="https://summits.sota.org.uk/summit/'+$('#sota_ref').val()+'"><img width="32" height="32" src="'+base_url+'images/icons/sota.org.uk.png"></a>');
 		$('#sota_info').attr('title', 'Lookup '+$('#sota_ref').val()+' summit info on sota.org.uk');
 	});
 
@@ -148,7 +149,7 @@ $( document ).ready(function() {
 	});
 
 	$('#wwff_ref').change(function(){
-		$('#wwff_info').html('<a target="_blank" href="https://www.cqgma.org/zinfo.php?ref='+$('#wwff_ref').val()+'"><img width="32" height="32" src="'+base_url+'images/icons/wwff.co.png"></a>'); 
+		$('#wwff_info').html('<a target="_blank" href="https://www.cqgma.org/zinfo.php?ref='+$('#wwff_ref').val()+'"><img width="32" height="32" src="'+base_url+'images/icons/wwff.co.png"></a>');
 		$('#wwff_info').attr('title', 'Lookup '+$('#wwff_ref').val()+' reference info on cqgma.org');
 	});
 
@@ -181,7 +182,7 @@ $( document ).ready(function() {
 	});
 
 	$('#pota_ref').change(function(){
-		$('#pota_info').html('<a target="_blank" href="https://pota.app/#/park/'+$('#pota_ref').val()+'"><img width="32" height="32" src="'+base_url+'images/icons/pota.app.png"></a>'); 
+		$('#pota_info').html('<a target="_blank" href="https://pota.app/#/park/'+$('#pota_ref').val()+'"><img width="32" height="32" src="'+base_url+'images/icons/pota.app.png"></a>');
 		$('#pota_info').attr('title', 'Lookup '+$('#pota_ref').val()+' reference info on pota.co');
 	});
 
@@ -480,7 +481,7 @@ $("#callsign").focusout(function() {
 					}
 
 					changebadge(result.dxcc.entity);
-					
+
 					getDxccResult(result.dxcc.adif, convert_case(result.dxcc.entity));
 				}
 
@@ -498,9 +499,9 @@ $("#callsign").focusout(function() {
 					$('#lotw_info').attr('data-original-title',"LoTW User. Last upload was "+result.lotw_days+" days ago");
 					$('[data-toggle="tooltip"]').tooltip();
 				}
-				$('#qrz_info').html('<a target="_blank" href="https://www.qrz.com/db/'+find_callsign+'"><img width="32" height="32" src="'+base_url+'images/icons/qrz.com.png"></a>'); 
+				$('#qrz_info').html('<a target="_blank" href="https://www.qrz.com/db/'+find_callsign+'"><img width="32" height="32" src="'+base_url+'images/icons/qrz.com.png"></a>');
 				$('#qrz_info').attr('title', 'Lookup '+find_callsign+' info on qrz.com');
-				$('#hamqth_info').html('<a target="_blank" href="https://www.hamqth.com/'+find_callsign+'"><img width="32" height="32" src="'+base_url+'images/icons/hamqth.com.png"></a>'); 
+				$('#hamqth_info').html('<a target="_blank" href="https://www.hamqth.com/'+find_callsign+'"><img width="32" height="32" src="'+base_url+'images/icons/hamqth.com.png"></a>');
 				$('#hamqth_info').attr('title', 'Lookup '+find_callsign+' info on hamqth.com');
 
 				var $dok_select = $('#darc_dok').selectize();