diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index eed16b219..97de91a9c 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1230,7 +1230,9 @@ class Logbook_model extends CI_Model { $eqsl_rcvd = 'N'; } - if ($this->input->post('lotw_sent') && !in_array($this->input->post('prop_mode'), $this->config->item('lotw_unsupported_prop_modes'))) { + if (in_array($this->input->post('prop_mode'), $this->config->item('lotw_unsupported_prop_modes'))) { + $lotw_sent = 'I'; + } elseif ($this->input->post('lotw_sent')) { $lotw_sent = $this->input->post('lotw_sent'); } else { $lotw_sent = 'N'; diff --git a/application/views/oqrs/qsolist.php b/application/views/oqrs/qsolist.php index 4fa9b4fe1..cd56a2f9a 100644 --- a/application/views/oqrs/qsolist.php +++ b/application/views/oqrs/qsolist.php @@ -161,11 +161,13 @@ if ($qsos->result() != NULL) { $timestamp = strtotime($qsl->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); } - echo "\" data-bs-toggle=\"tooltip\""; + echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\""; + } elseif ($qsl->COL_LOTW_QSL_SENT == "I") { + echo " class=\"qsl-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)")."\""; + } else { + echo " class=\"lotw-red\""; } - echo ' class="lotw-'; - echo ($qsl->COL_LOTW_QSL_SENT=='Y')?'green':'red'; - echo '">▲'; + echo '>▲'; echo 'COL_LOTW_QSL_RCVD == "Y") { diff --git a/application/views/qslprint/qsolist.php b/application/views/qslprint/qsolist.php index 4a59defee..18c94fab6 100644 --- a/application/views/qslprint/qsolist.php +++ b/application/views/qslprint/qsolist.php @@ -169,11 +169,13 @@ if ($qsos->result() != NULL) { $timestamp = strtotime($qsl->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); } - echo "\" data-bs-toggle=\"tooltip\""; + echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\""; + } elseif ($qsl->COL_LOTW_QSL_SENT == "I") { + echo "class=\"lotw-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)")."\""; + } else { + echo " class=\"lotw-red\""; } - echo ' class="lotw-'; - echo ($qsl->COL_LOTW_QSL_SENT=='Y')?'green':'red'; - echo '">▲'; + echo '>▲'; echo 'COL_LOTW_QSL_RCVD == "Y") { diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index 16b76b5c7..84fb68c64 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -300,11 +300,13 @@ $ci =& get_instance(); $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp != '' ? date($custom_date_format, $timestamp) : ''); } - echo "\" data-bs-toggle=\"tooltip\""; + echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\""; + } elseif ($row->COL_LOTW_QSL_SENT == "I") { + echo "class=\"lotw-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)")."\""; + } else { + echo "class=\"lotw-red\""; } - echo ' class="lotw-'; - echo ($row->COL_LOTW_QSL_SENT=='Y')?'green':'red'; - echo '">▲'; + echo '>▲'; echo 'COL_LOTW_QSL_RCVD == "Y") { diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index a815196c9..8c979709b 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -227,7 +227,23 @@ function echo_table_col($row, $name) { session->userdata('user_default_confirmation'),'L') !== false && ($this->session->userdata('user_lotw_name') != "") ) { ?> - COL_LOTW_QSL_SENT == "Y") { echo "title=\"".__("LoTW")." ".__("Sent"); if ($row->COL_LOTW_QSLSDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLSDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="lotw-COL_LOTW_QSL_SENT=='Y')?'green':'red'?>">▲ + COL_LOTW_QSL_SENT) { + case "Y": + echo "title=\"".__("LoTW")." ".__("Sent"); + if ($row->COL_LOTW_QSLSDATE != null) { + $timestamp = strtotime($row->COL_LOTW_QSLSDATE); + echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); + } + echo "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\""; + break; + case "I": + echo " class=\"lotw-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)")."\""; + break; + default: + echo " class=\"lotw-red\""; + break; + } + ?>>▲ COL_LOTW_QSL_RCVD == "Y") { echo "title=\"".__("LoTW")." ".__("Received"); if ($row->COL_LOTW_QSLRDATE != null) { $timestamp = strtotime($row->COL_LOTW_QSLRDATE); echo " ".($timestamp!=''?date($custom_date_format, $timestamp):''); } echo "\" data-bs-toggle=\"tooltip\""; } ?> class="lotw-COL_LOTW_QSL_RCVD=='Y')?'green':'red'?>">▼ diff --git a/assets/css/general.css b/assets/css/general.css index f6f1c24d1..16231a0d2 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -404,6 +404,11 @@ TD.lotw { font-size: 1.1em; } +.lotw-grey { + color: #dddddd !important; + font-size: 1.1em; +} + .qso-edit-box { padding: 10px; } diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index ea18da2ec..009dcb9c8 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -369,10 +369,14 @@ class QSO $timestamp = strtotime($data['COL_LOTW_QSLSDATE']); $lotwstring .= " ". ($timestamp != '' ? date($custom_date_format, $timestamp) : ''); } - $lotwstring .= "\" data-bs-toggle=\"tooltip\""; + $lotwstring .= "\" data-bs-toggle=\"tooltip\" class=\"lotw-green\""; + } elseif ($data['COL_LOTW_QSL_SENT'] == "I") { + $lotwstring .= "class=\"lotw-grey\" data-bs-toggle=\"tooltip\" title=\"".__("Invalid (Ignore)")."\""; + } else { + $lotwstring .= "class=\"lotw-red\""; } - $lotwstring .= ' class="lotw-' . (($data['COL_LOTW_QSL_SENT']=='Y') ? 'green' : 'red') . '">▲'; + $lotwstring .= '>▲'; $lotwstring .= '