From 1e21493c93d795022c76be4357ef4559ce6a9441 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Tue, 28 May 2024 17:15:54 +0100
Subject: [PATCH] [Hamsat] when checking grid only use first 4 characters.

---
 application/models/Logbook_model.php          | 31 +++++++++++++++++++
 application/views/components/hamsat/table.php |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 40a81acf..f0a9cce3 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -2057,6 +2057,37 @@ class Logbook_model extends CI_Model
     return $query->num_rows();
   }
 
+  function check_if_grid_4char_worked_in_logbook($grid, $StationLocationsArray = null, $band = null)
+  {
+      if ($StationLocationsArray == null) {
+          $CI = &get_instance();
+          $CI->load->model('logbooks_model');
+          $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
+      } else {
+          $logbooks_locations_array = $StationLocationsArray;
+      }
+  
+      $this->db->select('COL_GRIDSQUARE');
+      $this->db->where_in('station_id', $logbooks_locations_array);
+      $this->db->group_start();
+      $this->db->like('SUBSTRING(COL_GRIDSQUARE, 1, 4)', substr($grid, 0, 4));
+      $this->db->or_like('SUBSTRING(COL_VUCC_GRIDS, 1, 4)', substr($grid, 0, 4));
+      $this->db->group_end();
+  
+      if ($band != null && $band != 'SAT') {
+          $this->db->where('COL_BAND', $band);
+      } else if ($band == 'SAT') {
+          // Where col_sat_name is not empty
+          $this->db->where('COL_SAT_NAME !=', '');
+      }
+      $this->db->limit('2');
+  
+      $query = $this->db->get($this->config->item('table_name'));
+  
+      return $query->num_rows();
+  }
+
+
   /* Get all QSOs with a valid grid for use in the KML export */
   function kml_get_all_qsos($band, $mode, $dxcc, $cqz, $propagation, $fromdate, $todate)
   {
diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php
index 8238d644..2efd23c2 100644
--- a/application/views/components/hamsat/table.php
+++ b/application/views/components/hamsat/table.php
@@ -106,7 +106,7 @@
                            <?php
                            // Load the logbook model and call check_if_grid_worked_in_logbook
                            foreach ($rove['grids'] as $grid) {
-                           $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($grid, null, "SAT");
+                           $worked = $CI->logbook_model->check_if_grid_4char_worked_in_logbook($grid, null, "SAT");
                               if ($worked != 0) {
                                   echo " <span data-bs-toggle=\"tooltip\" title=\"Worked\" class=\"badge bg-success\">" . $grid . "</span>";
                               } else {