From 0015d4a1cf85c81047044f559bd92e3ecd2d53c7 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Thu, 29 Jul 2021 12:05:52 +0200
Subject: [PATCH 1/7] [DX Atlas Gridsquare Export] Initial work begun for
 export

---
 application/controllers/Dxatlas.php           | 104 +++++++++++++++
 application/views/dxatlas/index.php           | 119 ++++++++++++++++++
 application/views/interface_assets/header.php |   2 +
 3 files changed, 225 insertions(+)
 create mode 100644 application/controllers/Dxatlas.php
 create mode 100644 application/views/dxatlas/index.php

diff --git a/application/controllers/Dxatlas.php b/application/controllers/Dxatlas.php
new file mode 100644
index 00000000..ac8c46ff
--- /dev/null
+++ b/application/controllers/Dxatlas.php
@@ -0,0 +1,104 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Dxatlas extends CI_Controller {
+
+	public function index()
+	{
+		$this->load->model('user_model');
+		$this->load->model('modes');
+		$this->load->model('dxcc');
+		$this->load->model('logbook_model');
+
+		if(!$this->user_model->authorize(99)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
+
+		$data['worked_bands'] = $this->dxcc->get_worked_bands(); // Used in the view for band select
+		$data['modes'] = $this->modes->active(); // Used in the view for mode select
+		$data['dxcc'] = $this->logbook_model->fetchDxcc(); // Used in the view for dxcc select
+
+		$data['page_title'] = "DX Atlas Gridsquare Export";
+
+		$this->load->view('interface_assets/header', $data);
+		$this->load->view('dxatlas/index');
+		$this->load->view('interface_assets/footer');
+
+	}
+
+	public function export()
+	{
+		// Load Librarys
+		$this->load->library('qra');
+		$this->load->helper('file');
+
+		// Load Database connections
+		$this->load->model('logbook_model');
+
+		// Parameters
+		$band = $this->input->post('band');
+		$mode = $this->input->post('mode');
+		$dxcc = $this->input->post('dxcc_id');
+		$cqz = $this->input->post('cqz');
+		$propagation = $this->input->post('prop_mode');
+		$fromdate = $this->input->post('fromdate');
+		$todate = $this->input->post('todate');
+
+		// Get QSOs with Valid QRAs
+		$qsos = $this->logbook_model->kml_get_all_qsos($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
+
+		$output = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
+		$output .= "<kml xmlns=\"http://www.opengis.net/kml/2.2\">";
+
+		$output .= "<Document>";
+
+		foreach ($qsos->result() as $row)
+		{
+			$output .= "<Placemark>";
+
+			if($row->COL_GRIDSQUARE != null) {
+				$stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE);
+
+				$lat = $stn_loc[0];
+				$lng = $stn_loc[1];
+			} else {
+				$query = $this->db->query('
+					SELECT *
+					FROM dxcc_entities
+					WHERE prefix = SUBSTRING( \''.$row->COL_CALL.'\', 1, LENGTH( prefix ) )
+					ORDER BY LENGTH( prefix ) DESC
+					LIMIT 1
+				');
+
+				foreach ($query->result() as $dxcc) {
+					$lat = $dxcc->lat;
+					$lng = $dxcc->long;
+				}
+			}
+
+			$timestamp = strtotime($row->COL_TIME_ON);
+
+			$output .= "<name>".$row->COL_CALL."</name>";
+			$output .= "<description><![CDATA[<p>Date/Time: ".date('Y-m-d H:i:s', ($timestamp))."<br/>Band: ".$row->COL_BAND."<br /></p>]]></description>";
+			$output .= "<Point>";
+			$output .= "<coordinates>".$lng.",".$lat.",0</coordinates>";
+			$output .= "</Point>";
+			$output .= "</Placemark>";
+		}
+
+		$output .= "</Document>";
+		$output .= "</kml>";
+
+		if (!file_exists('kml')) {
+			mkdir('kml', 0755, true);
+		}
+
+		if ( ! write_file('kml/qsos.kml', $output))
+		{
+			echo 'Unable to write the file. Make sure the folder KML has write permissions.';
+		}
+		else
+		{
+			header("Content-Disposition: attachment; filename=\"qsos.kml\"");
+			echo $output;
+		}
+
+	}
+}
diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php
new file mode 100644
index 00000000..7e7f3521
--- /dev/null
+++ b/application/views/dxatlas/index.php
@@ -0,0 +1,119 @@
+<div class="container">
+	<br>
+	<h2><?php echo $page_title; ?></h2>
+
+	<div class="card">
+		<div class="card-header">
+			Export your logbook for use in DX Atlas to display worked / confirmed gridsquares.
+		</div>
+
+		<div class="alert alert-warning" role="alert">
+			Only QSOs with a gridsquare defined will be exported!
+		</div>
+
+		<div class="card-body">
+
+			<form class="form" action="<?php echo site_url('dxatlas/export'); ?>" method="post" enctype="multipart/form-data">
+
+				<div class="form-group">
+					<label for="band">Band</label>
+					<select id="band" name="band" class="custom-select">
+						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
+						<?php foreach($worked_bands as $band) {
+							echo '<option value="' . $band . '"';
+							if ($this->input->post('band') == $band) echo ' selected';
+							echo '>' . $band . '</option>'."\n";
+						} ?>
+					</select>
+				</div>
+
+				<div class="form-group">
+					<label for="dxcc_id">DXCC</label>
+					<select class="custom-select" id="dxcc_id" name="dxcc_id">
+						<option value="All">All</option>
+						<?php
+						foreach($dxcc as $d){
+							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
+						}
+						?>
+
+					</select>
+				</div>
+
+				<div class="form-group">
+					<label for="mode">Mode</label>
+					<select id="mode" name="mode" class="form-control custom-select">
+						<option value="All">All</option>
+						<?php
+						foreach($modes->result() as $mode){
+							if ($mode->submode == null) {
+								echo '<option value="' . $mode->mode . '">'. $mode->mode . '</option>'."\n";
+							} else {
+								echo '<option value="' . $mode->submode . '">' . $mode->submode . '</option>'."\n";
+							}
+						}
+						?>
+					</select>
+				</div>
+
+				<div class="form-group">
+					<label for="cqz">CQ Zone</label>
+					<select class="custom-select" id="cqz" name="cqz">
+						<option value="All">All</option>
+						<?php
+						for ($i = 1; $i<=40; $i++) {
+							echo '<option value="'. $i . '">'. $i .'</option>';
+						}
+						?>
+					</select>
+				</div>
+
+				<div class="form-group">
+					<label for="selectPropagation">Propagation Mode</label>
+					<select class="custom-select" id="selectPropagation" name="prop_mode">
+						<option value="All">All</option>
+						<option value="AUR">Aurora</option>
+						<option value="AUE">Aurora-E</option>
+						<option value="BS">Back scatter</option>
+						<option value="ECH">EchoLink</option>
+						<option value="EME">Earth-Moon-Earth</option>
+						<option value="ES">Sporadic E</option>
+						<option value="FAI">Field Aligned Irregularities</option>
+						<option value="F2">F2 Reflection</option>
+						<option value="INTERNET">Internet-assisted</option>
+						<option value="ION">Ionoscatter</option>
+						<option value="IRL">IRLP</option>
+						<option value="MS">Meteor scatter</option>
+						<option value="RPT">Terrestrial or atmospheric repeater or transponder</option>
+						<option value="RS">Rain scatter</option>
+						<option value="SAT">Satellite</option>
+						<option value="TEP">Trans-equatorial</option>
+						<option value="TR">Tropospheric ducting</option>
+					</select>
+				</div>
+
+				<p class="card-text">From date:</p>
+				<div class="row">
+					<div class="input-group date col-md-3" id="datetimepicker1" data-target-input="nearest">
+						<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
+						<div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
+							<div class="input-group-text"><i class="fa fa-calendar"></i></div>
+						</div>
+					</div>
+				</div>
+
+				<p class="card-text">To date:</p>
+				<div class="row">
+					<div class="input-group date col-md-3" id="datetimepicker2" data-target-input="nearest">
+						<input name="todate" "totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
+						<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
+							<div class="input-group-text"><i class="fa fa-calendar"></i></div>
+						</div>
+					</div>
+				</div>
+				<br>
+				<button type="submit" class="btn btn-primary mb-2" value="Export">Export</button>
+			</form>
+		</div>
+	</div>
+</div>
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index 088d02da..aa264458 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -195,6 +195,8 @@
 
 				<a class="dropdown-item" href="<?php echo site_url('kml');?>" title="KML Export for Google Earth"><i class="fas fa-sync"></i> KML Export</a>
 
+				<a class="dropdown-item" href="<?php echo site_url('dxatlas');?>" title="DX Atlas Gridsquare Export"><i class="fas fa-sync"></i> DX Atlas Gridsquare Export</a>
+
 				<div class="dropdown-divider"></div>
 
 				<a class="dropdown-item" href="<?php echo site_url('lotw');?>" title="Synchronise with Logbook of the World (LotW)"><i class="fas fa-sync"></i> Logbook of the World</a>

From 2f0cf971c5e9309526ab368eeb05401c067c4fce Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Mon, 30 Aug 2021 18:28:20 +0200
Subject: [PATCH 2/7] [DX Atlas Gridsquare Export] Tweaking of the view.
 Activated datepicker.

---
 application/views/dxatlas/index.php           | 72 ++++++++++---------
 application/views/interface_assets/footer.php | 18 +++++
 assets/css/general.css                        | 10 ++-
 3 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php
index 7e7f3521..16a91189 100644
--- a/application/views/dxatlas/index.php
+++ b/application/views/dxatlas/index.php
@@ -14,8 +14,8 @@
 		<div class="card-body">
 
 			<form class="form" action="<?php echo site_url('dxatlas/export'); ?>" method="post" enctype="multipart/form-data">
-
-				<div class="form-group">
+				<div class="form-row">
+				<div class="form-group col-md-3">
 					<label for="band">Band</label>
 					<select id="band" name="band" class="custom-select">
 						<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >Every band</option>
@@ -26,8 +26,23 @@
 						} ?>
 					</select>
 				</div>
+					<div class="form-group col-md-3">
+						<label for="mode">Mode</label>
+						<select id="mode" name="mode" class="form-control custom-select">
+							<option value="All">All</option>
+							<?php
+							foreach($modes->result() as $mode){
+								if ($mode->submode == null) {
+									echo '<option value="' . $mode->mode . '">'. $mode->mode . '</option>'."\n";
+								} else {
+									echo '<option value="' . $mode->submode . '">' . $mode->submode . '</option>'."\n";
+								}
+							}
+							?>
+						</select>
+					</div>
 
-				<div class="form-group">
+				<div class="form-group col-md-4">
 					<label for="dxcc_id">DXCC</label>
 					<select class="custom-select" id="dxcc_id" name="dxcc_id">
 						<option value="All">All</option>
@@ -40,23 +55,12 @@
 					</select>
 				</div>
 
-				<div class="form-group">
-					<label for="mode">Mode</label>
-					<select id="mode" name="mode" class="form-control custom-select">
-						<option value="All">All</option>
-						<?php
-						foreach($modes->result() as $mode){
-							if ($mode->submode == null) {
-								echo '<option value="' . $mode->mode . '">'. $mode->mode . '</option>'."\n";
-							} else {
-								echo '<option value="' . $mode->submode . '">' . $mode->submode . '</option>'."\n";
-							}
-						}
-						?>
-					</select>
 				</div>
 
-				<div class="form-group">
+
+
+				<div class="form-row">
+					<div class="form-group col-md-3">
 					<label for="cqz">CQ Zone</label>
 					<select class="custom-select" id="cqz" name="cqz">
 						<option value="All">All</option>
@@ -68,7 +72,7 @@
 					</select>
 				</div>
 
-				<div class="form-group">
+				<div class="form-group col-md-5">
 					<label for="selectPropagation">Propagation Mode</label>
 					<select class="custom-select" id="selectPropagation" name="prop_mode">
 						<option value="All">All</option>
@@ -91,23 +95,25 @@
 						<option value="TR">Tropospheric ducting</option>
 					</select>
 				</div>
-
-				<p class="card-text">From date:</p>
-				<div class="row">
-					<div class="input-group date col-md-3" id="datetimepicker1" data-target-input="nearest">
-						<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
-						<div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
-							<div class="input-group-text"><i class="fa fa-calendar"></i></div>
+				</div>
+				<div class="form-row">
+					<div class="form-group col-md-3">
+						<label for="datetimepicker1">From date:</label>
+						<div class="dxatlasdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
+							<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker1"/>
+							<div class="input-group-append"  data-target="#datetimepicker1" data-toggle="datetimepicker">
+								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
+							</div>
 						</div>
 					</div>
-				</div>
 
-				<p class="card-text">To date:</p>
-				<div class="row">
-					<div class="input-group date col-md-3" id="datetimepicker2" data-target-input="nearest">
-						<input name="todate" "totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
-						<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
-							<div class="input-group-text"><i class="fa fa-calendar"></i></div>
+					<div class="form-group col-md-3">
+						<label for="datetimepicker2">To date:</label>
+						<div class="dxatlasdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
+							<input name="todate" "totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-target="#datetimepicker2"/>
+							<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
+								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
+							</div>
 						</div>
 					</div>
 				</div>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index c8195c33..cc8eca7a 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2025,6 +2025,24 @@ function deleteQsl(id) {
 	<script src="<?php echo base_url() ;?>assets/js/sections/contestingnames.js"></script>
 <?php } ?>
 
+<?php if ($this->uri->segment(1) == "dxatlas") { ?>
+	<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
+	<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/tempusdominus-bootstrap-4.min.js"></script>
+	<script>
+		$(function () {
+			$('#datetimepicker1').datetimepicker({
+				format: 'DD/MM/YYYY',
+			});
+		});
+
+		$(function () {
+			$('#datetimepicker2').datetimepicker({
+				format: 'DD/MM/YYYY',
+			});
+		});
+	</script>
+<?php } ?>
+
 <?php if ($this->uri->segment(1) == "qslprint") { ?>
 	<script>
 		function deleteFromQslQueue(id) {
diff --git a/assets/css/general.css b/assets/css/general.css
index 77f5e3a8..cb66b861 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -242,4 +242,12 @@ color: #ffffff;
         .was-map-dialog .modal-dialog {
             max-width: 73% !important;
         }
-    }
\ No newline at end of file
+    }
+
+/*
+ * Timepicker alignment
+ */
+.dxatlasdatepicker {
+	padding-right: 0;
+	padding-left: 0;
+}
\ No newline at end of file

From d397e35d825208711800db94a241a95d716e2569 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 4 Sep 2021 09:30:51 +0200
Subject: [PATCH 3/7] [DX Atlas Gridsquare Export] Added a model for the export

---
 application/controllers/Dxatlas.php  |  4 +--
 application/models/Dxatlas_model.php | 49 ++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 application/models/Dxatlas_model.php

diff --git a/application/controllers/Dxatlas.php b/application/controllers/Dxatlas.php
index ac8c46ff..07c997df 100644
--- a/application/controllers/Dxatlas.php
+++ b/application/controllers/Dxatlas.php
@@ -30,7 +30,7 @@ class Dxatlas extends CI_Controller {
 		$this->load->helper('file');
 
 		// Load Database connections
-		$this->load->model('logbook_model');
+		$this->load->model('dxatlas_model');
 
 		// Parameters
 		$band = $this->input->post('band');
@@ -42,7 +42,7 @@ class Dxatlas extends CI_Controller {
 		$todate = $this->input->post('todate');
 
 		// Get QSOs with Valid QRAs
-		$qsos = $this->logbook_model->kml_get_all_qsos($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
+		$qsos = $this->dxatlas_model->get_gridsquares($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
 
 		$output = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 		$output .= "<kml xmlns=\"http://www.opengis.net/kml/2.2\">";
diff --git a/application/models/Dxatlas_model.php b/application/models/Dxatlas_model.php
new file mode 100644
index 00000000..8764ebbb
--- /dev/null
+++ b/application/models/Dxatlas_model.php
@@ -0,0 +1,49 @@
+<?php
+
+class Dxatlas_model extends CI_Model
+{
+
+	public $bandslots = array("160m" => 0,
+		"80m" => 0,
+		"60m" => 0,
+		"40m" => 0,
+		"30m" => 0,
+		"20m" => 0,
+		"17m" => 0,
+		"15m" => 0,
+		"12m" => 0,
+		"10m" => 0,
+		"6m" => 0,
+		"4m" => 0,
+		"2m" => 0,
+		"70cm" => 0,
+		"23cm" => 0,
+		"13cm" => 0,
+		"9cm" => 0,
+		"6cm" => 0,
+		"3cm" => 0,
+		"1.25cm" => 0,
+		"SAT" => 0,
+	);
+
+	function __construct()
+	{
+		// Call the Model constructor
+		parent::__construct();
+	}
+
+	/*
+	 *  Fetches worked and confirmed gridsquare on each band and total
+	 */
+	function get_gridsquares($data) {
+		$gridArray = $this->fetchGrids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
+
+		if (isset($gridArray)) {
+			return $gridArray;
+		} else {
+			return 0;
+		}
+	}
+
+}
+?>

From 84fbcaffb48bcefb5676829ab40d3b79c8baf873 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 4 Sep 2021 20:26:51 +0200
Subject: [PATCH 4/7] [DX Atlas Gridsquare Export] Got file export working.

---
 application/controllers/Dxatlas.php  | 118 +++++++++++++----------
 application/models/Dxatlas_model.php | 139 ++++++++++++++++++++++++++-
 2 files changed, 205 insertions(+), 52 deletions(-)

diff --git a/application/controllers/Dxatlas.php b/application/controllers/Dxatlas.php
index 07c997df..4e4f11e1 100644
--- a/application/controllers/Dxatlas.php
+++ b/application/controllers/Dxatlas.php
@@ -11,9 +11,9 @@ class Dxatlas extends CI_Controller {
 
 		if(!$this->user_model->authorize(99)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
 
-		$data['worked_bands'] = $this->dxcc->get_worked_bands(); // Used in the view for band select
-		$data['modes'] = $this->modes->active(); // Used in the view for mode select
-		$data['dxcc'] = $this->logbook_model->fetchDxcc(); // Used in the view for dxcc select
+		$data['worked_bands'] = $this->dxcc->get_worked_bands(); 	// Used in the view for band select
+		$data['modes'] = $this->modes->active(); 					// Used in the view for mode select
+		$data['dxcc'] = $this->logbook_model->fetchDxcc(); 			// Used in the view for dxcc select
 
 		$data['page_title'] = "DX Atlas Gridsquare Export";
 
@@ -25,11 +25,6 @@ class Dxatlas extends CI_Controller {
 
 	public function export()
 	{
-		// Load Librarys
-		$this->load->library('qra');
-		$this->load->helper('file');
-
-		// Load Database connections
 		$this->load->model('dxatlas_model');
 
 		// Parameters
@@ -42,63 +37,84 @@ class Dxatlas extends CI_Controller {
 		$todate = $this->input->post('todate');
 
 		// Get QSOs with Valid QRAs
-		$qsos = $this->dxatlas_model->get_gridsquares($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
+		$grids = $this->dxatlas_model->get_gridsquares($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
 
-		$output = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
-		$output .= "<kml xmlns=\"http://www.opengis.net/kml/2.2\">";
+		$this->generateFiles($grids['worked'], $grids['confirmed'], $band);
+	}
 
-		$output .= "<Document>";
+	function generateFiles($wkdArray, $cfmArray, $band) {
 
-		foreach ($qsos->result() as $row)
-		{
-			$output .= "<Placemark>";
+		$gridCfmArray = [];
+		$gridWkdArray = [];
+		$fieldCfmArray = [];
+		$fieldWkdArray = [];
 
-			if($row->COL_GRIDSQUARE != null) {
-				$stn_loc = $this->qra->qra2latlong($row->COL_GRIDSQUARE);
+		foreach ($cfmArray as $grid) {
+			$field = substr($grid, 0, 2);
+			if (!in_array($field, $fieldCfmArray)) {
+				$fieldCfmArray[] = $field;
+			}
+			$gridCfmArray[] = $grid;
+		}
 
-				$lat = $stn_loc[0];
-				$lng = $stn_loc[1];
-			} else {
-				$query = $this->db->query('
-					SELECT *
-					FROM dxcc_entities
-					WHERE prefix = SUBSTRING( \''.$row->COL_CALL.'\', 1, LENGTH( prefix ) )
-					ORDER BY LENGTH( prefix ) DESC
-					LIMIT 1
-				');
 
-				foreach ($query->result() as $dxcc) {
-					$lat = $dxcc->lat;
-					$lng = $dxcc->long;
+		foreach ($wkdArray as $grid) {
+			$field = substr($grid, 0, 2);
+			if (!in_array($field, $fieldCfmArray)) {
+				if (!in_array($field, $fieldWkdArray)) {
+					$fieldWkdArray[] = $field;
 				}
 			}
-
-			$timestamp = strtotime($row->COL_TIME_ON);
-
-			$output .= "<name>".$row->COL_CALL."</name>";
-			$output .= "<description><![CDATA[<p>Date/Time: ".date('Y-m-d H:i:s', ($timestamp))."<br/>Band: ".$row->COL_BAND."<br /></p>]]></description>";
-			$output .= "<Point>";
-			$output .= "<coordinates>".$lng.",".$lat.",0</coordinates>";
-			$output .= "</Point>";
-			$output .= "</Placemark>";
+			if (!in_array($grid, $gridCfmArray)) {
+				$gridWkdArray[] = $grid;
+			}
 		}
 
-		$output .= "</Document>";
-		$output .= "</kml>";
+		$gridWkdString = '';
+		$gridCfmString = '';
 
-		if (!file_exists('kml')) {
-			mkdir('kml', 0755, true);
+		asort($gridWkdArray);
+		asort($gridCfmArray);
+		asort($fieldWkdArray);
+		asort($fieldCfmArray);
+
+		foreach ($fieldWkdArray as $fields) {
+			$gridWkdString .= $fields . "\r\n";
 		}
 
-		if ( ! write_file('kml/qsos.kml', $output))
-		{
-			echo 'Unable to write the file. Make sure the folder KML has write permissions.';
-		}
-		else
-		{
-			header("Content-Disposition: attachment; filename=\"qsos.kml\"");
-			echo $output;
+		foreach ($gridWkdArray as $grids) {
+			$gridWkdString .= $grids . "\r\n";
 		}
 
+		foreach ($fieldCfmArray as $fields) {
+			$gridCfmString .= $fields . "\r\n";
+		}
+
+		foreach ($gridCfmArray as $grids) {
+			$gridCfmString .= $grids . "\r\n";
+		}
+
+		$this->makeZip($gridWkdString, $gridCfmString, $band);
+	}
+
+	function makeZip($gridWkdString, $gridCfmString, $band) {
+		$zipFileName = $this->session->userdata('user_callsign') . '_'. $band . '.zip';
+		// Prepare File
+		$file = tempnam("tmp", "zip");
+		$zip = new ZipArchive();
+		$zip->open($file, ZipArchive::OVERWRITE);
+
+		// Stuff with content
+		$zip->addFromString($band . '_grids.wkd', $gridWkdString);
+		$zip->addFromString($band . '_grids.cfm', $gridCfmString);
+
+		// Close and send to users
+		$zip->close();
+		$length = filesize($file);
+		header('Content-Type: application/zip');
+		header('Content-Length: ' . $length);
+		header('Content-Disposition: attachment; filename="' . $zipFileName . '"');
+		readfile($file);
+		unlink($file);
 	}
 }
diff --git a/application/models/Dxatlas_model.php b/application/models/Dxatlas_model.php
index 8764ebbb..54b20157 100644
--- a/application/models/Dxatlas_model.php
+++ b/application/models/Dxatlas_model.php
@@ -35,7 +35,7 @@ class Dxatlas_model extends CI_Model
 	/*
 	 *  Fetches worked and confirmed gridsquare on each band and total
 	 */
-	function get_gridsquares($data) {
+	function get_gridsquares($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate) {
 		$gridArray = $this->fetchGrids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
 
 		if (isset($gridArray)) {
@@ -45,5 +45,142 @@ class Dxatlas_model extends CI_Model
 		}
 	}
 
+	/*
+	 * Builds the array to display worked/confirmed vucc on awward page
+	 */
+	function fetchGrids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate) {
+		// Getting all the worked grids
+		$col_gridsquare_worked = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'none');
+
+		$workedGridArray = array();
+		foreach ($col_gridsquare_worked as $workedgrid) {
+			array_push($workedGridArray, $workedgrid['gridsquare']);
+		}
+
+		$col_vucc_grids_worked = $this->get_grids_col_vucc($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'none');
+
+		foreach ($col_vucc_grids_worked as $gridSplit) {
+			$grids = explode(",", $gridSplit['col_vucc_grids']);
+			foreach($grids as $key) {
+				$grid_four = strtoupper(substr(trim($key),0,4));
+
+				if(!in_array($grid_four, $workedGridArray)){
+					array_push($workedGridArray, $grid_four);
+				}
+			}
+		}
+
+		// Getting all the confirmed grids
+		$col_gridsquare_confirmed = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'both');
+
+		$confirmedGridArray = array();
+		foreach ($col_gridsquare_confirmed as $confirmedgrid) {
+			array_push($confirmedGridArray, $confirmedgrid['gridsquare']);
+			if(in_array($confirmedgrid['gridsquare'], $workedGridArray)){
+				$index = array_search($confirmedgrid['gridsquare'],$workedGridArray);
+				unset($workedGridArray[$index]);
+			}
+		}
+
+		$col_vucc_grids_confirmed = $this->get_grids_col_vucc($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'both');
+
+		foreach ($col_vucc_grids_confirmed as $gridSplit) {
+			$grids = explode(",", $gridSplit['col_vucc_grids']);
+			foreach($grids as $key) {
+				$grid_four = strtoupper(substr(trim($key),0,4));
+
+				if(!in_array($grid_four, $confirmedGridArray)){
+					array_push($confirmedGridArray, $grid_four);
+				}
+				if(in_array($grid_four, $workedGridArray)){
+					$index = array_search($grid_four,$workedGridArray);
+					unset($workedGridArray[$index]);
+				}
+			}
+		}
+
+		$vuccArray['worked'] = $workedGridArray;
+		$vuccArray['confirmed'] = $confirmedGridArray;
+
+		return $vuccArray;
+	}
+
+	/*
+	 *  Gets the grid from col_vucc_grids
+	 * $band = the band chosen
+	 * $confirmationMethod - qsl, lotw or both, use anything else to skip confirmed
+	 */
+	function get_grids_col_vucc($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, $confirmationMethod) {
+		$station_id = $this->get_station_id();
+
+		$sql = "select col_vucc_grids
+            from " . $this->config->item('table_name') .
+			" where station_id =" . $station_id .
+			" and col_vucc_grids <> '' ";
+
+		if ($confirmationMethod == 'both') {
+			$sql .= " and (col_qsl_rcvd='Y' or col_lotw_qsl_rcvd='Y')";
+		}
+		else if ($confirmationMethod == 'qsl') {
+			$sql .= " and col_qsl_rcvd='Y'";
+		}
+		else if ($confirmationMethod == 'lotw') {
+			$sql .= " and col_lotw_qsl_rcvd='Y'";
+		}
+
+		if ($band != 'All') {
+			if ($band == 'SAT') {
+				$sql .= " and col_prop_mode ='" . $band . "'";
+			} else {
+				$sql .= " and col_prop_mode !='SAT'";
+				$sql .= " and col_band ='" . $band . "'";
+			}
+		}
+
+		$query = $this->db->query($sql);
+		return $query->result_array();
+	}
+
+	/*
+	 * Gets the grid from col_gridsquare
+	 * $band = the band chosen
+	 * $confirmationMethod - qsl, lotw or both, use anything else to skip confirmed
+	 */
+	function get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, $confirmationMethod) {
+		$station_id = $this->get_station_id();
+		$sql = "select distinct upper(substring(col_gridsquare, 1, 4)) gridsquare
+            from " . $this->config->item('table_name') .
+			" where station_id =" . $station_id .
+			" and col_gridsquare <> ''";
+
+		if ($confirmationMethod == 'both') {
+			$sql .= " and (col_qsl_rcvd='Y' or col_lotw_qsl_rcvd='Y')";
+		}
+		else if ($confirmationMethod == 'qsl') {
+			$sql .= " and col_qsl_rcvd='Y'";
+		}
+		else if ($confirmationMethod == 'lotw') {
+			$sql .= " and col_lotw_qsl_rcvd='Y'";
+		}
+
+		if ($band != 'All') {
+			if ($band == 'SAT') {
+				$sql .= " and col_prop_mode ='" . $band . "'";
+			} else {
+				$sql .= " and col_prop_mode !='SAT'";
+				$sql .= " and col_band ='" . $band . "'";
+			}
+		}
+
+		$query = $this->db->query($sql);
+
+		return $query->result_array();
+	}
+
+	function get_station_id() {
+		$CI =& get_instance();
+		$CI->load->model('Stations');
+		return $CI->Stations->find_active();
+	}
 }
 ?>

From 9c236a935cf710acde2d07512d44f2c4d3d0d234 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sun, 5 Sep 2021 09:24:36 +0200
Subject: [PATCH 5/7] [DX Atlas Gridsquare Export] Got the filters working.
 Cleaned up some code and added a few comments

---
 application/models/Dxatlas_model.php | 126 +++++++++++++--------------
 1 file changed, 59 insertions(+), 67 deletions(-)

diff --git a/application/models/Dxatlas_model.php b/application/models/Dxatlas_model.php
index 54b20157..3f53a93a 100644
--- a/application/models/Dxatlas_model.php
+++ b/application/models/Dxatlas_model.php
@@ -3,29 +3,6 @@
 class Dxatlas_model extends CI_Model
 {
 
-	public $bandslots = array("160m" => 0,
-		"80m" => 0,
-		"60m" => 0,
-		"40m" => 0,
-		"30m" => 0,
-		"20m" => 0,
-		"17m" => 0,
-		"15m" => 0,
-		"12m" => 0,
-		"10m" => 0,
-		"6m" => 0,
-		"4m" => 0,
-		"2m" => 0,
-		"70cm" => 0,
-		"23cm" => 0,
-		"13cm" => 0,
-		"9cm" => 0,
-		"6cm" => 0,
-		"3cm" => 0,
-		"1.25cm" => 0,
-		"SAT" => 0,
-	);
-
 	function __construct()
 	{
 		// Call the Model constructor
@@ -33,7 +10,7 @@ class Dxatlas_model extends CI_Model
 	}
 
 	/*
-	 *  Fetches worked and confirmed gridsquare on each band and total
+	 *  Fetches worked and confirmed gridsquare from the logbook
 	 */
 	function get_gridsquares($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate) {
 		$gridArray = $this->fetchGrids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
@@ -46,18 +23,19 @@ class Dxatlas_model extends CI_Model
 	}
 
 	/*
-	 * Builds the array to display worked/confirmed vucc on awward page
+	 * Builds the array for worked and confirmed gridsquares
 	 */
 	function fetchGrids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate) {
+
 		// Getting all the worked grids
-		$col_gridsquare_worked = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'none');
+		$col_gridsquare_worked = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'none', 'single');
 
 		$workedGridArray = array();
 		foreach ($col_gridsquare_worked as $workedgrid) {
 			array_push($workedGridArray, $workedgrid['gridsquare']);
 		}
 
-		$col_vucc_grids_worked = $this->get_grids_col_vucc($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'none');
+		$col_vucc_grids_worked = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'none', 'multi');
 
 		foreach ($col_vucc_grids_worked as $gridSplit) {
 			$grids = explode(",", $gridSplit['col_vucc_grids']);
@@ -71,7 +49,7 @@ class Dxatlas_model extends CI_Model
 		}
 
 		// Getting all the confirmed grids
-		$col_gridsquare_confirmed = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'both');
+		$col_gridsquare_confirmed = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'both', 'single');
 
 		$confirmedGridArray = array();
 		foreach ($col_gridsquare_confirmed as $confirmedgrid) {
@@ -82,7 +60,7 @@ class Dxatlas_model extends CI_Model
 			}
 		}
 
-		$col_vucc_grids_confirmed = $this->get_grids_col_vucc($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'both');
+		$col_vucc_grids_confirmed = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'both', 'multi');
 
 		foreach ($col_vucc_grids_confirmed as $gridSplit) {
 			$grids = explode(",", $gridSplit['col_vucc_grids']);
@@ -106,17 +84,38 @@ class Dxatlas_model extends CI_Model
 	}
 
 	/*
-	 *  Gets the grid from col_vucc_grids
-	 * $band = the band chosen
+	 * Gets the grids from the datbase
+	 *
+	 * Filters:
+	 *
+	 * $band = filter on band
+	 * $mode = filter on mode
+	 * $dxcc = filter on dxx
+	 * $cqz = filter on cq zone
+	 * $propagation = Filter on propagation
+	 * $fromdate = Date range from
+	 * $todate = Date range to
+	 * $column = Chooses if we fetch from col_gridsquare (only single grids) or col_vucc_grids (multisquares)
 	 * $confirmationMethod - qsl, lotw or both, use anything else to skip confirmed
+	 *
 	 */
-	function get_grids_col_vucc($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, $confirmationMethod) {
+	function get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, $confirmationMethod, $column) {
 		$station_id = $this->get_station_id();
 
-		$sql = "select col_vucc_grids
-            from " . $this->config->item('table_name') .
-			" where station_id =" . $station_id .
-			" and col_vucc_grids <> '' ";
+		$sql = "";
+
+		if ($column == 'single') {
+			$sql .= "select distinct upper(substring(col_gridsquare, 1, 4)) gridsquare
+				  from " . $this->config->item('table_name') .
+				" where station_id =" . $station_id .
+				" and col_gridsquare <> ''";
+		}
+		else if ($column == 'multi') {
+			$sql .= "select col_vucc_grids
+            	 from " . $this->config->item('table_name') .
+				" where station_id =" . $station_id .
+				" and col_vucc_grids <> '' ";
+		}
 
 		if ($confirmationMethod == 'both') {
 			$sql .= " and (col_qsl_rcvd='Y' or col_lotw_qsl_rcvd='Y')";
@@ -137,39 +136,32 @@ class Dxatlas_model extends CI_Model
 			}
 		}
 
-		$query = $this->db->query($sql);
-		return $query->result_array();
-	}
-
-	/*
-	 * Gets the grid from col_gridsquare
-	 * $band = the band chosen
-	 * $confirmationMethod - qsl, lotw or both, use anything else to skip confirmed
-	 */
-	function get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, $confirmationMethod) {
-		$station_id = $this->get_station_id();
-		$sql = "select distinct upper(substring(col_gridsquare, 1, 4)) gridsquare
-            from " . $this->config->item('table_name') .
-			" where station_id =" . $station_id .
-			" and col_gridsquare <> ''";
-
-		if ($confirmationMethod == 'both') {
-			$sql .= " and (col_qsl_rcvd='Y' or col_lotw_qsl_rcvd='Y')";
-		}
-		else if ($confirmationMethod == 'qsl') {
-			$sql .= " and col_qsl_rcvd='Y'";
-		}
-		else if ($confirmationMethod == 'lotw') {
-			$sql .= " and col_lotw_qsl_rcvd='Y'";
+		if ($mode != 'All') {
+			$sql .= " and (COL_MODE = '" . $mode . "' or COL_SUBMODE = '" . $mode . "')";
 		}
 
-		if ($band != 'All') {
-			if ($band == 'SAT') {
-				$sql .= " and col_prop_mode ='" . $band . "'";
-			} else {
-				$sql .= " and col_prop_mode !='SAT'";
-				$sql .= " and col_band ='" . $band . "'";
-			}
+		if ($dxcc != 'All') {
+			$sql .= " and COL_DXCC ='" . $dxcc . "'";
+		}
+
+		if ($cqz != 'All') {
+			$sql .= " and COL_CQZ ='" . $cqz . "'";
+		}
+
+		if ($propagation != 'All') {
+			$sql .= " and COL_PROP_MODE ='" . $propagation . "'";
+		}
+
+		// If date is set, we format the date and add it to the where-statement
+		if ($fromdate != "") {
+			$from = DateTime::createFromFormat('d/m/Y', $fromdate);
+			$from = $from->format('Y-m-d');
+			$sql .= " and date(COL_TIME_ON) >='" . $from . "'";
+		}
+		if ($todate != "") {
+			$to = DateTime::createFromFormat('d/m/Y', $todate);
+			$to = $to->format('Y-m-d');
+			$sql .= " and date(COL_TIME_ON) <='" . $to . "'";
 		}
 
 		$query = $this->db->query($sql);

From 54c494379893a680bbb62827a7c0b067188625cd Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sun, 5 Sep 2021 10:43:36 +0200
Subject: [PATCH 6/7] [DX Atlas Gridsquare Export] Added station location
 select.

---
 application/controllers/Dxatlas.php  | 32 ++++++++++++++------------
 application/models/Dxatlas_model.php | 34 ++++++++++++----------------
 application/views/dxatlas/index.php  | 12 ++++++++++
 3 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/application/controllers/Dxatlas.php b/application/controllers/Dxatlas.php
index 4e4f11e1..313f6f22 100644
--- a/application/controllers/Dxatlas.php
+++ b/application/controllers/Dxatlas.php
@@ -2,15 +2,17 @@
 
 class Dxatlas extends CI_Controller {
 
-	public function index()
-	{
+	public function index()	{
 		$this->load->model('user_model');
-		$this->load->model('modes');
-		$this->load->model('dxcc');
-		$this->load->model('logbook_model');
 
 		if(!$this->user_model->authorize(99)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
 
+		$this->load->model('modes');
+		$this->load->model('dxcc');
+		$this->load->model('logbook_model');
+		$this->load->model('stations');
+
+		$data['station_profile'] = $this->stations->all();			// Used in the view for station location select
 		$data['worked_bands'] = $this->dxcc->get_worked_bands(); 	// Used in the view for band select
 		$data['modes'] = $this->modes->active(); 					// Used in the view for mode select
 		$data['dxcc'] = $this->logbook_model->fetchDxcc(); 			// Used in the view for dxcc select
@@ -23,21 +25,21 @@ class Dxatlas extends CI_Controller {
 
 	}
 
-	public function export()
-	{
+	public function export() {
 		$this->load->model('dxatlas_model');
 
 		// Parameters
-		$band = $this->input->post('band');
-		$mode = $this->input->post('mode');
-		$dxcc = $this->input->post('dxcc_id');
-		$cqz = $this->input->post('cqz');
-		$propagation = $this->input->post('prop_mode');
-		$fromdate = $this->input->post('fromdate');
-		$todate = $this->input->post('todate');
+		$station_id = $this->security->xss_clean($this->input->post('station_profile'));
+		$band = $this->security->xss_clean($this->input->post('band'));
+		$mode = $this->security->xss_clean($this->input->post('mode'));
+		$dxcc = $this->security->xss_clean($this->input->post('dxcc_id'));
+		$cqz = $this->security->xss_clean($this->input->post('cqz'));
+		$propagation = $this->security->xss_clean($this->input->post('prop_mode'));
+		$fromdate = $this->security->xss_clean($this->input->post('fromdate'));
+		$todate = $this->security->xss_clean($this->input->post('todate'));
 
 		// Get QSOs with Valid QRAs
-		$grids = $this->dxatlas_model->get_gridsquares($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
+		$grids = $this->dxatlas_model->get_gridsquares($station_id, $band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
 
 		$this->generateFiles($grids['worked'], $grids['confirmed'], $band);
 	}
diff --git a/application/models/Dxatlas_model.php b/application/models/Dxatlas_model.php
index 3f53a93a..154537d4 100644
--- a/application/models/Dxatlas_model.php
+++ b/application/models/Dxatlas_model.php
@@ -12,8 +12,8 @@ class Dxatlas_model extends CI_Model
 	/*
 	 *  Fetches worked and confirmed gridsquare from the logbook
 	 */
-	function get_gridsquares($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate) {
-		$gridArray = $this->fetchGrids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
+	function get_gridsquares($station_id, $band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate) {
+		$gridArray = $this->fetchGrids($station_id, $band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate);
 
 		if (isset($gridArray)) {
 			return $gridArray;
@@ -25,17 +25,17 @@ class Dxatlas_model extends CI_Model
 	/*
 	 * Builds the array for worked and confirmed gridsquares
 	 */
-	function fetchGrids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate) {
+	function fetchGrids($station_id, $band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate) {
 
 		// Getting all the worked grids
-		$col_gridsquare_worked = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'none', 'single');
+		$col_gridsquare_worked = $this->get_grids($station_id, $band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'none', 'single');
 
 		$workedGridArray = array();
 		foreach ($col_gridsquare_worked as $workedgrid) {
 			array_push($workedGridArray, $workedgrid['gridsquare']);
 		}
 
-		$col_vucc_grids_worked = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'none', 'multi');
+		$col_vucc_grids_worked = $this->get_grids($station_id, $band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'none', 'multi');
 
 		foreach ($col_vucc_grids_worked as $gridSplit) {
 			$grids = explode(",", $gridSplit['col_vucc_grids']);
@@ -49,7 +49,7 @@ class Dxatlas_model extends CI_Model
 		}
 
 		// Getting all the confirmed grids
-		$col_gridsquare_confirmed = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'both', 'single');
+		$col_gridsquare_confirmed = $this->get_grids($station_id, $band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'both', 'single');
 
 		$confirmedGridArray = array();
 		foreach ($col_gridsquare_confirmed as $confirmedgrid) {
@@ -60,7 +60,7 @@ class Dxatlas_model extends CI_Model
 			}
 		}
 
-		$col_vucc_grids_confirmed = $this->get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'both', 'multi');
+		$col_vucc_grids_confirmed = $this->get_grids($station_id, $band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, 'both', 'multi');
 
 		foreach ($col_vucc_grids_confirmed as $gridSplit) {
 			$grids = explode(",", $gridSplit['col_vucc_grids']);
@@ -99,22 +99,22 @@ class Dxatlas_model extends CI_Model
 	 * $confirmationMethod - qsl, lotw or both, use anything else to skip confirmed
 	 *
 	 */
-	function get_grids($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, $confirmationMethod, $column) {
-		$station_id = $this->get_station_id();
-
+	function get_grids($station_id, $band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate, $confirmationMethod, $column) {
 		$sql = "";
 
 		if ($column == 'single') {
 			$sql .= "select distinct upper(substring(col_gridsquare, 1, 4)) gridsquare
 				  from " . $this->config->item('table_name') .
-				" where station_id =" . $station_id .
-				" and col_gridsquare <> ''";
+				" where col_gridsquare <> ''";
 		}
 		else if ($column == 'multi') {
 			$sql .= "select col_vucc_grids
             	 from " . $this->config->item('table_name') .
-				" where station_id =" . $station_id .
-				" and col_vucc_grids <> '' ";
+				" where col_vucc_grids <> '' ";
+		}
+
+		if ($station_id != "All") {
+			$sql .= ' and station_id = ' . $station_id;
 		}
 
 		if ($confirmationMethod == 'both') {
@@ -168,11 +168,5 @@ class Dxatlas_model extends CI_Model
 
 		return $query->result_array();
 	}
-
-	function get_station_id() {
-		$CI =& get_instance();
-		$CI->load->model('Stations');
-		return $CI->Stations->find_active();
-	}
 }
 ?>
diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php
index 16a91189..7d7cad24 100644
--- a/application/views/dxatlas/index.php
+++ b/application/views/dxatlas/index.php
@@ -14,6 +14,18 @@
 		<div class="card-body">
 
 			<form class="form" action="<?php echo site_url('dxatlas/export'); ?>" method="post" enctype="multipart/form-data">
+				<div class="form-row">
+					<div class="form-group col-md-3">
+						<label for="station_profile"><?php echo $this->lang->line('cloudlog_station_profile'); ?></label>
+						<select name="station_profile" class="station_id custom-select">
+							<option value="All">All</option>
+							<?php foreach ($station_profile->result() as $station) { ?>
+								<option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
+							<?php } ?>
+						</select>
+					</div>
+				</div>
+
 				<div class="form-row">
 				<div class="form-group col-md-3">
 					<label for="band">Band</label>

From 16b3d89ffe9aa5cf7d939e63c28bf0e2964e0639 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sun, 5 Sep 2021 14:56:30 +0200
Subject: [PATCH 7/7] [DX Atlas Gridsquare Export] Changed filename for export.

---
 application/controllers/Dxatlas.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Dxatlas.php b/application/controllers/Dxatlas.php
index 313f6f22..a749b257 100644
--- a/application/controllers/Dxatlas.php
+++ b/application/controllers/Dxatlas.php
@@ -25,7 +25,7 @@ class Dxatlas extends CI_Controller {
 
 	}
 
-	public function export() {
+	public function export()  {
 		$this->load->model('dxatlas_model');
 
 		// Parameters
@@ -100,7 +100,7 @@ class Dxatlas extends CI_Controller {
 	}
 
 	function makeZip($gridWkdString, $gridCfmString, $band) {
-		$zipFileName = $this->session->userdata('user_callsign') . '_'. $band . '.zip';
+		$zipFileName = 'dxatlas_gridsquares_'. $band . '.zip';
 		// Prepare File
 		$file = tempnam("tmp", "zip");
 		$zip = new ZipArchive();