diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index ba4eb37b..80e33967 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -98,7 +98,7 @@ class Logbook_model extends CI_Model { function create_qso() { // Join date+time $datetime = date("Y-m-d",strtotime($this->input->post('start_date')))." ". $this->input->post('start_time'); - + if ($this->input->post('prop_mode') != null) { $prop_mode = $this->input->post('prop_mode'); } else { @@ -911,7 +911,8 @@ class Logbook_model extends CI_Model { 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'); return $this->db->get($this->config->item('table_name')); }