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

Use contest name in QSO view as well (as does LBA)

Browse Source
This commit is contained in:
phl0
2025-03-03 07:46:00 +01:00
parent 2c9ed1c895
commit 837524d56b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/models/Logbook_model.php
View File

@@ -2084,7 +2084,7 @@ class Logbook_model extends CI_Model {
function get_qso($id, $trusted = false) {
if ($trusted || ($this->check_qso_is_accessible($id))) {
$this->db->select($this->config->item('table_name') . '.*, station_profile.*, dxcc_entities.*, coalesce(dxcc_entities_2.name, "- NONE -") as station_country, dxcc_entities_2.end as station_end, eQSL_images.image_file as eqsl_image_file, lotw_users.callsign as lotwuser, lotw_users.lastupload, primary_subdivisions.subdivision, satellite.displayname AS sat_displayname');
$this->db->select($this->config->item('table_name') . '.*, station_profile.*, dxcc_entities.*, coalesce(dxcc_entities_2.name, "- NONE -") as station_country, dxcc_entities_2.end as station_end, eQSL_images.image_file as eqsl_image_file, lotw_users.callsign as lotwuser, lotw_users.lastupload, primary_subdivisions.subdivision, satellite.displayname AS sat_displayname, contest.name AS contestname');
$this->db->from($this->config->item('table_name'));
$this->db->join('dxcc_entities', $this->config->item('table_name') . '.col_dxcc = dxcc_entities.adif', 'left');
$this->db->join('station_profile', 'station_profile.station_id = ' . $this->config->item('table_name') . '.station_id', 'left');
@@ -2093,6 +2093,7 @@ class Logbook_model extends CI_Model {
$this->db->join('lotw_users', $this->config->item('table_name') . '.COL_CALL = lotw_users.callsign', 'left outer');
$this->db->join('primary_subdivisions', $this->config->item('table_name') . '.COL_DXCC = primary_subdivisions.adif AND ' . $this->config->item('table_name') . '.COL_STATE = primary_subdivisions.state', 'left outer');
$this->db->join('satellite', $this->config->item('table_name') . '.COL_SAT_NAME = satellite.name', 'left outer');
$this->db->join('contest', $this->config->item('table_name') . '.COL_CONTEST_ID = contest.adifname', 'left outer');
$this->db->where('COL_PRIMARY_KEY', $id);
$this->db->limit(1);

4
application/views/view_log/qso.php
View File

@@ -370,10 +370,10 @@
</tr>
<?php } ?>
<?php if($row->COL_CONTEST_ID != null) { ?>
<?php if($row->contestname != null) { ?>
<tr>
<td><?= __("Contest Name"); ?></td>
<td><?php echo $row->COL_CONTEST_ID; ?></td>
<td><?php echo $row->contestname; ?></td>
</tr>
<?php } ?>