From babb131beb079770c38e4a37dfa3a2483930705c Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Mon, 10 Mar 2025 15:24:38 +0000
Subject: [PATCH] Added Year to modal

---
 application/controllers/Statistics.php | 3 ++-
 application/models/Stats.php           | 6 +++++-
 assets/js/sections/statistics.js       | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Statistics.php b/application/controllers/Statistics.php
index fb5a87baf..6864d9670 100644
--- a/application/controllers/Statistics.php
+++ b/application/controllers/Statistics.php
@@ -299,7 +299,8 @@ class Statistics extends CI_Controller {
 
 		$sat = str_replace('"', "", $this->security->xss_clean($this->input->post("Sat")));
 		$mode = str_replace('"', "", $this->security->xss_clean($this->input->post("Mode")));
-		$data['results'] = $this->stats->sat_qsos($sat,$mode);
+		$year = $this->security->xss_clean($this->input->post("Year"));
+		$data['results'] = $this->stats->sat_qsos($sat,$year,$mode);
 
 		$data['page_title'] = __("Log View")." - " . __("Satellite QSOs");
 		$data['filter'] = $sat;
diff --git a/application/models/Stats.php b/application/models/Stats.php
index 801f502a3..81b79db58 100644
--- a/application/models/Stats.php
+++ b/application/models/Stats.php
@@ -894,7 +894,7 @@
 		return $result->result();
 	}
 
-	public function sat_qsos($sat,$mode) {
+	public function sat_qsos($sat,$year,$mode) {
 		$this->load->model('logbooks_model');
 		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 		$this->db->select('*, satellite.displayname AS sat_displayname');
@@ -908,6 +908,10 @@
 			$this->db->or_where('COL_SUBMODE', $mode);
 			$this->db->group_end();
 		}
+		if (($year ?? 'All') != 'All') {
+			$this->db->where('COL_TIME_ON >=',date($year.'-01-01 00:00:00'));
+			$this->db->where('COL_TIME_ON <=',date($year.'-12-31 23:59:59'));
+		}
 		$this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array);
 		$this->db->order_by("COL_TIME_ON desc, COL_PRIMARY_KEY desc");
 		$this->db->limit(500);
diff --git a/assets/js/sections/statistics.js b/assets/js/sections/statistics.js
index cd298b0b8..0d49c70bb 100644
--- a/assets/js/sections/statistics.js
+++ b/assets/js/sections/statistics.js
@@ -818,6 +818,7 @@ function displaySatQsos(sat,mode) {
 		var ajax_data = ({
 			'Sat': sat,
 			'Mode': mode,
+			'Year': $("#yr option:selected").val(),
 		})
 		modalloading=true;
 		$.ajax({