From ace99baecc1793427a17d51261665d569ae645b6 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Wed, 20 Sep 2023 13:54:14 +0200
Subject: [PATCH 1/2] Handle multigrids in hams.at display

---
 application/views/components/hamsat/table.php | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php
index 8753058d..3b6de4a3 100644
--- a/application/views/components/hamsat/table.php
+++ b/application/views/components/hamsat/table.php
@@ -8,7 +8,7 @@
                 <th>Date / Time</th>
                 <th>Callsign</th>
                 <th>Satellite</th>
-                <th>Gridsquare</th>
+                <th>Gridsquare(s)</th>
                 <th></th>
             </tr>
         </thead>
@@ -58,11 +58,23 @@
                         <?php
 
                         // Load the logbook model and call check_if_grid_worked_in_logbook
-                        $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($rove['gridsquare'], null, "SAT");
-                        if ($worked != 0) {
-                            echo " <span data-toggle=\"tooltip\" title=\"Worked\" class=\"badge badge-success\">" . $rove['gridsquare'] . "</span>";
+                        if (strpos($rove['gridsquare'], '/') !== false) {
+                           $grids = explode('/', $rove['gridsquare']);
+                           foreach ($grids as $grid) {
+                           $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($grid, null, "SAT");
+                              if ($worked != 0) {
+                                  echo " <span data-toggle=\"tooltip\" title=\"Worked\" class=\"badge badge-success\">" . $grid . "</span>";
+                              } else {
+                                  echo " <span data-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge badge-danger\">" . $grid . "</span>";
+                              }
+                           }
                         } else {
-                            echo " <span data-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge badge-danger\">" . $rove['gridsquare'] . "</span>";
+                           $worked = $CI->logbook_model->check_if_grid_worked_in_logbook($rove['gridsquare'], null, "SAT");
+                           if ($worked != 0) {
+                               echo " <span data-toggle=\"tooltip\" title=\"Worked\" class=\"badge badge-success\">" . $rove['gridsquare'] . "</span>";
+                           } else {
+                               echo " <span data-toggle=\"tooltip\" title=\"Not Worked\" class=\"badge badge-danger\">" . $rove['gridsquare'] . "</span>";
+                           }
                         }
                         ?>
 

From b3b8d1f6138b8ec0ef294ccee3fe08f1cfb7f50c Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Wed, 20 Sep 2023 14:00:07 +0200
Subject: [PATCH 2/2] Make table a little more readable

---
 application/views/components/hamsat/table.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php
index 3b6de4a3..ebda28b7 100644
--- a/application/views/components/hamsat/table.php
+++ b/application/views/components/hamsat/table.php
@@ -5,7 +5,8 @@
     <table class="table table-striped table-hover">
         <thead>
             <tr>
-                <th>Date / Time</th>
+                <th>Date</th>
+                <th>Time</th>
                 <th>Callsign</th>
                 <th>Satellite</th>
                 <th>Gridsquare(s)</th>
@@ -30,11 +31,12 @@
                         ?>
 
                         <?php $timestamp = strtotime($rove['date']);
-                        echo date($custom_date_format, $timestamp); ?>
-
-                        - <?php echo $rove['start_time']; ?> - <?php echo $rove['end_time']; ?>
+                           echo date($custom_date_format, $timestamp); ?>
 
                     </td>
+                    <td>
+                        <?php echo $rove['start_time']." - ".$rove['end_time']; ?>
+                    </td>
                     <td>
                         <?php
                         $CI = &get_instance();