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

Merge pull request #181 from teabreakninja/master

浏览代码 
eQSL upload and download
这个提交包含在：
Peter Goodhall 2016-01-26 15:59:59 +00:00
当前提交 2f6e48d9b6
共有 3 个文件被更改，包括 28 次插入 和 4 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

1
.gitignore vendored
查看文件

@ -4,3 +4,4 @@
/uploads/*.ADI /uploads/*.ADI
/uploads/*.tq8 /uploads/*.tq8
/uploads/*.TQ8 /uploads/*.TQ8
/install/*

17
application/controllers/eqsl.php
查看文件

@ -353,6 +353,23 @@ class eqsl extends CI_Controller {
# End all the required fields # End all the required fields
// adding comment as QSLMSG
$adif .= "%3C";
$adif .= "QSLMSG";
$adif .= "%3A";
$adif .= strlen($qsl['COL_COMMENT']);
$adif .= "%3E";
$adif .= $qsl['COL_COMMENT'];
$adif .= "%20";
// adding RST_Sent
$adif .= "%3C";
$adif .= "RST%5FSENT";
$adif .= "%3A";
$adif .= strlen($qsl['COL_RST_SENT']);
$adif .= "%3E";
$adif .= $qsl['COL_RST_SENT'];
$adif .= "%20";
# Tie a bow on it! # Tie a bow on it!
$adif .= "%3C"; $adif .= "%3C";

8
application/models/logbook_model.php
查看文件

@ -645,7 +645,13 @@ class Logbook_model extends CI_Model {
$query = $this->db->get($this->config->item('table_name')); $query = $this->db->get($this->config->item('table_name'));
$row = $query->row(); $row = $query->row();
if (isset($row->COL_EQSL_QSLDATE)){
return $row->COL_EQSL_QSLRDATE; return $row->COL_EQSL_QSLRDATE;
}else{
// No previous date (first time import has run?), so choose UNIX EPOCH!
// Note: date is yyyy/mm/dd format
return '1970/01/01';
}
} }
// Determine if we've already received an eQSL for this QSO // Determine if we've already received an eQSL for this QSO
@ -674,7 +680,7 @@ class Logbook_model extends CI_Model {
// Show all QSOs we need to send to eQSL // Show all QSOs we need to send to eQSL
function eqsl_not_yet_sent() { function eqsl_not_yet_sent() {
//$this->db->select("COL_PRIMARY_KEY, DATE_FORMAT(COL_TIME_ON,\'%Y%m%d\') AS COL_QSO_DATE, DATE_FORMAT(COL_TIME_ON,\'%H%i\') AS TIME_ON, COL_CALL, COL_MODE, COL_BAND"); //$this->db->select("COL_PRIMARY_KEY, DATE_FORMAT(COL_TIME_ON,\'%Y%m%d\') AS COL_QSO_DATE, DATE_FORMAT(COL_TIME_ON,\'%H%i\') AS TIME_ON, COL_CALL, COL_MODE, COL_BAND");
$this->db->select("COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_MODE, COL_BAND"); $this->db->select("COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_MODE, COL_BAND, COL_COMMENT, COL_RST_SENT");
$this->db->where('COL_EQSL_QSL_SENT', 'N'); $this->db->where('COL_EQSL_QSL_SENT', 'N');
return $this->db->get($this->config->item('table_name')); return $this->db->get($this->config->item('table_name'));