diff --git a/application/libraries/EqslImporter.php b/application/libraries/EqslImporter.php index 11a97d0ee..6dee1d446 100644 --- a/application/libraries/EqslImporter.php +++ b/application/libraries/EqslImporter.php @@ -177,7 +177,7 @@ class EqslImporter $dupe = $this->CI->eqslmethods_model->eqsl_dupe_check($time_on, $record['call'], $record['band'], $record['mode'], $config['eqsl_rcvd_mark'], $station_callsign, $station_id); if ($dupe == false) { $updated += 1; - $eqsl_status = $this->CI->eqslmethods_model->eqsl_update($time_on, $record['call'], $record['band'], $record['mode'], $config['eqsl_rcvd_mark'], $station_callsign, $station_id, $eqsl_qslrdate); + $eqsl_status = $this->CI->eqslmethods_model->eqsl_update($time_on, $record['call'], $record['band'], $record['mode'], $config['eqsl_rcvd_mark'], $station_callsign, $station_id, $eqsl_qslrdate, ($record['qslmsg'] ?? null)); } else { $dupes += 1; $eqsl_status = "Already received an eQSL for this QSO."; diff --git a/application/models/Eqsl_images.php b/application/models/Eqsl_images.php index 73c4a9ebf..8d82c0e65 100644 --- a/application/models/Eqsl_images.php +++ b/application/models/Eqsl_images.php @@ -44,7 +44,7 @@ class Eqsl_images extends CI_Model { function eqsl_qso_list() { $this->load->model('logbooks_model'); $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); - $this->db->select('COL_PRIMARY_KEY, qso_id, COL_CALL, COL_MODE, , COL_SUBMODE, COL_TIME_ON, COL_BAND, COL_PROP_MODE, COL_SAT_NAME, COL_EQSL_QSLRDATE, image_file'); + $this->db->select('COL_PRIMARY_KEY, qso_id, COL_CALL, COL_MODE, , COL_SUBMODE, COL_TIME_ON, COL_BAND, COL_PROP_MODE, COL_SAT_NAME, COL_QSLMSG_RCVD, COL_EQSL_QSLRDATE, image_file'); $this->db->join($this->config->item('table_name'), 'qso_id = COL_PRIMARY_KEY', 'left outer'); $this->db->join('station_profile', $this->config->item('table_name').'.station_id = station_profile.station_id', 'left outer'); $this->db->where_in('station_profile.station_id', $logbooks_locations_array); diff --git a/application/models/Eqslmethods_model.php b/application/models/Eqslmethods_model.php index 6ed90f453..4422c63fd 100644 --- a/application/models/Eqslmethods_model.php +++ b/application/models/Eqslmethods_model.php @@ -505,10 +505,12 @@ class Eqslmethods_model extends CI_Model { // We could also probably use this: // https://eqsl.cc/qslcard/VerifyQSO.txt // https://www.eqsl.cc/qslcard/ImportADIF.txt - function eqsl_update($datetime, $callsign, $band, $mode, $qsl_status, $station_callsign, $station_id, $eqsl_qslrdate = null) { + function eqsl_update($datetime, $callsign, $band, $mode, $qsl_status, $station_callsign, $station_id, $eqsl_qslrdate = null, $qslmsg = null) { $data = array( 'COL_EQSL_QSLRDATE' => $eqsl_qslrdate ?? date('Y-m-d'), // eQSL gives a date now. Use current date as fallback only - 'COL_EQSL_QSL_RCVD' => $qsl_status + 'COL_EQSL_QSL_RCVD' => $qsl_status, + // Incoming QSLMSG to be stored in QSLMSG_RCVD + 'COL_QSLMSG_RCVD' => $qslmsg ); $this->db->where('COL_TIME_ON >= DATE_ADD(DATE_FORMAT("' . $datetime . '", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )'); diff --git a/application/views/eqslcard/index.php b/application/views/eqslcard/index.php index 495001f22..c447c4056 100644 --- a/application/views/eqslcard/index.php +++ b/application/views/eqslcard/index.php @@ -31,6 +31,7 @@ '.__("Time").' '.__("Band").' '.__("Propagation Mode").' + '.__("QSL Message").' '.__("QSL Date").' @@ -55,6 +56,9 @@ if($qsl->COL_PROP_MODE != null) { echo $qsl->COL_PROP_MODE; }; echo ''; echo ''; + if($qsl->COL_QSLMSG_RCVD != null) { echo $qsl->COL_QSLMSG_RCVD; }; + echo ''; + echo ''; if ($qsl->COL_EQSL_QSLRDATE) { $timestamp = strtotime($qsl->COL_EQSL_QSLRDATE); echo date($custom_date_format, $timestamp); } echo ''; echo 'COL_PRIMARY_KEY).'\' data-fancybox=\'images\' data-width=\'528\' data-height=\'336\' class=\'btn btn-sm btn-success\'>' . __("View") . ''; diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 97eae632d..6ed94b00d 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -539,7 +539,11 @@ COL_EQSL_QSL_RCVD == "Y" && $row->COL_EQSL_QSLRDATE != null) { ?>

eQSL

-

COL_EQSL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>.

+

COL_EQSL_QSLRDATE); echo date($custom_date_format, $timestamp); ?>. + COL_QSLMSG_RCVD)) { ?> +
: COL_QSLMSG_RCVD; ?> + +

COL_EQSL_QSL_RCVD == "Y" && $row->COL_EQSL_QSLRDATE == null) { ?>