From 9dfae5ab2dd59cfae6ac27247fd528838e72296f Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Fri, 25 Oct 2024 12:17:58 +0200
Subject: [PATCH] [Quick Lookup] Added ITU zone

---
 application/controllers/Lookup.php  |  7 ++++++-
 application/models/Lookup_model.php |  1 +
 application/views/lookup/index.php  | 10 ++++++++++
 application/views/lookup/result.php | 15 ++++++++------
 assets/js/sections/common.js        | 31 ++++++++++-------------------
 5 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/application/controllers/Lookup.php b/application/controllers/Lookup.php
index 9614d3c19..3b998e32d 100644
--- a/application/controllers/Lookup.php
+++ b/application/controllers/Lookup.php
@@ -45,7 +45,11 @@ class Lookup extends CI_Controller {
 		} else {
 			$this->load->model('bands');
 
-			$data['bands'] = $this->bands->get_worked_bands(xss_clean($this->input->post('type')));
+			if ($this->input->post('type') == 'itu') {
+				$data['bands'] = $this->bands->get_worked_bands();
+			} else {
+				$data['bands'] = $this->bands->get_worked_bands(xss_clean($this->input->post('type')));
+			}
 
 
 			$data['dxcc'] = xss_clean($this->input->post('dxcc'));
@@ -55,6 +59,7 @@ class Lookup extends CI_Controller {
 			$data['iota'] = xss_clean($this->input->post('iota'));
 			$data['cqz']  = xss_clean($this->input->post('cqz'));
 			$data['wwff'] = xss_clean($this->input->post('wwff'));
+			$data['ituz'] = xss_clean($this->input->post('ituz'));
 			$data['location_list'] = $location_list;
 
 			$data['result'] = $this->lookup_model->getSearchResult($data);
diff --git a/application/models/Lookup_model.php b/application/models/Lookup_model.php
index 31b3fcbc7..566fbe20f 100644
--- a/application/models/Lookup_model.php
+++ b/application/models/Lookup_model.php
@@ -58,6 +58,7 @@ class Lookup_model extends CI_Model{
 		case 'was':  $sqlquerytypestring .= " and col_state = '" . $queryinfo['was'] . "' and COL_DXCC in ('291', '6', '110')"; break;
 		case 'sota': $sqlquerytypestring .= " and col_sota_ref = '" . $queryinfo['sota'] . "'"; break;
 		case 'wwff': $sqlquerytypestring .= " and col_sig = 'WWFF' and col_sig_info = '" . $queryinfo['wwff'] . "'"; break;
+		case 'itu':  $sqlquerytypestring .= " and col_ituz = " . $queryinfo['ituz']; break;
 		default: break;
 		}
 
diff --git a/application/views/lookup/index.php b/application/views/lookup/index.php
index c1a3b55f5..c7f46e208 100644
--- a/application/views/lookup/index.php
+++ b/application/views/lookup/index.php
@@ -4,6 +4,7 @@
 			<option value="dxcc"><?= __("DXCC"); ?></option>
 			<option value="vucc"><?= __("Gridsquare"); ?></option>
 			<option value="iota"><?= __("IOTA"); ?></option>
+			<option value="itu"><?= __("ITU Zone"); ?></option>
 			<option value="sota"><?= __("SOTA"); ?></option>
 			<option value="was"><?= __("US State"); ?></option>
 			<option value="wwff"><?= __("WWFF"); ?></option>
@@ -21,6 +22,15 @@
 			?>
 		</select>
 
+		<!-- ITU Zone -->
+		<select style="display:none" class="form-select w-auto" id="quicklookupituz" name="ituz" required>
+			<?php
+			for ($i = 1; $i <= 90; $i++) {
+				echo '<option value="' . $i . '">' . $i . '</option>';
+			}
+			?>
+		</select>
+
 		<!-- DXCC -->
 		<select style="display:none" class="form-select w-auto" id="quicklookupdxcc" name="dxcc" required>
 
diff --git a/application/views/lookup/result.php b/application/views/lookup/result.php
index 4fd0f27ab..2254fb950 100644
--- a/application/views/lookup/result.php
+++ b/application/views/lookup/result.php
@@ -15,13 +15,16 @@ foreach ($result as $mode => $value) {
 			<td>'. strtoupper($mode) .'</td>';
 	foreach ($value as $key => $val) {
 		switch($type) {
+			// function displayContacts(searchphrase, band, sat, orbit, mode, type, qsl) {
+
 			case 'dxcc': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $dxcc).'","' . $key . '","All","All","' . $mode . '","DXCC2")\'>'  . $val . '</a>'; break;
-			case 'iota': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $iota).'","' . $key . '","' . $mode . '","All","All","IOTA")\'>'   . $val . '</a>'; break;
-			case 'vucc': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $grid).'","' . $key . '","' . $mode . '","All","All","VUCC")\'>'   . $val . '</a>'; break;
-			case 'cq':  $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $cqz).'","'  . $key . '","' . $mode . '","All","All","CQZone")\'>' . $val . '</a>'; break;
-			case 'was':  $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $was).'","'  . $key . '","' . $mode . '","All","All","WAS")\'>'    . $val . '</a>'; break;
-			case 'sota': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $sota).'","' . $key . '","' . $mode . '","All","All","SOTA")\'>'   . $val . '</a>'; break;
-			case 'wwff': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $wwff).'","' . $key . '","' . $mode . '","All","All","WWFF")\'>'   . $val . '</a>'; break;
+			case 'iota': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $iota).'","' . $key . '","All","All","' . $mode . '","IOTA")\'>'   . $val . '</a>'; break;
+			case 'vucc': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $grid).'","' . $key . '","All","All","' . $mode . '","VUCC")\'>'   . $val . '</a>'; break;
+			case 'cq':  $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $cqz).'","'  . $key . '","All","All","' . $mode . '","CQZone")\'>' . $val . '</a>'; break;
+			case 'was':  $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $was).'","'  . $key . '","All","All","' . $mode . '","WAS")\'>'    . $val . '</a>'; break;
+			case 'sota': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $sota).'","' . $key . '","All","All","' . $mode . '","SOTA")\'>'   . $val . '</a>'; break;
+			case 'wwff': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $wwff).'","' . $key . '","All","All","' . $mode . '","WWFF")\'>'   . $val . '</a>'; break;
+			case 'itu': $linkinfo = '<a href=\'javascript:displayContacts("'.str_replace("&", "%26", $ituz).'","' . $key . '","All","All","' . $mode . '","ITU")\'>'   . $val . '</a>'; break;
 		}
 
 		$info = '<td>';
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js
index b9d53d3a1..50cb1c46d 100644
--- a/assets/js/sections/common.js
+++ b/assets/js/sections/common.js
@@ -735,6 +735,8 @@ function spawnLookupModal(searchphrase, searchtype) {
                             $("#quicklookupiota").val(searchphrase);
                         } else if (searchtype == 'cq') {
                             $("#quicklookupcqz").val(searchphrase);
+						} else if (searchtype == 'itu') {
+                            $("#quicklookupituz").val(searchphrase);
                         } else {
                             $("#quicklookuptext").val(searchphrase);
                         }
