diff --git a/application/models/Lotw_model.php b/application/models/Lotw_model.php index dbc532119..8a2b7e32d 100644 --- a/application/models/Lotw_model.php +++ b/application/models/Lotw_model.php @@ -12,7 +12,7 @@ class Lotw_model extends CI_Model { */ function lotw_certs($user_id) { - $this->db->select('lotw_certs.lotw_cert_id as lotw_cert_id, lotw_certs.serial as serial, lotw_certs.status as status, lotw_certs.callsign as callsign, dxcc_entities.name as cert_dxcc, dxcc_entities.end as cert_dxcc_end, lotw_certs.qso_start_date as qso_start_date, lotw_certs.qso_end_date as qso_end_date, lotw_certs.date_created as date_created, lotw_certs.date_expires as date_expires, lotw_certs.last_upload as last_upload, lotw_certs.last_upload_fail as last_upload_fail, lotw_certs.last_upload_status as last_upload_status'); + $this->db->select('lotw_certs.lotw_cert_id as lotw_cert_id, lotw_certs.serial as serial, lotw_certs.status as status, lotw_certs.callsign as callsign, dxcc_entities.name as cert_dxcc, dxcc_entities.end as cert_dxcc_end, lotw_certs.qso_start_date as qso_start_date, lotw_certs.qso_end_date as qso_end_date, lotw_certs.date_created as date_created, lotw_certs.date_expires as date_expires, lotw_certs.last_upload as last_upload, lotw_certs.last_upload_fail as last_upload_fail, lotw_certs.last_upload_status as last_upload_status, lotw_certs.last_modified as last_modified'); $this->db->where('user_id', $user_id); $this->db->join('dxcc_entities','lotw_certs.cert_dxcc_id = dxcc_entities.adif','left'); $this->db->order_by('callsign', 'ASC'); diff --git a/application/views/lotw_views/index.php b/application/views/lotw_views/index.php index b97640d95..9d4c8fd2a 100644 --- a/application/views/lotw_views/index.php +++ b/application/views/lotw_views/index.php @@ -46,8 +46,8 @@ result() as $row) { ?> - callsign; ?> - cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' '.__("Deleted DXCC").''; } ?> + callsign; ?> + cert_dxcc == '' ? '- NONE -' : ucfirst($row->cert_dxcc); if ($row->cert_dxcc_end != NULL) { echo ' '.__("Deleted DXCC").''; } ?> qso_start_date)) { $valid_qso_start = strtotime( $row->qso_start_date ); @@ -92,6 +92,7 @@ } ?> + serial ?? '') != '' )? $row->serial : __("n/a")); ?>
config->item('qso_date_format').' H:i', strtotime($row->last_modified))); ?>"> status == 1) { ?> @@ -108,6 +109,7 @@ +
last_upload) {