Merge remote-tracking branch 'upstream/dev' into bootstrap_5

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);
     }
-}
+}

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>

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>
+</div>

assets/css/general.css

@@ -567,9 +567,9 @@ div#station_logbooks_linked_table_paginate {
 	margin-right: 30px;
 }
 
-.sfletable {
+.sfletable{
-	height: 470px;
+    height: 470px;
-}
+  }
 
 .sfletable table {
 	width: 100%;