From 290e3bb7a06e7c4475d3a78a7a5724ecb06c697f Mon Sep 17 00:00:00 2001 From: Andy Date: Mon, 18 Jan 2016 21:58:33 +0000 Subject: [PATCH 1/3] Change to ignore the install dir --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5a957682..f632b840 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /uploads/*.ADI /uploads/*.tq8 /uploads/*.TQ8 +/install/* From 05c6e7292f1e23e9a7a4f44a5e6e43e9c673b0a5 Mon Sep 17 00:00:00 2001 From: Andy Date: Tue, 26 Jan 2016 15:43:35 +0000 Subject: [PATCH 2/3] eQSL upload and sync now working --- application/controllers/eqsl.php | 22 +++++++++++++++++++++- application/models/logbook_model.php | 10 ++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/application/controllers/eqsl.php b/application/controllers/eqsl.php index d8594266..c9547a26 100644 --- a/application/controllers/eqsl.php +++ b/application/controllers/eqsl.php @@ -354,6 +354,26 @@ class eqsl extends CI_Controller { # End all the required fields + // CHANGE START - aw - 26-jan-2010 + // 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"; + // CHANGE END + # Tie a bow on it! $adif .= "%3C"; $adif .= "EOR"; @@ -488,4 +508,4 @@ class eqsl extends CI_Controller { $this->load->view('layout/footer'); } -} // end class \ No newline at end of file +} // end class diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index 6de8aaa7..76307661 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -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')); From 92474c69fb48f8263d79348188539c2af4643b28 Mon Sep 17 00:00:00 2001 From: Andy Date: Tue, 26 Jan 2016 15:51:27 +0000 Subject: [PATCH 3/3] remove placeholder comments --- application/controllers/eqsl.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/application/controllers/eqsl.php b/application/controllers/eqsl.php index c9547a26..483fb340 100644 --- a/application/controllers/eqsl.php +++ b/application/controllers/eqsl.php @@ -353,8 +353,6 @@ class eqsl extends CI_Controller { # End all the required fields - - // CHANGE START - aw - 26-jan-2010 // adding comment as QSLMSG $adif .= "%3C"; $adif .= "QSLMSG"; @@ -372,7 +370,6 @@ class eqsl extends CI_Controller { $adif .= "%3E"; $adif .= $qsl['COL_RST_SENT']; $adif .= "%20"; - // CHANGE END # Tie a bow on it! $adif .= "%3C";