[Print Requested QSLs] Bugfix for ADIF export. Fixed #761
这个提交包含在:
当前提交
1d09b1038c
共有 2 个文件被更改,包括 8 次插入 和 3 次删除
|
|
@ -46,6 +46,10 @@ class AdifHelper {
|
|||
|
||||
$line .= $this->getAdifFieldLine("QSL_SENT", $qso->COL_QSL_SENT);
|
||||
|
||||
if ($qso->COL_QSL_VIA) {
|
||||
$line .= $this->getAdifFieldLine("QSL_VIA", $qso->COL_QSL_VIA);
|
||||
}
|
||||
|
||||
$line .= $this->getAdifFieldLine("COUNTRY", $qso->COL_COUNTRY);
|
||||
|
||||
if ($qso->COL_VUCC_GRIDS != "") {
|
||||
|
|
|
|||
|
|
@ -23,11 +23,12 @@ class adif_data extends CI_Model {
|
|||
$this->load->model('stations');
|
||||
$active_station_id = $this->stations->find_active();
|
||||
|
||||
$this->db->where('station_id', $active_station_id);
|
||||
$this->db->where($this->config->item('table_name').'.station_id', $active_station_id);
|
||||
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
|
||||
$this->db->where_in('COL_QSL_SENT', array('R', 'Q'));
|
||||
$this->db->order_by("COL_TIME_ON", "ASC");
|
||||
$this->db->order_by("COL_TIME_ON", "ASC");
|
||||
$query = $this->db->get($this->config->item('table_name'));
|
||||
|
||||
|
||||
return $query;
|
||||
}
|
||||
|
||||
|
|
|
|||
正在加载…
在新工单中引用