From d59794d319d342e7e197f845439050aa09ff2eb9 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Thu, 19 Mar 2026 19:20:01 +0100
Subject: [PATCH 1/5] [Advanced Logbook] Added frequency to batch edit

---
 application/models/Logbookadvanced_model.php | 17 +++++++++++++++++
 application/views/logbookadvanced/edit.php   |  7 +++++++
 assets/js/sections/logbookadvanced_edit.js   | 15 ++++++++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index 5427ba5f1..a9ee09a45 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -1126,6 +1126,7 @@ class Logbookadvanced_model extends CI_Model {
 			case "rsts": $column = 'COL_RST_SENT'; break;
 			case "qslsentmethod": $column = 'COL_QSL_SENT_VIA'; break;
 			case "qslreceivedmethod": $column = 'COL_QSL_RCVD_VIA'; break;
+			case "frequency": $column = 'COL_FREQUENCY'; break;
 			default: return;
 		}
 
@@ -1186,6 +1187,22 @@ class Logbookadvanced_model extends CI_Model {
 			$frequencyBandRx = $bandrx == '' ? null : $this->frequency->defaultFrequencies[$bandrx]['CW'];
 
 			$query = $this->db->query($sql, array($value, $value2, $frequencyBand, $frequencyBandRx, json_decode($ids, true), $this->session->userdata('user_id')));
+		}  else if ($column == 'COL_FREQUENCY') {
+
+			if ($value == '') return;
+
+			$value2 == '' ? '' : $value2;
+			$sql = "UPDATE ".$this->config->item('table_name')." JOIN station_profile ON ". $this->config->item('table_name').".station_id = station_profile.station_id" .
+			" SET " . $this->config->item('table_name').".COL_FREQ = ?" .
+			", " . $this->config->item('table_name').".COL_FREQ_RX = ?" .
+			", " . $this->config->item('table_name').".COL_BAND = ?" .
+			", " . $this->config->item('table_name').".COL_BAND_RX = ?" .
+			" WHERE " . $this->config->item('table_name').".col_primary_key in ? and station_profile.user_id = ?";
+
+			$band = $this->frequency->GetBand($value);
+			$bandRx = $value2 == '' ? null : $this->frequency->GetBand($value2);
+
+			$query = $this->db->query($sql, array($value, $value2, $band, $bandRx, json_decode($ids, true), $this->session->userdata('user_id')));
 		} else if ($column == 'COL_GRIDSQUARE') {
 			if ($value == '') {
 				$grid_value = null;
diff --git a/application/views/logbookadvanced/edit.php b/application/views/logbookadvanced/edit.php
index cc39e540c..917b2e67c 100644
--- a/application/views/logbookadvanced/edit.php
+++ b/application/views/logbookadvanced/edit.php
@@ -4,6 +4,7 @@
 			<option value="">-</option>
 			<optgroup label="<?= __("QSO details"); ?>">
 				<option value="band"><?= __("Band"); ?></option>
+				<option value="frequency"><?= __("Frequency"); ?></option>
 				<option value="comment"><?= __("Comment"); ?></option>
 				<option value="contest"><?= __("Contest"); ?></option>
 				<option value="stxstring"><?= __("Contest Exch (S)"); ?></option>
@@ -133,6 +134,12 @@
 			?>
 		</select>
 
+		<label style="display:none" id="editFrequencyTxLabel" class="mx-2 w-auto" for="editFrequency"><?= __("Frequency TX (Hz)"); ?></label>
+		<input style="display:none" class="form-control form-control-sm w-auto" id="editFrequency" type="text" name="editFrequency" placeholder="" aria-label="editFrequency">
+
+		<label style="display:none" id="editFrequencyRxLabel" class="mx-2 w-auto" for="editFrequencyRx"><?= __("Frequency RX (Hz)"); ?></label>
+		<input style="display:none" class="form-control form-control-sm w-auto" id="editFrequencyRx" type="text" name="editFrequencyRx" placeholder="" aria-label="editFrequencyRx">
+
 		<select style="display:none" id="editMode" class="form-select mode form-select-sm w-auto" name="editMode">
 		<?php
 			foreach($modes->result() as $mode){
diff --git a/assets/js/sections/logbookadvanced_edit.js b/assets/js/sections/logbookadvanced_edit.js
index 83180503a..c71268210 100644
--- a/assets/js/sections/logbookadvanced_edit.js
+++ b/assets/js/sections/logbookadvanced_edit.js
@@ -168,6 +168,10 @@ function saveBatchEditQsos(id_list) {
 		value = $("#editBand").val();
 		value2 = $("#editBandRx").val();
 	}
+	if (column == 'frequency') {
+		value = $("#editFrequency").val();
+		value2 = $("#editFrequencyRx").val();
+	}
 	if (column == 'mode') {
 		value = $("#editMode").val();
 	}
@@ -277,6 +281,10 @@ function changeEditType(type) {
 	$('#editDokInput').hide();
 	$('#editGridsquareInput').hide();
 	$('#editQslMethod').hide();
+	$('#editFrequency').hide();
+	$('#editFrequencyRx').hide();
+	$('#editFrequencyTxLabel').hide();
+	$('#editFrequencyRxLabel').hide();
 	if (type == "dxcc") {
 		$('#editDxcc').show();
 	} else if (type == "iota") {
@@ -298,7 +306,7 @@ function changeEditType(type) {
 		$('#editBandTxLabel').show();
 		$('#editBandRx').show();
 		$('#editBandRxLabel').show();
-	}else if (type == "mode") {
+	} else if (type == "mode") {
 		$('#editMode').show();
 	} else if (type == "date") {
 		$('#editDate').show();
@@ -341,6 +349,11 @@ function changeEditType(type) {
 		$('#editDistanceInputLabel').show();
 	} else if (type == "qslsentmethod" || type == "qslreceivedmethod") {
 		$('#editQslMethod').show();
+	} else if (type == "frequency") {
+		$('#editFrequency').show();
+		$('#editFrequencyRx').show();
+		$('#editFrequencyTxLabel').show();
+		$('#editFrequencyRxLabel').show();
 	}
 }
 

From 3a060023bc97a4201104f66e93160b1569028e59 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Fri, 20 Mar 2026 11:46:24 +0100
Subject: [PATCH 2/5] Removed code that didn't make sense

---
 application/models/Logbookadvanced_model.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index a9ee09a45..cf6902a8c 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -1191,7 +1191,6 @@ class Logbookadvanced_model extends CI_Model {
 
 			if ($value == '') return;
 
-			$value2 == '' ? '' : $value2;
 			$sql = "UPDATE ".$this->config->item('table_name')." JOIN station_profile ON ". $this->config->item('table_name').".station_id = station_profile.station_id" .
 			" SET " . $this->config->item('table_name').".COL_FREQ = ?" .
 			", " . $this->config->item('table_name').".COL_FREQ_RX = ?" .

From 13a5168e233d591b0b6613d4a5a808e1d2cb0127 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 21 Mar 2026 18:49:56 +0100
Subject: [PATCH 3/5] int vs blank vs db fix

---
 application/models/Logbookadvanced_model.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index cf6902a8c..d9d89ee40 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -1191,6 +1191,8 @@ class Logbookadvanced_model extends CI_Model {
 
 			if ($value == '') return;
 
+			$value2 == '' ? null : $this->frequency->GetBand($value2);
+
 			$sql = "UPDATE ".$this->config->item('table_name')." JOIN station_profile ON ". $this->config->item('table_name').".station_id = station_profile.station_id" .
 			" SET " . $this->config->item('table_name').".COL_FREQ = ?" .
 			", " . $this->config->item('table_name').".COL_FREQ_RX = ?" .
@@ -1199,7 +1201,7 @@ class Logbookadvanced_model extends CI_Model {
 			" WHERE " . $this->config->item('table_name').".col_primary_key in ? and station_profile.user_id = ?";
 
 			$band = $this->frequency->GetBand($value);
-			$bandRx = $value2 == '' ? null : $this->frequency->GetBand($value2);
+			$bandRx = $value2 == null ? null : $this->frequency->GetBand($value2);
 
 			$query = $this->db->query($sql, array($value, $value2, $band, $bandRx, json_decode($ids, true), $this->session->userdata('user_id')));
 		} else if ($column == 'COL_GRIDSQUARE') {

From c2c9c906c21f6875cac83751ec859157ece9d0f8 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 21 Mar 2026 18:55:17 +0100
Subject: [PATCH 4/5] Fix stupid error

---
 application/models/Logbookadvanced_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index d9d89ee40..3678e2b95 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -1191,7 +1191,7 @@ class Logbookadvanced_model extends CI_Model {
 
 			if ($value == '') return;
 
-			$value2 == '' ? null : $this->frequency->GetBand($value2);
+			$value2 == '' ? null : $value2;
 
 			$sql = "UPDATE ".$this->config->item('table_name')." JOIN station_profile ON ". $this->config->item('table_name').".station_id = station_profile.station_id" .
 			" SET " . $this->config->item('table_name').".COL_FREQ = ?" .

From fe22617ae3fdd208bf7a6c54f57856f577ff3ed1 Mon Sep 17 00:00:00 2001
From: "Joerg (DJ7NT)" <int2001@users.noreply.github.com>
Date: Sat, 21 Mar 2026 19:07:13 +0100
Subject: [PATCH 5/5] Fix null assignment for frequency value

Refactor frequency value assignment to handle null case.
---
 application/models/Logbookadvanced_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index 3678e2b95..477ab9837 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -1191,7 +1191,7 @@ class Logbookadvanced_model extends CI_Model {
 
 			if ($value == '') return;
 
-			$value2 == '' ? null : $value2;
+			if (trim($value2 ?? '') == '') { $value2=null; }
 
 			$sql = "UPDATE ".$this->config->item('table_name')." JOIN station_profile ON ". $this->config->item('table_name').".station_id = station_profile.station_id" .
 			" SET " . $this->config->item('table_name').".COL_FREQ = ?" .