Merge pull request #367 from phl0/eqslPropMode

Show prop mode in eQSL pages
This commit is contained in:
Florian (DF2ET)
2024-05-18 07:54:32 +02:00
committed by GitHub
3 changed files with 7 additions and 1 deletions

View File

@@ -44,7 +44,7 @@ class Eqsl_images extends CI_Model {
function eqsl_qso_list() {
$this->load->model('logbooks_model');
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->select('COL_PRIMARY_KEY, qso_id, COL_CALL, COL_MODE, , COL_SUBMODE, COL_TIME_ON, COL_BAND, COL_SAT_NAME, COL_EQSL_QSLRDATE, image_file');
$this->db->select('COL_PRIMARY_KEY, qso_id, COL_CALL, COL_MODE, , COL_SUBMODE, COL_TIME_ON, COL_BAND, COL_PROP_MODE, COL_SAT_NAME, COL_EQSL_QSLRDATE, image_file');
$this->db->join($this->config->item('table_name'), 'qso_id = COL_PRIMARY_KEY', 'left outer');
$this->db->join('station_profile', $this->config->item('table_name').'.station_id = station_profile.station_id', 'left outer');
$this->db->where_in('station_profile.station_id', $logbooks_locations_array);

View File

@@ -37,6 +37,7 @@
<th>Mode</th>
<th>Submode</th>
<th>Band</th>
<th>Propagation Mode</th>
<th>Action</th>
</tr></thead><tbody>
<?php
@@ -53,6 +54,7 @@ foreach ($qslsnotdownloaded->result_array() as $qsl) {
echo "<td></td>";
}
echo "<td>".$qsl['COL_BAND']."</td>";
echo "<td>".$qsl['COL_PROP_MODE']."</td>";
echo "<td><a href=\"".site_url()."/eqsl/image/".$qsl['COL_PRIMARY_KEY']."\" data-fancybox=\"images\" data-width=\"528\" data-height=\"336\" class=\"btn btn-primary btn-sm\">View/Download</a></td>";
}
echo "</tr>";

View File

@@ -30,6 +30,7 @@
<th style=\'text-align: center\'>'.$this->lang->line('general_word_date').'</th>
<th style=\'text-align: center\'>'.$this->lang->line('general_word_time').'</th>
<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_band').'</th>
<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_propagation_mode').'</th>
<th style=\'text-align: center\'>'.$this->lang->line('gen_hamradio_qsl').' '.$this->lang->line('general_word_date').'</th>
<th style=\'text-align: center\'></th>
</tr>
@@ -51,6 +52,9 @@
if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); };
echo '</td>';
echo '<td style=\'text-align: center\'>';
if($qsl->COL_PROP_MODE != null) { echo $qsl->COL_PROP_MODE; };
echo '</td>';
echo '<td style=\'text-align: center\'>';
$timestamp = strtotime($qsl->COL_EQSL_QSLRDATE); echo date($custom_date_format, $timestamp);
echo '</td>';
echo '<td style=\'text-align: center\'><button onclick="viewEqsl(\''.$qsl->image_file.'\', \''. $qsl->COL_CALL . '\')" class="btn btn-sm btn-success">View</button></td>';