goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Use DXCC ID from LotW cert for uploads

浏览代码
这个提交包含在：
phl0 2023-04-19 22:06:32 +02:00
父节点 19c72eb75a
当前提交 607a3a72d9
找不到此签名对应的密钥
GPG 密钥 ID: 48EA1E640798CA9A
共有 3 个文件被更改，包括 4 次插入 和 7 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

7
application/controllers/Lotw.php
查看文件

@ -225,10 +225,10 @@ class Lotw extends CI_Controller {
// Get Certificate Data // Get Certificate Data
$this->load->model('LotwCert'); $this->load->model('LotwCert');
$data['station_profile'] = $station_profile; $data['station_profile'] = $station_profile;
$data['lotw_cert_info'] = $this->LotwCert->lotw_cert_details($station_profile->station_callsign, $station_profile->station_country); $data['lotw_cert_info'] = $this->LotwCert->lotw_cert_details($station_profile->station_callsign, $station_profile->station_dxcc);
// If Station Profile has no LOTW Cert continue on. // If Station Profile has no LOTW Cert continue on.
if(!isset($data['lotw_cert_info']->cert_dxcc)) { if(!isset($data['lotw_cert_info']->cert_dxcc_id)) {
continue; continue;
} }
@ -244,9 +244,6 @@ class Lotw extends CI_Controller {
continue; continue;
} }
$this->load->model('Dxcc');
$data['station_profile_dxcc'] = $this->Dxcc->lookup_country($data['lotw_cert_info']->cert_dxcc);
// Get QSOs // Get QSOs
$this->load->model('Logbook_model'); $this->load->model('Logbook_model');

2
application/models/LotwCert.php
查看文件

@ -22,7 +22,7 @@ class LotwCert extends CI_Model {
} }
function lotw_cert_details($callsign, $dxcc) { function lotw_cert_details($callsign, $dxcc) {
$this->db->where('cert_dxcc', $dxcc); $this->db->where('cert_dxcc_id', $dxcc);
$this->db->where('callsign', $callsign); $this->db->where('callsign', $callsign);
$query = $this->db->get('lotw_certs'); $query = $this->db->get('lotw_certs');

2
application/views/lotw_views/adif_views/adif_export.php
查看文件

@ -17,7 +17,7 @@ $cert2 = str_replace("-----END CERTIFICATE-----", "", $cert1);
<CERT_UID:1>1 <CERT_UID:1>1
<CALL:<?php echo strlen($lotw_cert_info->callsign); ?>><?php echo $lotw_cert_info->callsign; ?> <CALL:<?php echo strlen($lotw_cert_info->callsign); ?>><?php echo $lotw_cert_info->callsign; ?>
<DXCC:<?php echo strlen($station_profile_dxcc->adif); ?>><?php echo $station_profile_dxcc->adif; ?> <DXCC:<?php echo strlen($lotw_cert_info->cert_dxcc_id); ?>><?php echo $lotw_cert_info->cert_dxcc_d; ?>
<?php if(isset($station_profile->station_gridsquare)) { ?><GRIDSQUARE:<?php echo strlen($station_profile->station_gridsquare); ?>><?php echo $station_profile->station_gridsquare; ?><?php } ?> <?php if(isset($station_profile->station_gridsquare)) { ?><GRIDSQUARE:<?php echo strlen($station_profile->station_gridsquare); ?>><?php echo $station_profile->station_gridsquare; ?><?php } ?>