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

show which radio was last updated

Browse Source
This commit is contained in:
github-actions
2024-08-06 00:04:59 +02:00
parent 0bb1f916fd
commit c6bd33d16a
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/Contesting.php
View File

@@ -23,6 +23,7 @@ class Contesting extends CI_Controller {
$data['my_gridsquare'] = $this->stations->find_gridsquare();
$data['radios'] = $this->cat->radios();
$data['radio_last_updated'] = $this->cat->last_updated()->row();
$data['modes'] = $this->modes->active();
$data['contestnames'] = $this->contesting_model->getActivecontests();
$data['bands'] = $this->bands->get_user_bands_for_qso_entry();

1
application/controllers/Qso.php
View File

@@ -23,6 +23,7 @@ class QSO extends CI_Controller {
$data['notice'] = false;
$data['stations'] = $this->stations->all_of_user();
$data['radios'] = $this->cat->radios();
$data['radio_last_updated'] = $this->cat->last_updated()->row();
$data['query'] = $this->logbook_model->last_custom('5');
$data['dxcc'] = $this->logbook_model->fetchDxcc();
$data['iota'] = $this->logbook_model->fetchIota();

8
application/controllers/Radio.php
View File

@@ -84,8 +84,10 @@ class Radio extends CI_Controller {
$phpdate = strtotime($row->timestamp);
echo "<td>" . date($custom_date_format . ' H:i:s', $phpdate) . "</td>";
if ($this->session->userdata('radio') !== '' && $this->session->userdata('radio') == $row->id) {
echo '<td><i>' . __("(last used)") . '</i></td>';
$last_updated = $this->cat->last_updated()->row()->id;
if ($last_updated == $row->id) {
echo '<td><i>' . __("last updated") . '</i></td>';
} else {
echo '<td></td>';
}
@@ -97,7 +99,7 @@ class Radio extends CI_Controller {
if ($defaul_user_radio !== $row->id) {
echo '<td><button id="default_radio_btn_' . $row->id . '" class="btn btn-sm btn-primary ld-ext-right" onclick="set_default_radio(' . $row->id . ')">' . __("Set as default radio") . '<div class="ld ld-ring ld-spin"></div></button</td>';
} else {
echo '<td><button id="default_radio_btn_' . $row->id . '" class="btn btn-sm btn-secondary ld-ext-right" onclick="release_default_radio(' . $row->id . ')">' . __("Release as default radio") . '<div class="ld ld-ring ld-spin"></div></button</td>';
echo '<td><button id="default_radio_btn_' . $row->id . '" class="btn btn-sm btn-secondary ld-ext-right" onclick="release_default_radio(' . $row->id . ')">' . __("Default (click to release)") . '<div class="ld ld-ring ld-spin"></div></button</td>';
}
}
echo "<td><a href=\"" . site_url('radio/delete') . "/" . $row->id . "\" class=\"btn btn-sm btn-danger\"> <i class=\"fas fa-trash-alt\"></i> " . __("Delete") . "</a></td>";

5
application/models/Cat.php
View File

@@ -109,6 +109,11 @@
return $this->db->query($sql);
}
function last_updated() {
$sql = 'SELECT * FROM cat WHERE user_id =' . $this->session->userdata('user_id') . ' ORDER BY timestamp DESC LIMIT 1';
return $this->db->query($sql);
}
function delete($id) {
$this->db->where('id', $id);
$this->db->where('user_id', $this->session->userdata('user_id'));

2
application/views/contesting/index.php
View File

@@ -93,7 +93,7 @@
<select class="form-select form-select-sm radios" id="radio" name="radio">
<option value="0" selected="selected"><?= __("None"); ?></option>
<?php foreach ($radios->result() as $row) { ?>
<option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
<option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?> <?php if ($radio_last_updated->id == $row->id) { echo "<i>(".__("last updated").")</i>"; } else { echo ''; } ?></option>
<?php } ?>
</select>
</div>

2
application/views/qso/index.php
View File

@@ -313,7 +313,7 @@
<select class="form-select radios" id="radio" name="radio">
<option value="0" selected="selected"><?= __("None"); ?></option>
<?php foreach ($radios->result() as $row) { ?>
<option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?></option>
<option value="<?php echo $row->id; ?>" <?php if($this->session->userdata('radio') == $row->id) { echo "selected=\"selected\""; } ?>><?php echo $row->radio; ?> <?php if ($radio_last_updated->id == $row->id) { echo "<i>(".__("last updated").")</i>"; } else { echo ''; } ?></option>
<?php } ?>
</select>
</div>