From af1684d662bc9885f22b932835a863ca3d475884 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Mon, 5 Jan 2026 19:55:07 +0100
Subject: [PATCH 1/4] CQ and ITU zone fixes

---
 application/models/Logbookadvanced_model.php | 4 ++++
 application/views/logbookadvanced/edit.php   | 2 ++
 application/views/qso/edit_ajax.php          | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index 3e7da7e40..dafac4d98 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -897,6 +897,10 @@ class Logbookadvanced_model extends CI_Model {
 			$updatedData['COL_ITUZ'] = $callbook['ituz'];
 			$updated = true;
 		}
+		if (!empty($callbook['cqz']) && empty($qso['COL_CQZ'])) {
+			$updatedData['COL_CQZ'] = $callbook['cqz'];
+			$updated = true;
+		}
 		if (empty($qso['COL_CONT'])) {
 			$updatedData['COL_CONT'] = $this->logbook_model->getContinent($callbook['dxcc']);
 			$updated = true;
diff --git a/application/views/logbookadvanced/edit.php b/application/views/logbookadvanced/edit.php
index c1226db98..e8e2fff13 100644
--- a/application/views/logbookadvanced/edit.php
+++ b/application/views/logbookadvanced/edit.php
@@ -62,6 +62,7 @@
 
 		<!-- CQ Zone -->
 		<select style="display:none" class="form-select form-select-sm w-auto" id="editCqz" name="cqz" required>
+			<option value="">-</option>
 			<?php
 			for ($i = 1; $i <= 40; $i++) {
 				echo '<option value="' . $i . '">' . $i . '</option>';
@@ -71,6 +72,7 @@
 
 		<!-- ITU Zone -->
 		<select style="display:none" class="form-select form-select-sm w-auto" id="editItuz" name="ituz" required>
+			<option value="">-</option>
 			<?php
 			for ($i = 1; $i <= 90; $i++) {
 				echo '<option value="' . $i . '">' . $i . '</option>';
diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php
index fbd2d5c9a..ce378f30a 100644
--- a/application/views/qso/edit_ajax.php
+++ b/application/views/qso/edit_ajax.php
@@ -307,7 +307,8 @@
                                         <div class="mb-3 col-sm-6">
                                             <label for="cqz"><?= __("CQ Zone"); ?></label>
                                             <select class="form-select" id="cqz_edit" name="cqz" required>
-                                                <?php for ($i = 1; $i <= 40; $i++) { ?>
+												<option value=''></option>
+												<?php for ($i = 1; $i <= 40; $i++) { ?>
                                                     <option value="<?= $i; ?>" <?php if ($qso->COL_CQZ == $i) echo "selected=\"selected\""; ?>><?= $i; ?></option>
                                                 <?php } ?>
                                             </select>

From 12555abd43aec5ed311511cbb699b1fc744f420e Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Mon, 5 Jan 2026 21:15:53 +0100
Subject: [PATCH 2/4] Set to null, not 0 when saving blank cq zone

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

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 10ee4d0b8..5dbec718d 100644
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -1713,7 +1713,7 @@ class Logbook_model extends CI_Model {
 			'COL_COUNTRY' => $country,
 			'COL_CONT' => $this->input->post('continent'),
 			'COL_DXCC' => $dxcc,
-			'COL_CQZ' => $this->input->post('cqz'),
+			'COL_CQZ' => $this->input->post('cqz') != '' ? $this->input->post('cqz') : null,
 			'COL_ITUZ' => $this->input->post('ituz') != '' ? $this->input->post('ituz') : null,
 			'COL_SAT_NAME' => $this->input->post('sat_name'),
 			'COL_SAT_MODE' => $this->input->post('sat_mode'),

From e70d5243a565186119d434501101dd5b04efa299 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Mon, 5 Jan 2026 21:23:12 +0100
Subject: [PATCH 3/4] Set CQ or ITU to null

---
 application/views/logbookadvanced/edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/logbookadvanced/edit.php b/application/views/logbookadvanced/edit.php
index e8e2fff13..f32feee03 100644
--- a/application/views/logbookadvanced/edit.php
+++ b/application/views/logbookadvanced/edit.php
@@ -62,7 +62,7 @@
 
 		<!-- CQ Zone -->
 		<select style="display:none" class="form-select form-select-sm w-auto" id="editCqz" name="cqz" required>
-			<option value="">-</option>
+			<option value="null">-</option>
 			<?php
 			for ($i = 1; $i <= 40; $i++) {
 				echo '<option value="' . $i . '">' . $i . '</option>';
@@ -72,7 +72,7 @@
 
 		<!-- ITU Zone -->
 		<select style="display:none" class="form-select form-select-sm w-auto" id="editItuz" name="ituz" required>
-			<option value="">-</option>
+			<option value="null">-</option>
 			<?php
 			for ($i = 1; $i <= 90; $i++) {
 				echo '<option value="' . $i . '">' . $i . '</option>';

From a4492b612edd8de22602ba86f810a56efff35ea7 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Mon, 5 Jan 2026 21:29:42 +0100
Subject: [PATCH 4/4] Fix batch edit for CQ/ITU - set to null

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

diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index dafac4d98..435467741 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -1332,6 +1332,10 @@ class Logbookadvanced_model extends CI_Model {
 			$skipqrzupdate = true;
 		} else {
 
+			if ($value == "null") {
+				$value = 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').".".$column . " = ? WHERE " . $this->config->item('table_name').".col_primary_key in ? and station_profile.user_id = ?";
 
 			$query = $this->db->query($sql, array($value, json_decode($ids, true), $this->session->userdata('user_id')));