From b5ed396988752637def759c3ed2584a7070115b5 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Fri, 17 Nov 2023 13:21:31 +0100
Subject: [PATCH 1/2] Add link to FG8OJ sked tool to hams.at listing

---
 application/controllers/Components.php        |  4 +++-
 application/views/components/hamsat/table.php | 10 ++++++++++
 application/views/hamsat/index.php            |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/application/controllers/Components.php b/application/controllers/Components.php
index 942dcbc3..7fc0e27a 100644
--- a/application/controllers/Components.php
+++ b/application/controllers/Components.php
@@ -14,11 +14,13 @@ class Components extends CI_Controller {
 	}
 
     public function index() {
+        $this->load->model('stations');
         $url = 'https://oscarwatch.org/scripts/hamsat_json.php';
         $json = file_get_contents($url);
         $data['rovedata'] = json_decode($json, true);
+        $data['gridsquare'] = strtoupper($this->stations->find_gridsquare());
         
         // load view
         $this->load->view('components/hamsat/table', $data);
     }
-}
\ No newline at end of file
+}
diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php
index e218916f..0792824d 100644
--- a/application/views/components/hamsat/table.php
+++ b/application/views/components/hamsat/table.php
@@ -17,6 +17,7 @@
                 <th>Satellite</th>
                 <th>Gridsquare(s)</th>
                 <th></th>
+                <th></th>
             </tr>
         </thead>
         <tbody>
@@ -92,6 +93,15 @@
 
                     </td>
                     <td><a href="<?php echo $rove['track_link']; ?>" target="_blank">Track</a></td>
+                    <?php
+                        $sat = $rove['satellite'];
+                        switch (strtoupper($rove['satellite'])) {
+                        case "GREENCUBE":
+                           $sat = 'IO-117';
+                           break;
+                        }
+                    ?>
+                    <td><a href="https://sat.fg8oj.com/sked.php?s%5B%5D=<?php echo $sat; ?>&l=<?php echo strtoupper($gridsquare); ?>&el1=0&l2=<?php echo $rove['gridsquare']; ?>&el2=0&duration=1&start=0&OK=Search" target="_blank">Sked</a></td>
                 </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/application/views/hamsat/index.php b/application/views/hamsat/index.php
index aba617d2..f5f033f2 100644
--- a/application/views/hamsat/index.php
+++ b/application/views/hamsat/index.php
@@ -1,3 +1,3 @@
 <div class="container">
     <div id="hamsat_display" hx-get="<?php echo site_url('components'); ?>" hx-trigger="load, every 60s"></div>
-</div>
\ No newline at end of file
+</div>

From a71f13d9dc1f59cf7de36bbdec152c4174b280f1 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Fri, 17 Nov 2023 13:19:55 +0000
Subject: [PATCH 2/2] Removed CSS variable as it made required fields red
 whether they had been inputted or not

---
 assets/css/general.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/assets/css/general.css b/assets/css/general.css
index 0118e5cf..fbf81e99 100644
--- a/assets/css/general.css
+++ b/assets/css/general.css
@@ -552,10 +552,6 @@ div#station_logbooks_linked_table_paginate {
     margin-right: 30px; 
 }
 
-input:invalid {
-    border-color: red;
-}
-
 .sfletable{
     height: 470px;
   }