diff --git a/application/models/Qsl_model.php b/application/models/Qsl_model.php index b6b24e3ef..22f2fa789 100644 --- a/application/models/Qsl_model.php +++ b/application/models/Qsl_model.php @@ -193,7 +193,7 @@ class Qsl_model extends CI_Model { if (in_array('qsl', $confirmationtype)) { $sql_parts[] = " - SELECT col_primary_key, col_call, col_time_on, col_mode, col_submode, col_band, col_sat_name, col_qslrdate AS rxdate, 'QSL Card' AS type, + SELECT col_primary_key, col_call, col_time_on, col_mode, col_submode, col_band, col_gridsquare, col_vucc_grids, col_sat_name, col_qslrdate AS rxdate, 'QSL Card' AS type, EXISTS (SELECT 1 FROM qsl_images WHERE qsoid = $table.COL_PRIMARY_KEY) AS qslcount FROM $table WHERE station_id IN ($location_list) AND col_qslrdate IS NOT NULL AND coalesce(col_qslrdate, '') <> '' AND col_qsl_rcvd = 'Y' @@ -201,28 +201,28 @@ class Qsl_model extends CI_Model { } if (in_array('lotw', $confirmationtype)) { $sql_parts[] = " - SELECT col_primary_key, col_call, col_time_on, col_mode, col_submode, col_band, col_sat_name, col_lotw_qslrdate AS rxdate, 'LoTW' AS type, 0 as qslcount + SELECT col_primary_key, col_call, col_time_on, col_mode, col_submode, col_band, col_gridsquare, col_vucc_grids, col_sat_name, col_lotw_qslrdate AS rxdate, 'LoTW' AS type, 0 as qslcount FROM $table WHERE station_id IN ($location_list) AND col_lotw_qslrdate IS NOT NULL AND coalesce(col_lotw_qslrdate, '') <> '' AND col_lotw_qsl_rcvd = 'Y' "; } if (in_array('eqsl', $confirmationtype)) { $sql_parts[] = " - SELECT col_primary_key, col_call, col_time_on, col_mode, col_submode, col_band, col_sat_name, col_eqsl_qslrdate AS rxdate, 'eQSL' AS type, 0 as qslcount + SELECT col_primary_key, col_call, col_time_on, col_mode, col_submode, col_band, col_gridsquare, col_vucc_grids, col_sat_name, col_eqsl_qslrdate AS rxdate, 'eQSL' AS type, 0 as qslcount FROM $table WHERE station_id IN ($location_list) AND col_eqsl_qslrdate IS NOT NULL AND coalesce(col_eqsl_qslrdate, '') <> '' AND col_eqsl_qsl_rcvd = 'Y' "; } if (in_array('qrz', $confirmationtype)) { $sql_parts[] = " - SELECT col_primary_key, col_call, col_time_on, col_mode, col_submode, col_band, col_sat_name, col_qrzcom_qso_download_date AS rxdate, 'QRZ.com' AS type, 0 as qslcount + SELECT col_primary_key, col_call, col_time_on, col_mode, col_submode, col_band, col_gridsquare, col_vucc_grids, col_sat_name, col_qrzcom_qso_download_date AS rxdate, 'QRZ.com' AS type, 0 as qslcount FROM $table WHERE station_id IN ($location_list) AND col_qrzcom_qso_download_date IS NOT NULL AND coalesce(col_qrzcom_qso_download_date, '') <> '' AND col_qrzcom_qso_download_status = 'Y' "; } if (in_array('clublog', $confirmationtype)) { $sql_parts[] = " - SELECT col_primary_key, col_call, col_time_on, col_mode, col_submode, col_band, col_sat_name, col_clublog_qso_download_date AS rxdate, 'Clublog' AS type, 0 as qslcount + SELECT col_primary_key, col_call, col_time_on, col_mode, col_submode, col_band, col_gridsquare, col_vucc_grids, col_sat_name, col_clublog_qso_download_date AS rxdate, 'Clublog' AS type, 0 as qslcount FROM $table WHERE station_id IN ($location_list) AND col_clublog_qso_download_date IS NOT NULL AND coalesce(col_clublog_qso_download_date, '') <> '' AND col_clublog_qso_download_status = 'Y' "; diff --git a/application/views/qslcard/confirmationresult.php b/application/views/qslcard/confirmationresult.php index 14070ccf1..ba71d8cc6 100644 --- a/application/views/qslcard/confirmationresult.php +++ b/application/views/qslcard/confirmationresult.php @@ -16,6 +16,7 @@ if ($result) { ?> + @@ -30,6 +31,7 @@ if ($result) { ?> col_submode == null ? $qso->col_mode : $qso->col_submode;?> col_sat_name != null) { echo $qso->col_sat_name; } else { echo strtolower($qso->col_band); };?> + col_vucc_grids != null) { echo $qso->col_vucc_grids; } else { echo $qso->col_gridsquare; } ;?>