From ac61eecce5c03779d67f3f6296d3c4719ce3a515 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Fri, 12 Apr 2024 12:24:22 +0200
Subject: [PATCH] Added band support in options and map

---
 application/controllers/Stationsetup.php            |  7 +++++++
 application/controllers/Visitor.php                 |  1 +
 application/views/stationsetup/exportmapoptions.php | 12 ++++++++++++
 assets/js/sections/stationsetup.js                  |  1 +
 4 files changed, 21 insertions(+)

diff --git a/application/controllers/Stationsetup.php b/application/controllers/Stationsetup.php
index 554dedbed..a6623dea3 100644
--- a/application/controllers/Stationsetup.php
+++ b/application/controllers/Stationsetup.php
@@ -432,6 +432,11 @@ class Stationsetup extends CI_Controller {
 
 	public function editExportmapOptions() {
 		$this->load->model('stationsetup_model');
+
+		$this->load->model('bands');
+
+		$data['bands'] = $this->bands->get_user_bands();
+
 		$container = $this->stationsetup_model->getContainer(xss_clean($this->input->post('id', true)))->row();
 		$slug = $container->public_slug;
 		$data['logbookid'] = xss_clean($this->input->post('id', true));
@@ -441,6 +446,7 @@ class Stationsetup extends CI_Controller {
 		$exportmapoptions['cqzone_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'cqzone_layer','option_key'=>$slug))->row();
 		$exportmapoptions['qsocount'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'qsocount','option_key'=>$slug))->row();
 		$exportmapoptions['nightshadow_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'nightshadow_layer','option_key'=>$slug))->row();
+		$exportmapoptions['band'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'band','option_key'=>$slug))->row();
 
 		$data['exportmapoptions'] = $exportmapoptions;
 
@@ -460,5 +466,6 @@ class Stationsetup extends CI_Controller {
 		$this->user_options_model->set_option('ExportMapOptions', 'cqzone_layer',  array($slug => xss_clean($this->input->post('cqzone_layer'))));
 		$this->user_options_model->set_option('ExportMapOptions', 'nightshadow_layer',  array($slug => xss_clean($this->input->post('nightshadow_layer'))));
 		$this->user_options_model->set_option('ExportMapOptions', 'qsocount',  array($slug => xss_clean($this->input->post('qsocount'))));
+		$this->user_options_model->set_option('ExportMapOptions', 'band',  array($slug => xss_clean($this->input->post('band'))));
 	}
 }
diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php
index c2fb75d31..fe87b3f35 100644
--- a/application/controllers/Visitor.php
+++ b/application/controllers/Visitor.php
@@ -530,6 +530,7 @@ class Visitor extends CI_Controller {
 		$jsonout['cqzone_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'cqzone_layer','option_key'=>$slug), $userid)->row()->option_value ?? true;
 		$jsonout['qsocount'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'qsocount','option_key'=>$slug), $userid)->row()->option_value ?? 250;
 		$jsonout['nightshadow_layer'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'nightshadow_layer','option_key'=>$slug), $userid)->row()->option_value ?? true;
+		$jsonout['band'] = $this->user_options_model->get_options('ExportMapOptions',array('option_name'=>'band','option_key'=>$slug), $userid)->row()->option_value ?? '';
 
 		header('Content-Type: application/json');
 		echo json_encode($jsonout);
diff --git a/application/views/stationsetup/exportmapoptions.php b/application/views/stationsetup/exportmapoptions.php
index efce5c604..e462cb5aa 100644
--- a/application/views/stationsetup/exportmapoptions.php
+++ b/application/views/stationsetup/exportmapoptions.php
@@ -27,5 +27,17 @@
 			<td># QSOs shown</td>
 			<td><input class="form-control input-group-sm" type="number" id="qsocount" name="qsos" value="<?php echo ($exportmapoptions['qsocount']->option_value ?? 250); ?>"></td>
 		</tr>
+		<tr>
+			<td>Band</td>
+			<td><select id="band" class="form-select form-select-sm my-1 me-sm-2 w-auto" name="band">
+				<option value="">All</option>
+				<?php foreach ($bands as $band) {
+						echo '<option value="' . $band . '"';
+						if ($band == ($exportmapoptions['band']->option_value ?? '')) echo ' selected';
+						echo '>' . $band . '</option>' . "\n";
+				}
+				?>
+			</select></td>
+		</tr>
 	</tbody>
 </table>
diff --git a/assets/js/sections/stationsetup.js b/assets/js/sections/stationsetup.js
index 73d550037..f2e787c39 100644
--- a/assets/js/sections/stationsetup.js
+++ b/assets/js/sections/stationsetup.js
@@ -189,6 +189,7 @@ $(document).ready(function () {
 				cqzone_layer: $('input[name="cqzone_layer"]').is(':checked') ? true : false,
 				nightshadow_layer: $('input[name="nightshadow_layer"]').is(':checked') ? true : false,
 				qsocount: $('#qsocount').val(),
+				band: $('#band').val(),
 				id: $('#logbookid').val(),
 			},
 			success: function(data) {