@@ -754,36 +756,24 @@ function spawnLookupModal(searchphrase, searchtype) {
 }
 
 function changeLookupType(type) {
+	$('#quicklookupdxcc').hide();
+	$('#quicklookupiota').hide();
+	$('#quicklookupcqz').hide();
+	$('#quicklookupituz').hide();
+	$('#quicklookupwas').hide();
+	$('#quicklookuptext').hide();
     if (type == "dxcc") {
         $('#quicklookupdxcc').show();
-        $('#quicklookupiota').hide();
-        $('#quicklookupcqz').hide();
-        $('#quicklookupwas').hide();
-        $('#quicklookuptext').hide();
     } else if (type == "iota") {
         $('#quicklookupiota').show();
-        $('#quicklookupdxcc').hide();
-        $('#quicklookupcqz').hide();
-        $('#quicklookupwas').hide();
-        $('#quicklookuptext').hide();
     } else if (type == "vucc" || type == "sota" || type == "wwff" || type == "lotw") {
         $('#quicklookuptext').show();
-        $('#quicklookupiota').hide();
-        $('#quicklookupdxcc').hide();
-        $('#quicklookupcqz').hide();
-        $('#quicklookupwas').hide();
     } else if (type == "cq") {
         $('#quicklookupcqz').show();
-        $('#quicklookupiota').hide();
-        $('#quicklookupdxcc').hide();
-        $('#quicklookupwas').hide();
-        $('#quicklookuptext').hide();
+	} else if (type == "itu") {
+        $('#quicklookupituz').show();
     } else if (type == "was") {
         $('#quicklookupwas').show();
-        $('#quicklookupcqz').hide();
-        $('#quicklookupiota').hide();
-        $('#quicklookupdxcc').hide();
-        $('#quicklookuptext').hide();
     }
 }
 
@@ -804,6 +794,7 @@ function getLookupResult() {
 			sota: $('#quicklookuptext').val(),
 			wwff: $('#quicklookuptext').val(),
 			lotw: $('#quicklookuptext').val(),
+			ituz: $('#quicklookupituz').val(),
 		},
 		success: function (html) {
 			$('#lookupresulttable').html(html);