diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index b5ee58806..788751edb 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -938,7 +938,7 @@ class Logbook extends CI_Controller { } function querydb($id) { - $this->db->select('dxcc_entities.adif, lotw_users.callsign, COL_BAND, COL_CALL, COL_CLUBLOG_QSO_DOWNLOAD_DATE, + $this->db->select('dxcc_entities.adif, lotw_users.callsign, COL_BAND, COL_CALL, COL_CLUBLOG_QSO_DOWNLOAD_DATE, COL_DCL_QSLRDATE, COL_DCL_QSLSDATE, COL_DCL_QSL_SENT, COL_DCL_QSL_RCVD, COL_CLUBLOG_QSO_DOWNLOAD_STATUS, COL_CLUBLOG_QSO_UPLOAD_DATE, COL_CLUBLOG_QSO_UPLOAD_STATUS, COL_CONTEST_ID, COL_DISTANCE, COL_EQSL_QSL_RCVD, COL_EQSL_QSLRDATE, COL_EQSL_QSLSDATE, COL_EQSL_QSL_SENT, COL_FREQ, COL_GRIDSQUARE, COL_IOTA, COL_LOTW_QSL_RCVD, COL_LOTW_QSLRDATE, COL_LOTW_QSLSDATE, diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index 2964092c4..43e8bfde7 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -123,6 +123,9 @@ $ci =& get_instance(); session->userdata('user_clublog_name') != ''){ ?> + session->userdata('user_default_confirmation'),'D') !== false ) { ?> + + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> @@ -397,6 +400,42 @@ $ci =& get_instance(); echo ''; } ?> + session->userdata('user_default_confirmation'),'D') !== false ) { + echo ''; + echo 'COL_DCL_QSL_SENT == "Y") { + echo "title=\"DCL ".__("Sent"); + if ($row->COL_DCL_QSLSDATE != null) { + $timestamp = strtotime($row->COL_DCL_QSLSDATE); + echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); + } + echo "\" data-bs-toggle=\"tooltip\""; + } + echo ' class="dcl-'; + if ($row->COL_DCL_QSL_SENT=='Y') { + echo "green"; + } elseif ($row->COL_DCL_QSL_SENT=='M') { + echo "yellow"; + } else { + echo "red"; + } + echo '">▲'; + + echo 'COL_DCL_QSL_RCVD == "Y") { + echo "title=\"DCL ".__("Received"); + if ($row->COL_DCL_QSLRDATE != null) { + $timestamp = strtotime($row->COL_DCL_QSLRDATE); + echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); + } + echo "\" data-bs-toggle=\"tooltip\""; + } + echo ' class="dcl-'; + echo ($row->COL_DCL_QSL_RCVD=='Y')?'green':'red'; + echo '">▼'; + echo ''; + } ?> + station_callsign)) { ?>