Add eQSL to QSO display
这个提交包含在:
父节点
322085d2f6
当前提交
162a47a19f
共有 4 个文件被更改,包括 23 次插入 和 2 次删除
|
|
@ -48,6 +48,7 @@ $lang['general_word_qslcard_bureau'] = 'Bureau';
|
|||
$lang['general_word_qslcard_electronic'] = 'Electronic';
|
||||
$lang['general_word_qslcard_manager'] = 'Manager';
|
||||
$lang['general_word_qslcard_via'] = 'Via';
|
||||
$lang['general_word_eqslcard'] = 'eQSL Card';
|
||||
$lang['general_word_eqslcards'] = 'eQSL Cards';
|
||||
$lang['general_word_lotw'] = 'Logbook of the World';
|
||||
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ $lang['general_word_qslcard_direct'] = 'Direkt';
|
|||
$lang['general_word_qslcard_bureau'] = 'Büro';
|
||||
$lang['general_word_qslcard_electronic'] = 'Elektronisch';
|
||||
$lang['general_word_qslcard_via'] = 'Via';
|
||||
$lang['general_word_eqslcard'] = 'eQSL Karte';
|
||||
$lang['general_word_eqslcards'] = 'eQSL Karten';
|
||||
$lang['general_word_lotw'] = 'Logbook of the World';
|
||||
|
||||
|
|
|
|||
|
|
@ -1296,11 +1296,12 @@ class Logbook_model extends CI_Model {
|
|||
|
||||
function get_qso($id) {
|
||||
$this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.*, dxcc_entities_2.name as station_country, dxcc_entities_2.end as station_end');
|
||||
$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');
|
||||
$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');
|
||||
$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');
|
||||
$this->db->join('dxcc_entities as dxcc_entities_2', 'station_profile.station_dxcc = dxcc_entities_2.adif', 'left outer');
|
||||
$this->db->join('eQSL_images', $this->config->item('table_name').'.COL_PRIMARY_KEY = eQSL_images.qso_id', 'left outer');
|
||||
$this->db->where('COL_PRIMARY_KEY', $id);
|
||||
|
||||
return $this->db->get();
|
||||
|
|
@ -3794,4 +3795,4 @@ function validateADIFDate($date, $format = 'Ymd')
|
|||
$d = DateTime::createFromFormat($format, $date);
|
||||
return $d && $d->format($format) == $date;
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -31,6 +31,19 @@
|
|||
}
|
||||
|
||||
?>
|
||||
<?php
|
||||
if (($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) {
|
||||
|
||||
echo '<li ';
|
||||
if ($row->eqsl_image_file == null) {
|
||||
echo 'hidden ';
|
||||
}
|
||||
echo 'class="eqslcardtab nav-item">
|
||||
<a class="nav-link" id="eqsltab" data-toggle="tab" href="#eqslcard" role="tab" aria-controls="home" aria-selected="false">'. $this->lang->line('general_word_eqslcard') .'</a>
|
||||
</li>';
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
</ul>
|
||||
|
||||
|
|
@ -553,6 +566,11 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tab-pane fade" id="eqslcard" role="tabpanel" aria-labelledby="table-tab">
|
||||
<?php
|
||||
echo '<img class="d-block" src="' . base_url() . '/images/eqsl_card_images/' . $row->eqsl_image_file .'" alt="QSL picture #'. $i++.'">';
|
||||
?>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
正在加载…
在新工单中引用