diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php
index eb93e9f64..88d938508 100644
--- a/application/controllers/Logbookadvanced.php
+++ b/application/controllers/Logbookadvanced.php
@@ -133,6 +133,8 @@ class Logbookadvanced extends CI_Controller {
'lotwReceived' => xss_clean($this->input->post('lotwReceived')),
'eqslSent' => xss_clean($this->input->post('eqslSent')),
'eqslReceived' => xss_clean($this->input->post('eqslReceived')),
+ 'clublogSent' => xss_clean($this->input->post('clublogSent')),
+ 'clublogReceived' => xss_clean($this->input->post('clublogReceived')),
'qslvia' => xss_clean($this->input->post('qslvia')),
'sota' => xss_clean($this->input->post('sota')),
'pota' => xss_clean($this->input->post('pota')),
@@ -300,6 +302,8 @@ class Logbookadvanced extends CI_Controller {
'lotwReceived' => '',
'eqslSent' => '',
'eqslReceived' => '',
+ 'clublogSent' => '',
+ 'clublogReceived' => '',
'qslvia' => '',
'sota' => '',
'pota' => '',
@@ -342,6 +346,8 @@ class Logbookadvanced extends CI_Controller {
'lotwReceived' => xss_clean($this->input->post('lotwReceived')),
'eqslSent' => xss_clean($this->input->post('eqslSent')),
'eqslReceived' => xss_clean($this->input->post('eqslReceived')),
+ 'clublogSent' => xss_clean($this->input->post('clublogSent')),
+ 'clublogReceived' => xss_clean($this->input->post('clublogReceived')),
'qslvia' => xss_clean($this->input->post('qslvia')),
'sota' => xss_clean($this->input->post('sota')),
'pota' => xss_clean($this->input->post('pota')),
@@ -491,6 +497,7 @@ class Logbookadvanced extends CI_Controller {
$json_string['qsl']['show'] = $this->input->post('qsl');
$json_string['lotw']['show'] = $this->input->post('lotw');
$json_string['eqsl']['show'] = $this->input->post('eqsl');
+ $json_string['clublog']['show'] = $this->input->post('clublog');
$json_string['qslmsg']['show'] = $this->input->post('qslmsg');
$json_string['dxcc']['show'] = $this->input->post('dxcc');
$json_string['state']['show'] = $this->input->post('state');
diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index 43623d788..4fb5b70a2 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -120,6 +120,24 @@ class Logbookadvanced_model extends CI_Model {
$binding[] = $searchCriteria['lotwReceived'];
}
+ if ($searchCriteria['clublogSent'] !== '') {
+ $condition = "COL_CLUBLOG_QSO_UPLOAD_STATUS = ?";
+ if ($searchCriteria['clublogSent'] == 'N') {
+ $condition = '('.$condition;
+ $condition .= " OR COL_CLUBLOG_QSL_UPLOAD_STATUS IS NULL OR COL_CLUBLOG_QSO_UPLOAD_STATUS = '')";
+ }
+ $conditions[] = $condition;
+ $binding[] = $searchCriteria['clublogSent'];
+ }
+ if ($searchCriteria['clublogReceived'] !== '') {
+ $condition = "COL_CLUBLOG_QSO_DOWNLOAD_STATUS = ?";
+ if ($searchCriteria['clublogReceived'] == 'N') {
+ $condition = '('.$condition;
+ $condition .= " OR COL_CLUBLOG_QSO_DOWNLOAD_STATUS IS NULL OR COL_CLUBLOG_QSO_DOWNLOAD_STATUS = '')";
+ }
+ $conditions[] = $condition;
+ $binding[] = $searchCriteria['clublogReceived'];
+ }
if ($searchCriteria['eqslSent'] !== '') {
$condition = "COL_EQSL_QSL_SENT = ?";
if ($searchCriteria['eqslSent'] == 'N') {
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index a7ca2e709..e466b74db 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -27,6 +27,7 @@
\"qsl\":{\"show\":\"true\"},
\"lotw\":{\"show\":\"true\"},
\"eqsl\":{\"show\":\"true\"},
+ \"clublog\":{\"show\":\"true\"},
\"qslmsg\":{\"show\":\"true\"},
\"dxcc\":{\"show\":\"true\"},
\"state\":{\"show\":\"true\"},
@@ -86,6 +87,10 @@
if (!isset($current_opts->wwff)) {
echo "\nvar o_template = { wwff: {show: 'true'}};";
echo "\nuser_options={...user_options, ...o_template};";
+ }
+ if (!isset($current_opts->clublog)) {
+ echo "\nvar o_template = { clublog: {show: 'true'}};";
+ echo "\nuser_options={...user_options, ...o_template};";
}
if (!isset($current_opts->sig)) {
echo "\nvar o_template = { sig: {show: 'true'}};";
@@ -345,6 +350,28 @@ $options = json_decode($options);
+
+
+
+
+
+
+
+