From 88d7e2e132bef3fb0ba5a62eb07a1cc254827776 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Fri, 10 Sep 2021 11:44:05 +0200
Subject: [PATCH] [Timeplotter] Updated code to support station logbooks

---
 application/models/Timeplotter_model.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/application/models/Timeplotter_model.php b/application/models/Timeplotter_model.php
index ae3f4669..d15b8b13 100644
--- a/application/models/Timeplotter_model.php
+++ b/application/models/Timeplotter_model.php
@@ -10,12 +10,14 @@ class Timeplotter_model extends CI_Model
     }
 
     function get_worked_bands() {
-        $CI =& get_instance();
-        $CI->load->model('Stations');
-        $station_id = $CI->Stations->find_active();
+		$CI =& get_instance();
+		$CI->load->model('logbooks_model');
+		$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+
+		$location_list = "'".implode("','",$logbooks_locations_array)."'";
 
         $data = $this->db->query(
-            "SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `" . $this->config->item('table_name') . "` WHERE station_id = " . $station_id . " AND COL_PROP_MODE != \"SAT\""
+            "SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `" . $this->config->item('table_name') . "` WHERE station_id in (" . $location_list . ") AND COL_PROP_MODE != \"SAT\""
         );
         $worked_slots = array();
         foreach ($data->result() as $row) {
@@ -23,7 +25,7 @@ class Timeplotter_model extends CI_Model
         }
 
         $SAT_data = $this->db->query(
-            "SELECT distinct LOWER(`COL_PROP_MODE`) as `COL_PROP_MODE` FROM `" . $this->config->item('table_name') . "` WHERE station_id = " . $station_id . " AND COL_PROP_MODE = \"SAT\""
+            "SELECT distinct LOWER(`COL_PROP_MODE`) as `COL_PROP_MODE` FROM `" . $this->config->item('table_name') . "` WHERE station_id in (" . $location_list . ") AND COL_PROP_MODE = \"SAT\""
         );
 
         foreach ($SAT_data->result() as $row) {
@@ -64,9 +66,9 @@ class Timeplotter_model extends CI_Model
     );
 
     function getTimes($postdata) {
-        $CI =& get_instance();
-        $CI->load->model('Stations');
-        $station_id = $CI->Stations->find_active();
+		$CI =& get_instance();
+		$CI->load->model('logbooks_model');
+		$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 
         $this->db->select('time(col_time_on) time, col_call as callsign');
 
@@ -87,7 +89,7 @@ class Timeplotter_model extends CI_Model
             $this->db->where('col_cqz', $postdata['cqzone']);
         }
 
-        $this->db->where('station_id', $station_id);
+        $this->db->where_in('station_id', $logbooks_locations_array);
         $datearray = $this->db->get($this->config->item('table_name'));
         $this->plot($datearray->result_array());
     }
@@ -148,4 +150,4 @@ class Timeplotter_model extends CI_Model
         }
 
     }
-}
\ No newline at end of file
+}