diff --git a/application/models/Eqslmethods_model.php b/application/models/Eqslmethods_model.php index 52d212df2..d65e7deea 100644 --- a/application/models/Eqslmethods_model.php +++ b/application/models/Eqslmethods_model.php @@ -427,7 +427,7 @@ class Eqslmethods_model extends CI_Model { array_push($logbooks_locations_array, -9999); } - $this->db->select('station_profile.station_id, ' . $this->config->item('table_name') . '.COL_PRIMARY_KEY, ' . $this->config->item('table_name') . '.COL_TIME_ON, ' . $this->config->item('table_name') . '.COL_CALL, ' . $this->config->item('table_name') . '.COL_MODE, ' . $this->config->item('table_name') . '.COL_SUBMODE, ' . $this->config->item('table_name') . '.COL_BAND, ' . $this->config->item('table_name') . '.COL_PROP_MODE, ' . $this->config->item('table_name') . '.COL_SAT_NAME, ' . $this->config->item('table_name') . '.COL_SAT_MODE, ' . $this->config->item('table_name') . '.COL_QSLMSG, ' . $this->config->item('table_name') . '.COL_EQSL_QSLRDATE, eQSL_images.qso_id'); + $this->db->select('station_profile.station_id, ' . $this->config->item('table_name') . '.COL_PRIMARY_KEY, ' . $this->config->item('table_name') . '.COL_TIME_ON, ' . $this->config->item('table_name') . '.COL_CALL, ' . $this->config->item('table_name') . '.COL_MODE, ' . $this->config->item('table_name') . '.COL_SUBMODE, ' . $this->config->item('table_name') . '.COL_BAND, ' . $this->config->item('table_name') . '.COL_PROP_MODE, ' . $this->config->item('table_name') . '.COL_SAT_NAME, ' . $this->config->item('table_name') . '.COL_SAT_MODE, ' . $this->config->item('table_name') . '.COL_QSLMSG, ' . $this->config->item('table_name') . '.COL_QSLMSG_RCVD, ' . $this->config->item('table_name') . '.COL_EQSL_QSLRDATE, eQSL_images.qso_id'); $this->db->from('station_profile'); $this->db->join($this->config->item('table_name'), 'station_profile.station_id = ' . $this->config->item('table_name') . '.station_id'); $this->db->join('eQSL_images', 'eQSL_images.qso_id = ' . $this->config->item('table_name') . '.COL_PRIMARY_KEY', 'left outer'); diff --git a/application/views/eqsl/download.php b/application/views/eqsl/download.php index ae63f0f11..87b09b97d 100644 --- a/application/views/eqsl/download.php +++ b/application/views/eqsl/download.php @@ -39,6 +39,7 @@ + @@ -57,6 +58,11 @@ foreach ($qslsnotdownloaded->result_array() as $qsl) { echo ""; } echo "".$qsl['COL_BAND'].""; + echo ""; + if (!empty($qsl['COL_QSLMSG_RCVD'])) { + echo $qsl['COL_QSLMSG_RCVD']; + } + echo ""; echo "".$qsl['COL_PROP_MODE'].""; echo ""; if (!empty($qsl['COL_EQSL_QSLRDATE'])) {