kopia lustrzana https://github.com/magicbug/Cloudlog
Merge pull request #2505 from phl0/hamsAtMultiGrids
Handle multigrids in hams.at displaypull/2507/head
commit
490024cb98
|
@ -5,10 +5,11 @@
|
|||
<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</th>
|
||||
<th>Gridsquare(s)</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
@ -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();
|
||||
|
@ -58,11 +60,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>";
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue