From 796a695045ce68dc2cc2cbc2e6ec22aeeb30f743 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Sun, 26 Nov 2023 15:27:17 +0100 Subject: [PATCH 1/2] added rst to qslprint List --- application/views/qslprint/qslprint.php | 4 ++++ application/views/qslprint/qsolist.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/application/views/qslprint/qslprint.php b/application/views/qslprint/qslprint.php index 7a488f29..0616370f 100644 --- a/application/views/qslprint/qslprint.php +++ b/application/views/qslprint/qslprint.php @@ -23,6 +23,8 @@ if ($qsos->result() != NULL) { '. lang('general_word_time') .' ' . lang('gen_hamradio_mode') . ' ' . lang('gen_hamradio_band') . ' +' . lang('gen_hamradio_rsts') . ' +' . lang('gen_hamradio_rstr') . ' ' . lang('gen_hamradio_qsl') . ' ' . lang('general_word_qslcard_via') . ' ' . lang('gen_hamradio_station') . ' Sent method @@ -49,6 +51,8 @@ if ($qsos->result() != NULL) { echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo ''; echo ''; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND); }; echo ''; + echo '' . $qsl->COL_RST_SENT . ''; + echo '' . $qsl->COL_RST_RCVD . ''; echo '' . $qsl->COL_QSL_VIA . ''; echo '' . $qsl->station_callsign . ''; echo ''; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo ''; diff --git a/application/views/qslprint/qsolist.php b/application/views/qslprint/qsolist.php index ab0d28e1..8beadda6 100644 --- a/application/views/qslprint/qsolist.php +++ b/application/views/qslprint/qsolist.php @@ -8,6 +8,8 @@ if ($qsos->result() != NULL) { '. lang('general_word_time') .' ' . lang('gen_hamradio_mode') . ' ' . lang('gen_hamradio_band') . ' + ' . lang('gen_hamradio_rsts') . ' + ' . lang('gen_hamradio_rstr') . ' ' . lang('gen_hamradio_station') . ' ' . lang('gen_hamradio_qsl') . ' ' . lang('general_word_qslcard_via') . ' Sent method @@ -38,6 +40,8 @@ if ($qsos->result() != NULL) { echo ''; $timestamp = strtotime($qsl->COL_TIME_ON); echo date('H:i', $timestamp); echo ''; echo ''; echo $qsl->COL_SUBMODE==null?$qsl->COL_MODE:$qsl->COL_SUBMODE; echo ''; echo ''; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND ?? ""); }; echo ''; + echo '' . $qsl->COL_RST_SENT . ''; + echo '' . $qsl->COL_RST_RCVD . ''; echo '' . $qsl->station_callsign . ''; echo '' . $qsl->COL_QSL_VIA . ''; echo ''; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo ''; From 9a97d48fcff62e3524429b25b7e7388e112589f0 Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Sun, 26 Nov 2023 20:07:15 +0100 Subject: [PATCH 2/2] Update qsolist.php corrected a conflict --- application/views/qslprint/qsolist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/qslprint/qsolist.php b/application/views/qslprint/qsolist.php index a7fba483..0f21af05 100644 --- a/application/views/qslprint/qsolist.php +++ b/application/views/qslprint/qsolist.php @@ -42,7 +42,7 @@ if ($qsos->result() != NULL) { echo ''; if($qsl->COL_SAT_NAME != null) { echo $qsl->COL_SAT_NAME; } else { echo strtolower($qsl->COL_BAND ?? ""); }; echo ''; echo '' . $qsl->COL_RST_SENT . ''; echo '' . $qsl->COL_RST_RCVD . ''; - echo '' . $qsl->station_callsign . ''; + echo '' . $qsl->station_callsign . ''; echo '' . $qsl->COL_QSL_VIA . ''; echo ''; echo_qsl_sent_via($qsl->COL_QSL_SENT_VIA); echo ''; echo '';