Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch empty grid and inform user to correct config

Browse Source
This commit is contained in:
phl0
2024-05-22 17:36:33 +02:00
parent ada8749065
commit 4bc0d2a707
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/controllers/Sattimers.php
View File

@@ -24,10 +24,22 @@ class Sattimers extends CI_Controller {
$this->cache->save('SatTimers'.strtoupper($this->stations->find_gridsquare()), $RawData, (60*1));
}
$json = $RawData;
$data['activations'] = json_decode($json, true)['data'];
$json = $RawData;
$response = json_decode($json, true);
if (array_key_exists('data', $response)) {
$data['activations'] = json_decode($json, true)['data'] ?? [];
} else if (array_key_exists('error', $response)) {
$this->session->set_flashdata('message', 'Error: '.$response['error']);
$data['activations'] = [];
} else {
$data['activations'] = [];
}
$data['gridsquare'] = strtoupper($this->stations->find_gridsquare());
if ($data['gridsquare'] == "0") {
$this->session->set_flashdata('message', lang('dashboard_locations_warning'));
}
$data['page_title'] = "Satellite Timers";

10
application/views/sattimers/index.php
View File

@@ -2,10 +2,18 @@
var custom_date_format = "<?php echo $custom_date_format ?>";
</script>
<div class="container">
<?php if ($this->session->flashdata('message')) { ?>
<!-- Display Message -->
<div class="alert alert-danger" role="alert">
<p><?php echo $this->session->flashdata('message'); ?></p>
</div>
<?php } ?>
<div class="table-responsive">
<br>
<h2>Satellite Timers</h2>
<p>This data is from <a target="_blank" href="https://www.df2et.de/tevel/">https://www.df2et.de/tevel/</a> calculated for current station location grid <?php echo strtoupper($gridsquare);?>.</p>
<?php if ($gridsquare != 0) { ?>
<p>This data is from <a target="_blank" href="https://www.df2et.de/tevel/">https://www.df2et.de/tevel/</a> calculated for current station location grid <?php echo strtoupper($gridsquare);?>.</p>
<?php } ?>
<script type="text/javascript">
let dateArray = [];
dateArray.push(0);