From 98a17832c92bda1c66bd4a197c8596261191f22f Mon Sep 17 00:00:00 2001 From: Andy Date: Sat, 13 Feb 2016 13:55:16 +0000 Subject: [PATCH] eQSL column now showing correctly --- application/models/logbook_model.php | 12 ++++++++++++ application/views/view_log/partial/log.php | 11 ++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/application/models/logbook_model.php b/application/models/logbook_model.php index d1b65e86..0f0e2710 100644 --- a/application/models/logbook_model.php +++ b/application/models/logbook_model.php @@ -158,6 +158,12 @@ class Logbook_model extends CI_Model { 'COL_CQZ' => $this->input->post('cqz'), ); + // if eQSL username set, default SENT & RCVD to 'N' else leave as null + if ($this->session->userdata('user_eqsl_name')){ + $data['COL_EQSL_QSL_SENT'] = 'N'; + $data['COL_EQSL_QSL_RCVD'] = 'N'; + } + $this->add_qso($data); } @@ -924,6 +930,12 @@ class Logbook_model extends CI_Model { 'COL_LOTW_QSL_RCVD' => $LOTWQSLRCVD ); + // if eQSL username set, default SENT & RCVD to 'N' else leave as null + if ($this->session->userdata('user_eqsl_name')){ + $data['COL_EQSL_QSL_SENT'] = 'N'; + $data['COL_EQSL_QSL_RCVD'] = 'N'; + } + $this->add_qso($data); } } diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php index d376ed5a..b7d844d4 100644 --- a/application/views/view_log/partial/log.php +++ b/application/views/view_log/partial/log.php @@ -52,12 +52,17 @@ - session->userdata('user_eqsl_name') != "" && $row->COL_EQSL_QSL_SENT != ''){ ?> + session->userdata('user_eqsl_name') != ""){ + if ($row->COL_EQSL_QSL_SENT != '') { ?> - + +   + session->userdata('user_lotw_name') != "") { ?> @@ -116,4 +121,4 @@ TD.lotw{ font-size: 1.1em; } - \ No newline at end of file +