From 09a46b2b66ffde8f2b4aeda0fa66e9cbd8870dc5 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Fri, 30 Aug 2019 21:14:50 +0100 Subject: [PATCH] Fixes #338 Respects the Ignore flag when exporting to eQSL --- application/models/Logbook_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 10365a05..53c646bb 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -923,10 +923,10 @@ 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, COL_COMMENT, COL_RST_SENT, COL_PROP_MODE"); - $this->db->where('COL_EQSL_QSL_SENT !=', 'Y'); + $this->db->where('COL_EQSL_QSL_SENT !=', 'Y'); $this->db->or_where('COL_EQSL_QSL_SENT IS NULL'); + $this->db->or_where('COL_EQSL_QSL_SENT !=', 'I'); return $this->db->get($this->config->item('table_name')); }