diff --git a/application/models/dxcc.php b/application/models/dxcc.php index 967b3832..d3ec2873 100644 --- a/application/models/dxcc.php +++ b/application/models/dxcc.php @@ -30,8 +30,9 @@ class DXCC extends CI_Model { "15m"=>0, "12m"=>0, "10m"=>0, - "6m"=>0, - "2m"=>0); + "4m" =>0, + "6m" =>0, + "2m" =>0); $last_country = $row->COL_COUNTRY; } 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/awards/dxcc/index.php b/application/views/awards/dxcc/index.php index 717805c9..a62472e6 100644 --- a/application/views/awards/dxcc/index.php +++ b/application/views/awards/dxcc/index.php @@ -25,24 +25,11 @@ 12m 10m 6m + 4m 2m - - Country - 160m - 80m - 40m - 30m - 20m - 17m - 15m - 12m - 10m - 6m - 2m - $val){ 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 +