Public_Tools/wavelog
3
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-25 19:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #181 from teabreakninja/master

Browse Source 
eQSL upload and download
This commit is contained in:
Peter Goodhall
2016-01-26 15:59:59 +00:00
parent d047682478 92474c69fb
commit 2f6e48d9b6
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

21
application/controllers/eqsl.php
View File

@@ -353,7 +353,24 @@ class eqsl extends CI_Controller {
# 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!
$adif .= "%3C";
$adif .= "EOR";
@@ -488,4 +505,4 @@ class eqsl extends CI_Controller {
$this->load->view('layout/footer');
}
} // end class
} // end class

10
application/models/logbook_model.php
View File

@@ -645,7 +645,13 @@ class Logbook_model extends CI_Model {
$query = $this->db->get($this->config->item('table_name'));
$row = $query->row();
return $row->COL_EQSL_QSLRDATE;
if (isset($row->COL_EQSL_QSLDATE)){
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
@@ -674,7 +680,7 @@ class Logbook_model extends CI_Model {
// Show all QSOs we need to send to eQSL
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, 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');
return $this->db->get($this->config->item('table_name'));